Merge branch 'develop' into dependabot/docker/app/src/main/docker/ubi…

…8/ubi-minimal-8.9-1137
com-pas · Mar 10, 2024 · 7fc588c · 7fc588c
2 parents 4083008 + 6b88a78
commit 7fc588c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -40,7 +40,7 @@ jobs:
           cache: 'maven'
 
       - 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
@@ -59,7 +59,7 @@ 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 }}" }]'

diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -79,7 +79,7 @@ jobs:
           -Dsonar.projectKey=com-pas_compas-scl-data-service \
           -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
@@ -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 }}" }]'

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0
         <quarkus.platform.version>3.7.1</quarkus.platform.version>
 
         <microprofile-openapi-api.version>3.1.1</microprofile-openapi-api.version>
-        <log4j2.version>2.22.1</log4j2.version>
+        <log4j2.version>2.23.0</log4j2.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>