Merge pull request #453 from com-pas/develop

chore: Merge develop into main

Author: clepski

.github/workflows/automate-projects.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

.github/workflows/build-project.yml

@@ -8,6 +8,7 @@ on:
 
 permissions:
   contents: write
+  packages: write
   pull-requests: write
 
 name: release-please
@@ -19,40 +20,25 @@ 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/<tag_name>.
-        run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
 
       - name: Set up JDK 17
         if: ${{ steps.release.outputs.release_created }}
         uses: actions/setup-java@v4
         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

.github/workflows/release-please.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

.github/workflows/reuse.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

.github/workflows/sonarcloud-analysis.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

.github/workflows/sonarcloud-build.yml

@@ -0,0 +1,3 @@
+{
+  ".": "0.10.4"
+}

.release-please-manifest.json

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Alliander N.V.
+
+SPDX-License-Identifier: Apache-2.0

.release-please-manifest.json.license

@@ -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

app/src/main/docker/Dockerfile.jvm

@@ -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 \

app/src/main/docker/Dockerfile.native

@@ -19,16 +19,16 @@ SPDX-License-Identifier: Apache-2.0
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <compiler-plugin.version>3.12.1</compiler-plugin.version>
+        <compiler-plugin.version>3.13.0</compiler-plugin.version>
         <surefire-plugin.version>3.2.5</surefire-plugin.version>
         <sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
 
         <compas.core.version>0.11.0</compas.core.version>
 
         <quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
         <microprofile-openapi-api.version>3.1.1</microprofile-openapi-api.version>
-        <powsybl.version>6.1.1</powsybl.version>
-        <log4j2.version>2.22.1</log4j2.version>
+        <powsybl.version>6.3.0</powsybl.version>
+        <log4j2.version>2.23.1</log4j2.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>

pom.xml

@@ -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"
+    }
+  }
+}

release-please-config.json

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Alliander N.V.
+
+SPDX-License-Identifier: Apache-2.0