diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml index c907722..ec1a05d 100644 --- a/.github/workflows/automate-projects.yml +++ b/.github/workflows/automate-projects.yml @@ -14,14 +14,14 @@ jobs: steps: - name: add-new-issues-to-organization-based-project-column if: github.event_name == 'issues' && github.event.action == 'opened' - uses: alex-page/github-project-automation-plus@v0.8.3 + uses: alex-page/github-project-automation-plus@v0.9.0 with: project: CoMPAS Issues Overview Board column: To do repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }} - name: add-new-pull-request-to-organization-based-project-column if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened' - uses: alex-page/github-project-automation-plus@v0.8.3 + uses: alex-page/github-project-automation-plus@v0.9.0 with: project: CoMPAS Pull Request Overview Board column: To do diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 7c50822..af51bfd 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -30,7 +30,7 @@ jobs: java-version: '17' - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v21 + uses: whelk-io/maven-settings-xml-action@v22 with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 375610b..6de4934 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -16,7 +16,7 @@ jobs: release_please: runs-on: ubuntu-latest steps: - - uses: google-github-actions/release-please-action@v3 + - uses: google-github-actions/release-please-action@v4 id: release with: release-type: maven @@ -42,7 +42,7 @@ jobs: java-version: '17' - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v21 + uses: whelk-io/maven-settings-xml-action@v22 if: ${{ steps.release.outputs.release_created }} with: output_file: custom_maven_settings.xml diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index f3dac2b..de54c90 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -31,7 +31,7 @@ jobs: java-version: '17' - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v21 + uses: whelk-io/maven-settings-xml-action@v22 with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 3a0c286..1368598 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -19,7 +19,7 @@ jobs: run: cat $GITHUB_EVENT_PATH - name: Download PR number artifact if: github.event.workflow_run.event == 'pull_request' - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: workflow: SonarCloud Build run_id: ${{ github.event.workflow_run.id }} @@ -54,13 +54,13 @@ jobs: git checkout ${{ github.event.workflow_run.head_branch }} git clean -ffdx && git reset --hard HEAD - name: Cache SonarCloud packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache Maven packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -79,7 +79,7 @@ jobs: -Dsonar.projectKey=com-pas_compas-core \ -Dsonar.organization=com-pas )" - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v21 + uses: whelk-io/maven-settings-xml-action@v22 with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml index 291d817..25d4d8c 100644 --- a/.github/workflows/sonarcloud-build.yml +++ b/.github/workflows/sonarcloud-build.yml @@ -31,13 +31,13 @@ jobs: fetch-depth: 0 - name: Cache SonarCloud packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache Maven packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} @@ -50,7 +50,7 @@ jobs: java-version: '17' - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v21 + uses: whelk-io/maven-settings-xml-action@v22 with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' @@ -71,7 +71,7 @@ jobs: run: echo ${{ github.event.number }} > PR_NUMBER.txt - name: Archive PR number if: github.event_name == 'pull_request' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: PR_NUMBER path: PR_NUMBER.txt diff --git a/pom.xml b/pom.xml index 0c6f3e5..628fda4 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 0.0.4 - 3.6.1 - 2.22.0 + 3.7.4 + 2.23.0 0.9.1 @@ -139,13 +139,13 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 org.apache.maven.plugins maven-surefire-plugin - 3.2.2 + 3.2.5 diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd index f06ae75..053c932 100644 --- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd +++ b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd @@ -18,6 +18,7 @@ SPDX-License-Identifier: Apache-2.0 Version 1.4 Release 2023/02/28 Version 1.5 Release 2023/04/05 Version 1.6 Release 2023/12/06 + Version 1.7 Release 2024/02/07 @@ -127,10 +128,19 @@ SPDX-License-Identifier: Apache-2.0 + + + + + + + + + @@ -387,4 +397,4 @@ SPDX-License-Identifier: Apache-2.0 - \ No newline at end of file +