Remove v2-alpha from workflows

.github/workflows/codeql.yaml

@@ -8,7 +8,8 @@ on:
     branches:
       - 'release/**'
       - 'hotfix/**'
-      - 'alpha-release/**'
+      - develop
+      - master
 
 jobs:
   analyse:

.github/workflows/continuous-integration-legacy.yaml

@@ -8,7 +8,8 @@ on:
     branches:
       - 'release/**'
       - 'hotfix/**'
-      - 'alpha-release/**'
+      - develop
+      - master
 
 jobs:
   build-then-run-tests:

.github/workflows/continuous-integration.yaml

@@ -8,7 +8,8 @@ on:
     branches:
       - 'release/**'
       - 'hotfix/**'
-      - 'alpha-release/**'
+      - develop
+      - master
 
 jobs:
   check-all-modules-are-tested:

.github/workflows/release.yaml

@@ -50,25 +50,17 @@ jobs:
       if: ${{ !env.BRANCH_NAME }}
       run: exit 1
 
-    - name: Set alpha master branch
-      if: ${{ startsWith( env.BRANCH_NAME , 'alpha') }}
-      run: echo "MASTER_BRANCH=v2-alpha" >> $GITHUB_ENV
-
-    - name: Set master branch
-      if: ${{ !startsWith( env.BRANCH_NAME , 'alpha') }}
-      run: echo "MASTER_BRANCH=master" >> $GITHUB_ENV
-
     - name: Checkout master
       uses: actions/checkout@v2
       with:
-        ref: ${{ env.MASTER_BRANCH }}
+        ref: master
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
         fetch-depth: 0
 
     - name: Merge release into master
       run: |
         git checkout ${{ env.BRANCH_NAME }}
-        git checkout ${{ env.MASTER_BRANCH }}
+        git checkout master
         git merge ${{ env.BRANCH_NAME }}
 
     - name: Push changes
@@ -83,14 +75,6 @@ jobs:
     - create-release-tag
 
     steps:
-    - name: Set develop branch
-      if: ${{ !startsWith( needs.create-release-tag.outputs.branch_name , 'alpha') }}
-      run: echo "DEVELOP_BRANCH=develop" >> $GITHUB_ENV
-
-    - name: Set v2-alpha branch
-      if: ${{ startsWith( needs.create-release-tag.outputs.branch_name , 'alpha') }}
-      run: echo "DEVELOP_BRANCH=v2-alpha" >> $GITHUB_ENV
-
     - name: Checkout develop
       uses: actions/checkout@v2
       with:
@@ -109,17 +93,15 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
 
-    # Skip if alpha release
     - name: Merge release into develop
-      if: ${{ !startsWith( needs.create-release-tag.outputs.branch_name , 'alpha') }}
       run: |
         git checkout ${{ needs.create-release-tag.outputs.branch_name }}
         git checkout develop
         git merge ${{ needs.create-release-tag.outputs.branch_name }} --strategy-option theirs
 
-    - name: Update appropriate development branch
+    - name: Update develop branch
       run: |
-        git checkout ${{ env.DEVELOP_BRANCH }}
+        git checkout develop
         mvn release:update-versions -B
         NEW_GAFFER_VERSION=$(mvn -q help:evaluate -DforceStdout -Dexpression=pom.version)
         sed -i'' -e "s/^gaffer.version=.*/gaffer.version=$NEW_GAFFER_VERSION/" rest-api/common-rest/src/main/resources/version.properties
@@ -153,14 +135,11 @@ jobs:
         tag_name: ${{ env.artifactId }}-${{ env.RELEASE_VERSION }}
         name: Gaffer ${{ env.RELEASE_VERSION }}
         body_path: release_file.md
-        prerelease: ${{ startsWith( needs.create-release-tag.outputs.branch_name , 'alpha') }}
 
-  # Skip if alpha release
   generate-javadoc:
     runs-on: ubuntu-latest
     needs:
     - create-release-tag
-    if: ${{ !startsWith( needs.create-release-tag.outputs.branch_name , 'alpha') }}
 
     steps:
     - name: Checkout Master
@@ -178,7 +157,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
-        java-version: '8'
+        java-version: '11'
 
     - name: Set version
       run: echo "RELEASE_VERSION=$(echo ${{ github.event.milestone.title }} | cut -c 2-)" >> $GITHUB_ENV
@@ -188,9 +167,12 @@ jobs:
         git remote set-branches --add origin gh-pages
         git pull
         mvn -q clean install -Pquick -Dskip.jar-with-dependencies=true -Dshaded.jar.phase=true
-        mvn -q javadoc:javadoc -Pquick
+        rm -rf integration-test/src/main/*
+        mvn -q javadoc:aggregate
         git checkout gh-pages
         rm -rf uk
+        rm -rf jquery
+        rm -rf resources
         mv target/site/apidocs/* .
         git add .
         git commit -a -m "Updated javadoc - $RELEASE_VERSION"
@@ -239,19 +221,11 @@ jobs:
     - name: Set version
       run: echo "RELEASE_VERSION=$(echo ${{ github.event.milestone.title }} | cut -c 2-)" >> $GITHUB_ENV
 
-    - name: Set develop branch
-      if: ${{ !startsWith( needs.create-release-tag.outputs.branch_name , 'alpha') }}
-      run: echo "DEVELOP_BRANCH=develop" >> $GITHUB_ENV
-
-    - name: Set v2-alpha branch
-      if: ${{ startsWith( needs.create-release-tag.outputs.branch_name , 'alpha') }}
-      run: echo "DEVELOP_BRANCH=v2-alpha" >> $GITHUB_ENV
-
     - name: Update gaffer-tools' Gaffer version
       uses: benc-uk/workflow-dispatch@v1
       with:
         workflow: Update Gaffer Version
         repo: gchq/gaffer-tools
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
         inputs: '{ "version": "${{ env.RELEASE_VERSION }}" }'
-        ref: ${{ env.DEVELOP_BRANCH }}
+        ref: develop