Merge branch 'develop' into dependabot/maven/org.apache.maven.plugins-maven-source-plugin-3.3.1

Author: noraeb

.github/workflows/automate-projects.yml

@@ -8,6 +8,7 @@ on:
 
 permissions:
   contents: write
+  packages: write
   pull-requests: write
 
 name: release-please
@@ -19,11 +20,9 @@ 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
@@ -33,13 +32,6 @@ jobs:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
 
-      - 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
@@ -60,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

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

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