From e13a8a7169d73709bb70661e468fafca946e2953 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 15:48:40 +0000 Subject: [PATCH 01/19] build(deps): Bump actions/cache from 3 to 4 Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-project.yml | 4 ++-- .github/workflows/release-please.yml | 4 ++-- .github/workflows/sonarcloud-analysis.yml | 4 ++-- .github/workflows/sonarcloud-build.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 76b2dc8..d49d652 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -24,12 +24,12 @@ 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 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 2da4a76..716d146 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -28,13 +28,13 @@ jobs: - 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 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 3132748..f0df76f 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -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') }} diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml index 7728d79..9c0b830 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') }} From d8718a083933256b6e48cbb07eadccf04d388650 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:16:37 +0000 Subject: [PATCH 02/19] build(deps): Bump powsybl.version from 6.1.1 to 6.2.0 Bumps `powsybl.version` from 6.1.1 to 6.2.0. Updates `com.powsybl:powsybl-cgmes-conversion` from 6.1.1 to 6.2.0 Updates `com.powsybl:powsybl-triple-store-impl-rdf4j` from 6.1.1 to 6.2.0 --- updated-dependencies: - dependency-name: com.powsybl:powsybl-cgmes-conversion dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.powsybl:powsybl-triple-store-impl-rdf4j dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d79f381..c67c43b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 2.16.6.Final 3.1.1 - 6.1.1 + 6.2.0 2.22.1 1.5.5.Final 0.9.1 From 69363be27871c207baf639bf085cd4b421b2d585 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:10:46 +0000 Subject: [PATCH 03/19] build(deps): Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.9-1108 to 8.9-1108.1706691034. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 8410bdf..8eff203 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.9-1108.1706691034 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..2dd35ce 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.9-1108.1706691034 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 7da2c27ece33ca3366fbc948fcdc3a95f2f7a11a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Feb 2024 15:25:48 +0000 Subject: [PATCH 04/19] build(deps): Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.9-1108.1706691034 to 8.9-1137. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 8eff203..5824c35 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.1706691034 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1137 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 2dd35ce..9ccb5d5 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.1706691034 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1137 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 6c2eae1dbcaba20cee937ea0fccf033c41500e77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:07:35 +0000 Subject: [PATCH 05/19] build(deps): Bump powsybl.version from 6.2.0 to 6.2.2 Bumps `powsybl.version` from 6.2.0 to 6.2.2. Updates `com.powsybl:powsybl-cgmes-conversion` from 6.2.0 to 6.2.2 Updates `com.powsybl:powsybl-triple-store-impl-rdf4j` from 6.2.0 to 6.2.2 --- updated-dependencies: - dependency-name: com.powsybl:powsybl-cgmes-conversion dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.powsybl:powsybl-triple-store-impl-rdf4j dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c67c43b..9f7d330 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 2.16.6.Final 3.1.1 - 6.2.0 + 6.2.2 2.22.1 1.5.5.Final 0.9.1 From f39b98dd3bfab43abeeb42d2a077cf50913ec332 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 08:48:03 +0000 Subject: [PATCH 06/19] build(deps): Bump log4j2.version from 2.22.1 to 2.23.0 Bumps `log4j2.version` from 2.22.1 to 2.23.0. Updates `org.apache.logging.log4j:log4j-api` from 2.22.1 to 2.23.0 Updates `org.apache.logging.log4j:log4j-core` from 2.22.1 to 2.23.0 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.22.1 to 2.23.0 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f7d330..f71d602 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ SPDX-License-Identifier: Apache-2.0 2.16.6.Final 3.1.1 6.2.2 - 2.22.1 + 2.23.0 1.5.5.Final 0.9.1 From 9de8fc5dfc4a5d9ad6e02e7950fb3a9ad073a682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Tue, 5 Mar 2024 15:52:58 +0100 Subject: [PATCH 07/19] chore(305): use built-in Maven cache mechanism of setup-java GitHub Action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes com-pas#305 Signed-off-by: Aurélien Pupier --- .github/workflows/build-project.yml | 7 +------ .github/workflows/release-please.yml | 8 +------- .github/workflows/sonarcloud-analysis.yml | 7 +------ .github/workflows/sonarcloud-build.yml | 7 +------ 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index d49d652..38ab630 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -28,12 +28,6 @@ jobs: with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} - - name: Cache Maven packages - uses: actions/cache@v4 - 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 716d146..3abf94a 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -32,13 +32,6 @@ jobs: with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }} - - name: Cache Maven packages - if: ${{ steps.release.outputs.release_created }} - uses: actions/cache@v4 - 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 }} @@ -53,6 +46,7 @@ jobs: with: distribution: 'zulu' java-version: '17' + cache: 'maven' - name: Set up Docker Buildx if: ${{ steps.release.outputs.release_created }} id: buildx diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index f0df76f..d05e0fd 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -59,18 +59,13 @@ jobs: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - - name: Cache Maven packages - uses: actions/cache@v4 - 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 9c0b830..44e1135 100644 --- a/.github/workflows/sonarcloud-build.yml +++ b/.github/workflows/sonarcloud-build.yml @@ -36,18 +36,13 @@ jobs: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - - name: Cache Maven packages - uses: actions/cache@v4 - 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 From 40d94fd97e31e98b50ef8938a29c879a1afc6d65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 08:09:05 +0000 Subject: [PATCH 08/19] build(deps): Bump fsfe/reuse-action from 2 to 3 Bumps [fsfe/reuse-action](https://github.com/fsfe/reuse-action) from 2 to 3. - [Release notes](https://github.com/fsfe/reuse-action/releases) - [Commits](https://github.com/fsfe/reuse-action/compare/v2...v3) --- updated-dependencies: - dependency-name: fsfe/reuse-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/reuse.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ff4fad3b800c50155a2d04d8b1773c9587b2067b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:37:56 +0000 Subject: [PATCH 09/19] build(deps): Bump powsybl.version from 6.2.2 to 6.2.3 Bumps `powsybl.version` from 6.2.2 to 6.2.3. Updates `com.powsybl:powsybl-cgmes-conversion` from 6.2.2 to 6.2.3 Updates `com.powsybl:powsybl-triple-store-impl-rdf4j` from 6.2.2 to 6.2.3 --- updated-dependencies: - dependency-name: com.powsybl:powsybl-cgmes-conversion dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.powsybl:powsybl-triple-store-impl-rdf4j dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f71d602..97c856b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 2.16.6.Final 3.1.1 - 6.2.2 + 6.2.3 2.23.0 1.5.5.Final 0.9.1 From 105596a830a94b2cf5f28bb576ea6593d5943040 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:57:57 +0000 Subject: [PATCH 10/19] build(deps): Bump log4j2.version from 2.23.0 to 2.23.1 Bumps `log4j2.version` from 2.23.0 to 2.23.1. Updates `org.apache.logging.log4j:log4j-api` from 2.23.0 to 2.23.1 Updates `org.apache.logging.log4j:log4j-core` from 2.23.0 to 2.23.1 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.23.0 to 2.23.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97c856b..d9c6b88 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ SPDX-License-Identifier: Apache-2.0 2.16.6.Final 3.1.1 6.2.3 - 2.23.0 + 2.23.1 1.5.5.Final 0.9.1 From 31977817b1dd15964753fbe57621fd78ff1207d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:16:16 +0000 Subject: [PATCH 11/19] build(deps): Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.9-1137 to 8.9-1161. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 5824c35..601051b 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-1137 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1161 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 9ccb5d5..9a23be8 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-1137 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1161 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 75126600619076b1f2edb6cf2db2abc16b19c24c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 07:56:59 +0000 Subject: [PATCH 12/19] build(deps): Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.12.1 to 3.13.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.12.1...maven-compiler-plugin-3.13.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9c6b88..3d966e3 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 From 2100cdeec1ea2e9f741c0abdf2dce4f227e5d63d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 10:12:51 +0000 Subject: [PATCH 13/19] build(deps): Bump powsybl.version from 6.2.3 to 6.3.0 Bumps `powsybl.version` from 6.2.3 to 6.3.0. Updates `com.powsybl:powsybl-cgmes-conversion` from 6.2.3 to 6.3.0 Updates `com.powsybl:powsybl-triple-store-impl-rdf4j` from 6.2.3 to 6.3.0 --- updated-dependencies: - dependency-name: com.powsybl:powsybl-cgmes-conversion dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.powsybl:powsybl-triple-store-impl-rdf4j dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d966e3..039e3d0 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 2.16.6.Final 3.1.1 - 6.2.3 + 6.3.0 2.23.1 1.5.5.Final 0.9.1 From 590f411c8bf7d28e160295d4cd78f8e0ca42d8d8 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Mon, 20 Jan 2025 14:27:56 +0100 Subject: [PATCH 14/19] chore: Remove automate projects workflow Signed-off-by: Christopher Lepski --- .github/workflows/automate-projects.yml | 28 ------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .github/workflows/automate-projects.yml 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 }} From 4ef6e3dbb7bdb8bf6fc999a35579473ea958e619 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Tue, 11 Feb 2025 12:58:41 +0100 Subject: [PATCH 15/19] fix: Fix release please action Signed-off-by: Christopher Lepski --- .github/workflows/release-please.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 3abf94a..4ed39e3 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 @@ -33,13 +34,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/. - 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 @@ -64,11 +58,6 @@ jobs: 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 From efdefaac985e3d3b3be0bfa92859edc00156b979 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Tue, 11 Feb 2025 13:03:55 +0100 Subject: [PATCH 16/19] ci: Add release please config Signed-off-by: Christopher Lepski --- release-please-config.json | 12 ++++++++++++ release-please-config.json.license | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 release-please-config.json create mode 100644 release-please-config.json.license 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 From 09ebee841661adf2c232243de4b0283ecf1e2684 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Tue, 11 Feb 2025 13:07:11 +0100 Subject: [PATCH 17/19] ci: Add release please manifest Signed-off-by: Christopher Lepski --- .release-please-manifest.json | 3 +++ .release-please-manifest.json.license | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 .release-please-manifest.json create mode 100644 .release-please-manifest.json.license 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 From a449d3fdcc15dcad4c5a38482721cfeba6bae5cd Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Tue, 11 Feb 2025 13:12:28 +0100 Subject: [PATCH 18/19] ci: Adjust release please action Signed-off-by: Christopher Lepski --- .github/workflows/release-please.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 4ed39e3..93a3b2d 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -20,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 @@ -54,7 +52,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 }}" }]' From 090af5bf220ebb35d45528fef98e49bf5d10fdf5 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Tue, 11 Feb 2025 13:17:48 +0100 Subject: [PATCH 19/19] chore(deps): Bump ubi docker image to 8.10-1154 Signed-off-by: Christopher Lepski --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 601051b..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-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 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index 9a23be8..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-1161 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \