Merge remote-tracking branch 'origin/develop' into gh-3059-federated-…

…store-applyviewtoelements-schema-validation # Conflicts: # store-implementation/federated-store/src/test/java/uk/gov/gchq/gaffer/federatedstore/FederatedStoreSchemaTest.java
gchq · Feb 23, 2024 · a2f369f · a2f369f
2 parents d2ab3c0 + a8134c9
commit a2f369f
Show file tree

Hide file tree

Showing 150 changed files with 4,643 additions and 1,729 deletions.
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -15,16 +15,16 @@ jobs:
   analyse:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -33,12 +33,13 @@ jobs:
           restore-keys: Accumulo-gaffer-dependencies
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: java
+          queries: security-extended
 
       - name: Build Code
         run: mvn -B -ntp clean install -Pquick -Dskip.jar-with-dependencies=true -Dshaded.jar.phase=true
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/continuous-integration-legacy.yaml b/.github/workflows/continuous-integration-legacy.yaml
@@ -39,16 +39,16 @@ jobs:
     env:
       MAVEN_OPTS: -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -16,24 +16,42 @@ jobs:
     name: Check all modules are tested
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check all modules are tested
         run: ./cd/check_modules.sh
 
+  check-copyright:
+    name: Check Copyright Headers
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+
+      - name: Run Spotless copyright check
+        run: mvn -ntp spotless:check -T0.5C
+
   build-javadoc:
     name: Build Javadoc
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -94,18 +112,18 @@ jobs:
     env:
       MAVEN_OPTS: -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '8'
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -119,15 +137,11 @@ jobs:
       - name: Test
         run: mvn -B -ntp verify -P coverage -pl ${{matrix.modules.values}}
 
-      - name: Check Copyright Headers
-        if: github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest'
-        run: mvn -B -ntp spotless:check -pl ${{matrix.modules.values}}
-
       - name: Add JaCoCo reports to artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.os == 'ubuntu-latest'
         with:
-          name: combined-jacoco-coverage
+          name: jacoco-coverage-${{matrix.modules.name}}
           path: "*/**/jacoco.xml"
           retention-days: 5
 
@@ -137,15 +151,16 @@ jobs:
     needs:
       - build-and-run-tests
     steps:
-      - uses: actions/checkout@v3 # Codecov need to see the src code to pair with coverage
+      - uses: actions/checkout@v4 # Codecov need to see the src code to pair with coverage
 
       - name: Fetch JaCoCo reports artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: combined-jacoco-coverage
+          pattern: jacoco-coverage-*
+          merge-multiple: true
 
       - name: Upload to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           name: gaffer-coverage
           fail_ci_if_error: true # Ensures upload doesn't fail silently

diff --git a/.github/workflows/create-hotfix-branch.yaml b/.github/workflows/create-hotfix-branch.yaml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Checkout master
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: master
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}

diff --git a/.github/workflows/create-release-branch.yaml b/.github/workflows/create-release-branch.yaml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Checkout develop
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: develop
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
@@ -38,7 +38,7 @@ jobs:
 
     - name: Bump latest tag variable version
       if: ${{ !github.event.inputs.version }}
-      run: echo "RELEASE_VERSION=$(echo ${{ env.CURRENT_VERSION }} | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)/echo \1.$((\2+1)).\3/' | sh)" >> $GITHUB_ENV
+      run: echo "RELEASE_VERSION=$(echo ${{ env.CURRENT_VERSION }} | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)/echo \1.$((\2+1)).0/' | sh)" >> $GITHUB_ENV
 
     - name: Verify version regex
       run: echo ${{ env.RELEASE_VERSION }} | grep -E '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'

diff --git a/.github/workflows/link-issue.yml b/.github/workflows/link-issue.yml
@@ -7,7 +7,7 @@ jobs:
   issue-links:
     runs-on: ubuntu-latest
     steps:
-    - uses: tkt-actions/add-issue-links@v1.8.1
+    - uses: tkt-actions/add-issue-links@v1.8.2
       with:
         repo-token: '${{ secrets.GITHUB_TOKEN }}'
         branch-prefix: 'gh-'

diff --git a/.github/workflows/release-standalone.yaml b/.github/workflows/release-standalone.yaml
@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '8'
 
     - name: Checkout Branch
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Decode CodeSigning key
       env:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -19,13 +19,13 @@ jobs:
 
     steps:
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '8'
 
     - name: Checkout master
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: master
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
@@ -44,10 +44,10 @@ jobs:
 
     - name: Output branch name
       id: branch
-      run: echo "{branch_name}={$BRANCH_NAME}" >> $GITHUB_OUTPUT
+      run: echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
 
-    - name: Fail if no branch found
-      if: ${{ !env.BRANCH_NAME }}
+    - name: Fail if branch output missing (no branch found)
+      if: ${{ !steps.branch.outputs.branch_name }}
       run: exit 1
 
     - name: Merge release into master
@@ -69,7 +69,7 @@ jobs:
 
     steps:
     - name: Checkout develop
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: develop
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
@@ -81,7 +81,7 @@ jobs:
         git config user.email 41898282+github-actions[bot]@users.noreply.github.com
 
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '8'
@@ -108,7 +108,7 @@ jobs:
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: master
 
@@ -136,7 +136,7 @@ jobs:
 
     steps:
     - name: Checkout Master
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: master
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
@@ -147,7 +147,7 @@ jobs:
         git config user.email 41898282+github-actions[bot]@users.noreply.github.com
 
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '11'
@@ -177,13 +177,13 @@ jobs:
 
     steps:
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '8'
 
     - name: Checkout release
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ needs.create-release-tag.outputs.branch_name }}
 
@@ -203,21 +203,3 @@ jobs:
         OSS_NEXUS_USERNAME: ${{ secrets.OSS_NEXUS_USERNAME }}
         OSS_NEXUS_PASSWORD: ${{ secrets.OSS_NEXUS_PASSWORD }}
       run: mvn deploy -P quick,ossrh-release --settings cd/mvnsettings.xml -B
-
-  trigger-update-gafferpy-version:
-    runs-on: ubuntu-latest
-    needs:
-    - create-release-tag
-
-    steps:
-    - name: Set version
-      run: echo "RELEASE_VERSION=$(echo ${{ github.event.milestone.title }} | cut -c 2-)" >> $GITHUB_ENV
-
-    - name: Update gafferpy's Gaffer version
-      uses: benc-uk/workflow-dispatch@v1
-      with:
-        workflow: Update Gaffer Version
-        repo: gchq/gafferpy
-        token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
-        inputs: '{ "version": "${{ env.RELEASE_VERSION }}" }'
-        ref: main
diff --git a/.github/workflows/update-koryphe-version.yaml b/.github/workflows/update-koryphe-version.yaml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: Checkout branch
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
 
@@ -25,7 +25,7 @@ jobs:
         git config user.email 41898282+github-actions[bot]@users.noreply.github.com
 
     - name: Setup JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
         java-version: '8'

diff --git a/core/access/pom.xml b/core/access/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2020 Crown Copyright
+  ~ Copyright 2020-2023 Crown Copyright
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>uk.gov.gchq.gaffer</groupId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/cache/pom.xml b/core/cache/pom.xml
@@ -1,9 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017-2023 Crown Copyright
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>core</artifactId>
         <groupId>uk.gov.gchq.gaffer</groupId>
-        <version>2.0.2-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>