diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml deleted file mode 100644 index ec1a05d..0000000 --- a/.github/workflows/automate-projects.yml +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-FileCopyrightText: 2022 Alliander N.V. -# -# SPDX-License-Identifier: Apache-2.0 - -name: Add issues and pull request to project boards - -on: [ issues, pull_request, pull_request_target ] - -jobs: - github-actions-automate-projects: - runs-on: ubuntu-latest - - if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} - 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.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.9.0 - with: - project: CoMPAS Pull Request Overview Board - column: To do - repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }} diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 76b2dc8..38ab630 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -24,16 +24,10 @@ jobs: uses: actions/checkout@v4 - name: Cache Docker Register - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} - - name: Cache Maven packages - uses: actions/cache@v3 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - name: Set up Docker Buildx id: buildx @@ -43,6 +37,7 @@ jobs: with: distribution: 'zulu' java-version: '17' + cache: 'maven' - name: Create custom Maven Settings.xml uses: whelk-io/maven-settings-xml-action@v21 diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 2da4a76..93a3b2d 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -8,6 +8,7 @@ on: permissions: contents: write + packages: write pull-requests: write name: release-please @@ -19,33 +20,17 @@ jobs: - uses: google-github-actions/release-please-action@v4 id: release with: - release-type: maven - package-name: compas-cim-mapping - target-branch: ${{ github.ref_name }} - - if: ${{ steps.release.outputs.release_created }} - name: Checkout + target-branch: main + - name: Checkout + if: ${{ steps.release.outputs.release_created }} uses: actions/checkout@v4 - name: Cache Docker Register if: ${{ steps.release.outputs.release_created }} - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} - - name: Cache Maven packages - if: ${{ steps.release.outputs.release_created }} - uses: actions/cache@v3 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - - - name: Extract tag name - if: ${{ steps.release.outputs.release_created }} - id: extract_tagname - shell: bash - # Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/. - run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})" - name: Set up JDK 17 if: ${{ steps.release.outputs.release_created }} @@ -53,6 +38,7 @@ jobs: with: distribution: 'zulu' java-version: '17' + cache: 'maven' - name: Set up Docker Buildx if: ${{ steps.release.outputs.release_created }} id: buildx @@ -66,15 +52,10 @@ jobs: - name: Create custom Maven Settings.xml if: ${{ steps.release.outputs.release_created }} - 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 }}" }]' - - name: Set version with Maven - if: ${{ steps.release.outputs.release_created }} - run: ./mvnw -B versions:set -DprocessAllModules=true -DnewVersion=${{ steps.extract_tagname.outputs.tagname }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy with Maven to GitHub Packages and Docker Hub if: ${{ steps.release.outputs.release_created }} run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index b89fda9..58204bb 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -13,4 +13,4 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: REUSE Compliance Check - uses: fsfe/reuse-action@v2 + uses: fsfe/reuse-action@v3 diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 3132748..d05e0fd 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -54,23 +54,18 @@ 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 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '17' + cache: 'maven' - name: Set Common Sonar Variables id: sonar_env diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml index 7728d79..44e1135 100644 --- a/.github/workflows/sonarcloud-build.yml +++ b/.github/workflows/sonarcloud-build.yml @@ -31,23 +31,18 @@ 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 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '17' + cache: 'maven' - name: Create custom Maven Settings.xml uses: whelk-io/maven-settings-xml-action@v21 diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000..e1206f4 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "0.10.4" +} diff --git a/.release-please-manifest.json.license b/.release-please-manifest.json.license new file mode 100644 index 0000000..9ab6622 --- /dev/null +++ b/.release-please-manifest.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 Alliander N.V. + +SPDX-License-Identifier: Apache-2.0 diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 8410bdf..7a2a030 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/app/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1108 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index 8a1278c..90c502b 100644 --- a/app/src/main/docker/Dockerfile.native +++ b/app/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1108 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/pom.xml b/pom.xml index d79f381..039e3d0 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 UTF-8 - 3.12.1 + 3.13.0 3.2.5 3.2.0 @@ -27,8 +27,8 @@ SPDX-License-Identifier: Apache-2.0 2.16.6.Final 3.1.1 - 6.1.1 - 2.22.1 + 6.3.0 + 2.23.1 1.5.5.Final 0.9.1 diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000..4da413b --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,12 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "bootstrap-sha": "2dc26242b596d099a88f61063a063c710db0a8de", + "include-component-in-tag": false, + "packages": { + ".": { + "release-type": "maven", + "package-name": "compas-cim-mapping", + "initial-version": "0.10.4" + } + } +} diff --git a/release-please-config.json.license b/release-please-config.json.license new file mode 100644 index 0000000..9ab6622 --- /dev/null +++ b/release-please-config.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 Alliander N.V. + +SPDX-License-Identifier: Apache-2.0