From 61ac99fdb9006e579d456275716395ccfe5f9f69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 08:31:44 +0000 Subject: [PATCH 01/37] Bump powsybl-single-line-diagram-core from 3.1.0 to 3.2.0 Bumps powsybl-single-line-diagram-core from 3.1.0 to 3.2.0. --- updated-dependencies: - dependency-name: com.powsybl:powsybl-single-line-diagram-core 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 63465e1..bdc24ac 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 2.16.6.Final 2.20.0 - 3.1.0 + 3.2.0 2.10.1 0.9.1 From 2869a40644a39b8d448d79e47b591ca4723383de Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Tue, 25 Apr 2023 11:53:45 +0200 Subject: [PATCH 02/37] Fixed import --- .../scl/auto/alignment/service/SclAutoAlignmentService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java index cc541fa..1aefec6 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java @@ -8,8 +8,8 @@ import com.powsybl.sld.layout.PositionVoltageLevelLayoutFactory; import com.powsybl.sld.library.ConvergenceComponentLibrary; import com.powsybl.sld.model.graphs.SubstationGraph; -import com.powsybl.sld.svg.BasicStyleProvider; import com.powsybl.sld.svg.DefaultSVGWriter; +import com.powsybl.sld.svg.styles.BasicStyleProvider; import org.lfenergy.compas.core.commons.ElementConverter; import org.lfenergy.compas.scl.auto.alignment.builder.SubstationGraphBuilder; import org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentException; From 94b9108c7ea6cb1f5626dd3fef4683ad215caf48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 17:58:47 +0000 Subject: [PATCH 03/37] Bump jacoco-maven-plugin from 0.8.9 to 0.8.10 Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.9 to 0.8.10. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.9...v0.8.10) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin 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 63465e1..26de42b 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ SPDX-License-Identifier: Apache-2.0 java - 0.8.9 + 0.8.10 jacoco target/site/jacoco/jacoco.xml, From 650543ca5f58f7bb75b0a5bf747a7a68ee9ab521 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 09:16:45 +0200 Subject: [PATCH 04/37] Bump maven-source-plugin from 3.2.1 to 3.3.0 (#205) Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.0. - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.2.1...maven-source-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca9c497..e3c6e1d 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources From 38b71d2ff1c43487504b3da13179ea81985ed5ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 09:30:47 +0200 Subject: [PATCH 05/37] Bump ubi8/ubi-minimal from 8.7-1107 to 8.8-860 in /app/src/main/docker (#204) Bumps ubi8/ubi-minimal from 8.7-1107 to 8.8-860. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Steffen van den Driest <35229971+Stef3st@users.noreply.github.com> --- 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 7fae8d0..8736459 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.7-1107 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 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 15681ae..215d070 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.7-1107 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 5aa7d08331ee8188976ee6ad740c7fb812b0d508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mu=C3=B1oz?= Date: Wed, 7 Jun 2023 18:00:38 +0200 Subject: [PATCH 06/37] refactor: split SC worflow into build & analysis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Muñoz --- .github/workflows/sonarcloud-analysis.yml | 168 ++++++++++++---------- .github/workflows/sonarcloud-build.yml | 77 ++++++++++ 2 files changed, 173 insertions(+), 72 deletions(-) create mode 100644 .github/workflows/sonarcloud-build.yml diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index da4d2bc..9796802 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -4,82 +4,106 @@ name: SonarCloud Analysis -on: - push: - branches: - - '**' - pull_request: - branches: - - 'main' - - 'develop' - pull_request_target: - branches: - - 'main' - - 'develop' +on: + workflow_run: + workflows: [SonarCloud Build] + types: [completed] jobs: - build: - name: SonarCloud + sonar-check: runs-on: ubuntu-latest + if: github.event.workflow_run.conclusion == 'success' timeout-minutes: 15 - - if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Cache SonarCloud packages - uses: actions/cache@v3 - 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: echo event + run: cat $GITHUB_EVENT_PATH + - name: Download PR number artifact + if: github.event.workflow_run.event == 'pull_request' + uses: dawidd6/action-download-artifact@v2 + with: + workflow: SonarCloud Build + run_id: ${{ github.event.workflow_run.id }} + name: PR_NUMBER + - name: Read PR_NUMBER.txt + if: github.event.workflow_run.event == 'pull_request' + id: pr_number + uses: juliangruber/read-file-action@v1 + with: + path: ./PR_NUMBER.txt + - name: Request GitHub API for PR data + if: github.event.workflow_run.event == 'pull_request' + uses: octokit/request-action@v2.x + id: get_pr_data + with: + route: GET /repos/{full_name}/pulls/{number} + number: ${{ steps.pr_number.outputs.content }} + full_name: ${{ github.event.repository.full_name }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v3 + with: + repository: ${{ github.event.workflow_run.head_repository.full_name }} + ref: ${{ github.event.workflow_run.head_branch }} + fetch-depth: 0 + - name: Checkout base branch + if: github.event.workflow_run.event == 'pull_request' + run: | + git remote add upstream ${{ github.event.repository.clone_url }} + git fetch upstream + git checkout -B ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} upstream/${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} + git checkout ${{ github.event.workflow_run.head_branch }} + git clean -ffdx && git reset --hard HEAD + - name: Cache SonarCloud packages + uses: actions/cache@v3 + 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@v3.11.0 - with: - distribution: 'zulu' - java-version: '17' + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' - - name: Set Common Sonar Variables - id: sonar_env - run: | - echo "##[set-output name=sonar_opts;]$(echo -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.projectKey=com-pas_compas-scl-auto-alignment \ - -Dsonar.organization=com-pas )" - - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v21 - with: - output_file: custom_maven_settings.xml - servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' - - name: Build and analyze (Pull Request) - if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: | - ./mvnw -B -s custom_maven_settings.xml -Psonar \ - ${{ steps.sonar_env.outputs.sonar_opts }} \ - -Dsonar.pullrequest.branch=${{ github.ref_name }} \ - -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \ - -Dsonar.pullrequest.base=${{ github.base_ref }} \ - -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \ - clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar - - name: Build and analyze (Push) - if: ${{ github.event_name == 'push' }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: | - ./mvnw -B -s custom_maven_settings.xml -Psonar \ - ${{ steps.sonar_env.outputs.sonar_opts }} \ - -Dsonar.branch.name=${{ github.ref_name }} \ - clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar + - name: Set Common Sonar Variables + id: sonar_env + run: | + echo "##[set-output name=sonar_opts;]$(echo -Dsonar.host.url=https://sonarcloud.io \ + -Dsonar.projectKey=com-pas_compas-scl-auto-alignment \ + -Dsonar.organization=com-pas )" + - name: Create custom Maven Settings.xml + uses: whelk-io/maven-settings-xml-action@v21 + with: + output_file: custom_maven_settings.xml + servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' + - name: Build and analyze (Pull Request) + if: ${{ github.event.workflow_run.event == 'pull_request' || (github.event.workflow_run.actor == 'dependabot[bot]' && github.event.workflow_run.event == 'pull_request_target') }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml -Psonar \ + ${{ steps.sonar_env.outputs.sonar_opts }} \ + -Dsonar.pullrequest.branch=${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} \ + -Dsonar.pullrequest.key=${{ fromJson(steps.get_pr_data.outputs.data).number }} \ + -Dsonar.pullrequest.base=${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} \ + -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} \ + clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar + - name: Build and analyze (Push) + if: ${{ github.event.workflow_run.event == 'push' }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml -Psonar \ + ${{ steps.sonar_env.outputs.sonar_opts }} \ + -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} \ + -Dsonar.branch.name=${{ github.event.workflow_run.head_branch }} \ + clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml new file mode 100644 index 0000000..58e78fc --- /dev/null +++ b/.github/workflows/sonarcloud-build.yml @@ -0,0 +1,77 @@ +# SPDX-FileCopyrightText: 2022 Alliander N.V. +# +# SPDX-License-Identifier: Apache-2.0 + +name: SonarCloud Build + +on: + push: + branches: + - '**' + pull_request: + branches: + - 'main' + - 'develop' + pull_request_target: + branches: + - 'main' + - 'develop' + +jobs: + precheck-build: + name: Pre Check Build + runs-on: ubuntu-latest + timeout-minutes: 30 + + if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Cache SonarCloud packages + uses: actions/cache@v3 + 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@v3 + with: + distribution: 'zulu' + java-version: '17' + + - name: Create custom Maven Settings.xml + uses: whelk-io/maven-settings-xml-action@v21 + with: + output_file: custom_maven_settings.xml + servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' + - name: Build and analyze (Pull Request) + if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml clean verify + - name: Build and analyze (Push) + if: ${{ github.event_name == 'push' }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml clean verify + - name: Save PR number to file + if: github.event_name == 'pull_request' + run: echo ${{ github.event.number }} > PR_NUMBER.txt + - name: Archive PR number + if: github.event_name == 'pull_request' + uses: actions/upload-artifact@v3 + with: + name: PR_NUMBER + path: PR_NUMBER.txt From 0bd04ff90f1d036b3fc4603475ef24233ca00a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mu=C3=B1oz?= Date: Wed, 7 Jun 2023 19:02:25 +0200 Subject: [PATCH 07/37] fix: restoring actions/setup-java version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Muñoz --- .github/workflows/sonarcloud-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 9796802..1a57995 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -67,7 +67,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v3.11.0 with: distribution: 'zulu' java-version: '17' From 9c1a0501b8989c61ddd5fc9e184d2c37e86bb28f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:58:58 +0000 Subject: [PATCH 08/37] Bump surefire-plugin.version from 3.0.0 to 3.1.2 Bumps `surefire-plugin.version` from 3.0.0 to 3.1.2. Updates `maven-surefire-plugin` from 3.0.0 to 3.1.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.2) Updates `maven-failsafe-plugin` from 3.0.0 to 3.1.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven.plugins:maven-failsafe-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 e3c6e1d..f11137f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 3.11.0 - 3.0.0 + 3.1.2 3.2.0 0.11.0 From 1239556192ce5d96e889c76020e0294dfe57a695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Fri, 26 May 2023 16:19:38 +0200 Subject: [PATCH 09/37] Upgrading to Quarkus 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The main change is migrating from JavaEE to JakartaEE. - update Quarkus bom from io.quarkus:quarkus-universe-bom to io.quarkus.platform:quarkus-bom as it was deprecated since Quarkus 2.1 https://github.com/quarkusio/quarkus/wiki/Migration-Guide-2.1#quarkus-universe-bom-is-deprecated (and it is required to use the Quarkus migration tool) - launched quarkus `quarkus update --stream=3.0` as mentioned in https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.0#automatic-update-tool which dealt with a fair part of the migration. Then it remained few little tasks. - Updated quarkus.index-dependency for jaxb from org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec to `jakarta.xml.bind:jakarta.xml.bind-api` fix #202 Signed-off-by: Aurélien Pupier --- .../CompasSclAutoAlignmentConfiguration.java | 4 ++-- .../rest/monitoring/LivenessHealthCheck.java | 2 +- .../rest/monitoring/ReadinessHealthCheck.java | 2 +- .../rest/v1/SclAutoAlignmentResource.java | 16 ++++++++-------- .../rest/v1/model/SclAutoAlignRequest.java | 12 ++++++------ .../rest/v1/model/SclAutoAlignResponse.java | 8 ++++---- .../rest/v1/model/SclAutoAlignSVGRequest.java | 10 +++++----- .../alignment/rest/v1/model/package-info.java | 4 ++-- app/src/main/resources/application.properties | 4 ++-- pom.xml | 6 +++--- .../service/SclAutoAlignmentService.java | 4 ++-- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java index 08775c7..368073e 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java @@ -6,8 +6,8 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import org.lfenergy.compas.core.commons.ElementConverter; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; /** * Create Beans from other dependencies that are used in the application. diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/LivenessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/LivenessHealthCheck.java index 612a598..83c99b3 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/LivenessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/LivenessHealthCheck.java @@ -7,7 +7,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Liveness @ApplicationScoped diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/ReadinessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/ReadinessHealthCheck.java index d1a24d8..8cee42a 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/ReadinessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/ReadinessHealthCheck.java @@ -7,7 +7,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Readiness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Readiness @ApplicationScoped diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java index 2814585..79570d5 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java @@ -13,14 +13,14 @@ import org.lfenergy.compas.scl.auto.alignment.rest.v1.model.SclAutoAlignSVGRequest; import org.lfenergy.compas.scl.auto.alignment.service.SclAutoAlignmentService; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Authenticated @RequestScoped diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignRequest.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignRequest.java index bbe8cc1..16ce237 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignRequest.java @@ -6,12 +6,12 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignResponse.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignResponse.java index ad6063e..507cf9b 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignResponse.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCL_AUTO_ALIGNMENT_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignSVGRequest.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignSVGRequest.java index 30487ce..1f3a72f 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignSVGRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignSVGRequest.java @@ -6,11 +6,11 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.validation.constraints.NotBlank; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCL_AUTO_ALIGNMENT_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/package-info.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/package-info.java index f4c00aa..3e06416 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/package-info.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/package-info.java @@ -8,7 +8,7 @@ ) package org.lfenergy.compas.scl.auto.alignment.rest.v1.model; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCL_AUTO_ALIGNMENT_SERVICE_V1_NS_URI; diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index 09ee54c..de2c83f 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -18,8 +18,8 @@ quarkus.index-dependency.compas-commons.artifact-id = commons quarkus.index-dependency.rest-commons.group-id = org.lfenergy.compas.core quarkus.index-dependency.rest-commons.artifact-id = rest-commons -quarkus.index-dependency.jaxb-api.group-id = org.jboss.spec.javax.xml.bind -quarkus.index-dependency.jaxb-api.artifact-id = jboss-jaxb-api_2.3_spec +quarkus.index-dependency.jaxb-api.group-id = jakarta.xml.bind +quarkus.index-dependency.jaxb-api.artifact-id = jakarta.xml.bind-api quarkus.index-dependency.powsybl-single-line-diagram-core.group-id=com.powsybl quarkus.index-dependency.powsybl-single-line-diagram-core.artifact-id=powsybl-single-line-diagram-core diff --git a/pom.xml b/pom.xml index e3c6e1d..cd045d8 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0 0.11.0 - 2.16.6.Final + 3.0.4.Final 2.20.0 3.2.0 2.10.1 @@ -56,8 +56,8 @@ SPDX-License-Identifier: Apache-2.0 - io.quarkus - quarkus-universe-bom + io.quarkus.platform + quarkus-bom ${quarkus.platform.version} pom import diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java index 1aefec6..a133cde 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java @@ -15,8 +15,8 @@ import org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentException; import org.lfenergy.compas.scl.auto.alignment.model.GenericSCL; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.StringWriter; From b4c187d9af281acb772223bcc6b0e1866cddb7ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:16:08 +0000 Subject: [PATCH 10/37] build(deps): Bump microprofile-openapi-api from 3.1 to 3.1.1 Bumps [microprofile-openapi-api](https://github.com/eclipse/microprofile-open-api) from 3.1 to 3.1.1. - [Release notes](https://github.com/eclipse/microprofile-open-api/releases) - [Commits](https://github.com/eclipse/microprofile-open-api/compare/3.1...3.1.1) --- updated-dependencies: - dependency-name: org.eclipse.microprofile.openapi:microprofile-openapi-api 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 e3c6e1d..91de9a2 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ SPDX-License-Identifier: Apache-2.0 org.eclipse.microprofile.openapi microprofile-openapi-api - 3.1 + 3.1.1 From 6ff1e2b8aa59d581df1af561cb884e9a2c140098 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 17:42:28 +0000 Subject: [PATCH 11/37] build(deps): Bump fsfe/reuse-action from 1 to 2 Bumps [fsfe/reuse-action](https://github.com/fsfe/reuse-action) from 1 to 2. - [Release notes](https://github.com/fsfe/reuse-action/releases) - [Commits](https://github.com/fsfe/reuse-action/compare/v1...v2) --- 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 9ebd56d..aff5848 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -13,4 +13,4 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: REUSE Compliance Check - uses: fsfe/reuse-action@v1 + uses: fsfe/reuse-action@v2 From 9733dc15c807110e50062b5804c6905fa3ee6b1f Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Mon, 11 Sep 2023 14:50:37 +0200 Subject: [PATCH 12/37] Update reuse.yml Signed-off-by: Pascal Wilbrink --- .github/workflows/reuse.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index aff5848..f7e201b 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -14,3 +14,4 @@ jobs: uses: actions/checkout@v3 - name: REUSE Compliance Check uses: fsfe/reuse-action@v2 + From c0cc6df1d1072b1d238d976dc2d9d23e75937e49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:14:29 +0000 Subject: [PATCH 13/37] build(deps): Bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index ecb530d..c42e4da 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -44,7 +44,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_TOKEN }} From 72d3466cfce70c9436818b5d97160861d8dc4cd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:14:46 +0000 Subject: [PATCH 14/37] build(deps): Bump docker/setup-buildx-action from 2 to 3 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 8cd8275..9fa8b6c 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -37,7 +37,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index ecb530d..00d3b20 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -42,7 +42,7 @@ jobs: java-version: '17' - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub uses: docker/login-action@v2 with: From 71ecee1ac4385ee29f56cf522af3e872a073fe3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:15:06 +0000 Subject: [PATCH 15/37] build(deps): Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.8-860 to 8.8-1072. --- 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 8736459..8a66eb3 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.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 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 215d070..512ad33 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.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From fd6b335f7cd155bbe5eca886dfda95a01c17007a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:55:49 +0000 Subject: [PATCH 16/37] build(deps): Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- .github/workflows/reuse.yml | 2 +- .github/workflows/sonarcloud-analysis.yml | 2 +- .github/workflows/sonarcloud-build.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 9fa8b6c..5a234d2 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache Docker Register uses: actions/cache@v3 diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 00d3b20..1befe9f 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache Docker Register uses: actions/cache@v3 diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index f7e201b..41ba9b2 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: REUSE Compliance Check uses: fsfe/reuse-action@v2 diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 1a57995..6493c60 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -40,7 +40,7 @@ jobs: full_name: ${{ github.event.repository.full_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: ${{ github.event.workflow_run.head_repository.full_name }} ref: ${{ github.event.workflow_run.head_branch }} diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml index 58e78fc..7228a74 100644 --- a/.github/workflows/sonarcloud-build.yml +++ b/.github/workflows/sonarcloud-build.yml @@ -26,7 +26,7 @@ jobs: if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 From 4f6d075896c4e695df4bb97ade79a3f806face3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 14:55:08 +0200 Subject: [PATCH 17/37] build(deps): Bump org.apache.maven.plugins:maven-javadoc-plugin (#224) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.5.0...maven-javadoc-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ed6b0d0..8d3006e 100644 --- a/pom.xml +++ b/pom.xml @@ -240,7 +240,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 attach-javadocs From 8a839d15d67fc0dc92409d6610e69a8ffb805f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mu=C3=B1oz?= Date: Wed, 4 Oct 2023 13:17:13 +0200 Subject: [PATCH 18/37] chore: update compas-core version to 0.16.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Muñoz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a50f60..54b8283 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache-2.0 3.1.2 3.2.0 - 0.11.0 + 0.16.0 3.0.4.Final 2.20.0 From 9e5ae6ec047c97448ec7bb59d694c27916a5cf27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 17:59:19 +0000 Subject: [PATCH 19/37] Bump jacoco-maven-plugin from 0.8.8 to 0.8.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.8 to 0.8.9. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.9) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e54bc60..63465e1 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ SPDX-License-Identifier: Apache-2.0 java - 0.8.8 + 0.8.9 jacoco target/site/jacoco/jacoco.xml, From 8afb7017e5ebcffb214272100ebb01cb8a96d950 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 08:31:44 +0000 Subject: [PATCH 20/37] Bump powsybl-single-line-diagram-core from 3.1.0 to 3.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps powsybl-single-line-diagram-core from 3.1.0 to 3.2.0. --- updated-dependencies: - dependency-name: com.powsybl:powsybl-single-line-diagram-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63465e1..bdc24ac 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 2.16.6.Final 2.20.0 - 3.1.0 + 3.2.0 2.10.1 0.9.1 From fe7a7b28a71b0b301084fff8a0c14e8802b10957 Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Tue, 25 Apr 2023 11:53:45 +0200 Subject: [PATCH 21/37] Fixed import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Muñoz --- .../scl/auto/alignment/service/SclAutoAlignmentService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java index cc541fa..1aefec6 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java @@ -8,8 +8,8 @@ import com.powsybl.sld.layout.PositionVoltageLevelLayoutFactory; import com.powsybl.sld.library.ConvergenceComponentLibrary; import com.powsybl.sld.model.graphs.SubstationGraph; -import com.powsybl.sld.svg.BasicStyleProvider; import com.powsybl.sld.svg.DefaultSVGWriter; +import com.powsybl.sld.svg.styles.BasicStyleProvider; import org.lfenergy.compas.core.commons.ElementConverter; import org.lfenergy.compas.scl.auto.alignment.builder.SubstationGraphBuilder; import org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentException; From e89da0240ee1d71b59bdfbf8c4037b5810240a4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 17:58:47 +0000 Subject: [PATCH 22/37] Bump jacoco-maven-plugin from 0.8.9 to 0.8.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.9 to 0.8.10. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.9...v0.8.10) --- updated-dependencies: - dependency-name: org.jacoco:jacoco-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bdc24ac..ca9c497 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ SPDX-License-Identifier: Apache-2.0 java - 0.8.9 + 0.8.10 jacoco target/site/jacoco/jacoco.xml, From 85a62c6a5fd7d437318fb8fca9b16c246f2e1981 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 09:16:45 +0200 Subject: [PATCH 23/37] Bump maven-source-plugin from 3.2.1 to 3.3.0 (#205) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.0. - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.2.1...maven-source-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Juan Muñoz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca9c497..e3c6e1d 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources From 969d4d12d8f1d1f122171e31956b1646738462d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 09:30:47 +0200 Subject: [PATCH 24/37] Bump ubi8/ubi-minimal from 8.7-1107 to 8.8-860 in /app/src/main/docker (#204) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps ubi8/ubi-minimal from 8.7-1107 to 8.8-860. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Steffen van den Driest <35229971+Stef3st@users.noreply.github.com> Signed-off-by: Juan Muñoz --- 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 7fae8d0..8736459 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.7-1107 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 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 15681ae..215d070 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.7-1107 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-860 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From cd2398befda9c87c348af054189d490d0f5c5058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Fri, 26 May 2023 16:19:38 +0200 Subject: [PATCH 25/37] Upgrading to Quarkus 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The main change is migrating from JavaEE to JakartaEE. - update Quarkus bom from io.quarkus:quarkus-universe-bom to io.quarkus.platform:quarkus-bom as it was deprecated since Quarkus 2.1 https://github.com/quarkusio/quarkus/wiki/Migration-Guide-2.1#quarkus-universe-bom-is-deprecated (and it is required to use the Quarkus migration tool) - launched quarkus `quarkus update --stream=3.0` as mentioned in https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.0#automatic-update-tool which dealt with a fair part of the migration. Then it remained few little tasks. - Updated quarkus.index-dependency for jaxb from org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec to `jakarta.xml.bind:jakarta.xml.bind-api` fix #202 Signed-off-by: Aurélien Pupier Signed-off-by: Juan Muñoz --- .../CompasSclAutoAlignmentConfiguration.java | 4 ++-- .../rest/monitoring/LivenessHealthCheck.java | 2 +- .../rest/monitoring/ReadinessHealthCheck.java | 2 +- .../rest/v1/SclAutoAlignmentResource.java | 16 ++++++++-------- .../rest/v1/model/SclAutoAlignRequest.java | 12 ++++++------ .../rest/v1/model/SclAutoAlignResponse.java | 8 ++++---- .../rest/v1/model/SclAutoAlignSVGRequest.java | 10 +++++----- .../alignment/rest/v1/model/package-info.java | 4 ++-- app/src/main/resources/application.properties | 4 ++-- pom.xml | 6 +++--- .../service/SclAutoAlignmentService.java | 4 ++-- 11 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java index 08775c7..368073e 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java @@ -6,8 +6,8 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import org.lfenergy.compas.core.commons.ElementConverter; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; /** * Create Beans from other dependencies that are used in the application. diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/LivenessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/LivenessHealthCheck.java index 612a598..83c99b3 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/LivenessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/LivenessHealthCheck.java @@ -7,7 +7,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Liveness @ApplicationScoped diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/ReadinessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/ReadinessHealthCheck.java index d1a24d8..8cee42a 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/ReadinessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/monitoring/ReadinessHealthCheck.java @@ -7,7 +7,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Readiness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Readiness @ApplicationScoped diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java index 2814585..79570d5 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java @@ -13,14 +13,14 @@ import org.lfenergy.compas.scl.auto.alignment.rest.v1.model.SclAutoAlignSVGRequest; import org.lfenergy.compas.scl.auto.alignment.service.SclAutoAlignmentService; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Authenticated @RequestScoped diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignRequest.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignRequest.java index bbe8cc1..16ce237 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignRequest.java @@ -6,12 +6,12 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignResponse.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignResponse.java index ad6063e..507cf9b 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignResponse.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCL_AUTO_ALIGNMENT_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignSVGRequest.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignSVGRequest.java index 30487ce..1f3a72f 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignSVGRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/SclAutoAlignSVGRequest.java @@ -6,11 +6,11 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.validation.constraints.NotBlank; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCL_AUTO_ALIGNMENT_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/package-info.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/package-info.java index f4c00aa..3e06416 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/package-info.java +++ b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/model/package-info.java @@ -8,7 +8,7 @@ ) package org.lfenergy.compas.scl.auto.alignment.rest.v1.model; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCL_AUTO_ALIGNMENT_SERVICE_V1_NS_URI; diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index 09ee54c..de2c83f 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -18,8 +18,8 @@ quarkus.index-dependency.compas-commons.artifact-id = commons quarkus.index-dependency.rest-commons.group-id = org.lfenergy.compas.core quarkus.index-dependency.rest-commons.artifact-id = rest-commons -quarkus.index-dependency.jaxb-api.group-id = org.jboss.spec.javax.xml.bind -quarkus.index-dependency.jaxb-api.artifact-id = jboss-jaxb-api_2.3_spec +quarkus.index-dependency.jaxb-api.group-id = jakarta.xml.bind +quarkus.index-dependency.jaxb-api.artifact-id = jakarta.xml.bind-api quarkus.index-dependency.powsybl-single-line-diagram-core.group-id=com.powsybl quarkus.index-dependency.powsybl-single-line-diagram-core.artifact-id=powsybl-single-line-diagram-core diff --git a/pom.xml b/pom.xml index e3c6e1d..cd045d8 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0 0.11.0 - 2.16.6.Final + 3.0.4.Final 2.20.0 3.2.0 2.10.1 @@ -56,8 +56,8 @@ SPDX-License-Identifier: Apache-2.0 - io.quarkus - quarkus-universe-bom + io.quarkus.platform + quarkus-bom ${quarkus.platform.version} pom import diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java index 1aefec6..a133cde 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java @@ -15,8 +15,8 @@ import org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentException; import org.lfenergy.compas.scl.auto.alignment.model.GenericSCL; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.StringWriter; From 6757368168ce999e9039412ad3c8586916f3dcec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mu=C3=B1oz?= Date: Wed, 7 Jun 2023 18:00:38 +0200 Subject: [PATCH 26/37] refactor: split SC worflow into build & analysis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Muñoz --- .github/workflows/sonarcloud-analysis.yml | 168 ++++++++++++---------- .github/workflows/sonarcloud-build.yml | 77 ++++++++++ 2 files changed, 173 insertions(+), 72 deletions(-) create mode 100644 .github/workflows/sonarcloud-build.yml diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index da4d2bc..9796802 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -4,82 +4,106 @@ name: SonarCloud Analysis -on: - push: - branches: - - '**' - pull_request: - branches: - - 'main' - - 'develop' - pull_request_target: - branches: - - 'main' - - 'develop' +on: + workflow_run: + workflows: [SonarCloud Build] + types: [completed] jobs: - build: - name: SonarCloud + sonar-check: runs-on: ubuntu-latest + if: github.event.workflow_run.conclusion == 'success' timeout-minutes: 15 - - if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Cache SonarCloud packages - uses: actions/cache@v3 - 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: echo event + run: cat $GITHUB_EVENT_PATH + - name: Download PR number artifact + if: github.event.workflow_run.event == 'pull_request' + uses: dawidd6/action-download-artifact@v2 + with: + workflow: SonarCloud Build + run_id: ${{ github.event.workflow_run.id }} + name: PR_NUMBER + - name: Read PR_NUMBER.txt + if: github.event.workflow_run.event == 'pull_request' + id: pr_number + uses: juliangruber/read-file-action@v1 + with: + path: ./PR_NUMBER.txt + - name: Request GitHub API for PR data + if: github.event.workflow_run.event == 'pull_request' + uses: octokit/request-action@v2.x + id: get_pr_data + with: + route: GET /repos/{full_name}/pulls/{number} + number: ${{ steps.pr_number.outputs.content }} + full_name: ${{ github.event.repository.full_name }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v3 + with: + repository: ${{ github.event.workflow_run.head_repository.full_name }} + ref: ${{ github.event.workflow_run.head_branch }} + fetch-depth: 0 + - name: Checkout base branch + if: github.event.workflow_run.event == 'pull_request' + run: | + git remote add upstream ${{ github.event.repository.clone_url }} + git fetch upstream + git checkout -B ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} upstream/${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} + git checkout ${{ github.event.workflow_run.head_branch }} + git clean -ffdx && git reset --hard HEAD + - name: Cache SonarCloud packages + uses: actions/cache@v3 + 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@v3.11.0 - with: - distribution: 'zulu' - java-version: '17' + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' - - name: Set Common Sonar Variables - id: sonar_env - run: | - echo "##[set-output name=sonar_opts;]$(echo -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.projectKey=com-pas_compas-scl-auto-alignment \ - -Dsonar.organization=com-pas )" - - name: Create custom Maven Settings.xml - uses: whelk-io/maven-settings-xml-action@v21 - with: - output_file: custom_maven_settings.xml - servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' - - name: Build and analyze (Pull Request) - if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: | - ./mvnw -B -s custom_maven_settings.xml -Psonar \ - ${{ steps.sonar_env.outputs.sonar_opts }} \ - -Dsonar.pullrequest.branch=${{ github.ref_name }} \ - -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \ - -Dsonar.pullrequest.base=${{ github.base_ref }} \ - -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \ - clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar - - name: Build and analyze (Push) - if: ${{ github.event_name == 'push' }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: | - ./mvnw -B -s custom_maven_settings.xml -Psonar \ - ${{ steps.sonar_env.outputs.sonar_opts }} \ - -Dsonar.branch.name=${{ github.ref_name }} \ - clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar + - name: Set Common Sonar Variables + id: sonar_env + run: | + echo "##[set-output name=sonar_opts;]$(echo -Dsonar.host.url=https://sonarcloud.io \ + -Dsonar.projectKey=com-pas_compas-scl-auto-alignment \ + -Dsonar.organization=com-pas )" + - name: Create custom Maven Settings.xml + uses: whelk-io/maven-settings-xml-action@v21 + with: + output_file: custom_maven_settings.xml + servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' + - name: Build and analyze (Pull Request) + if: ${{ github.event.workflow_run.event == 'pull_request' || (github.event.workflow_run.actor == 'dependabot[bot]' && github.event.workflow_run.event == 'pull_request_target') }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml -Psonar \ + ${{ steps.sonar_env.outputs.sonar_opts }} \ + -Dsonar.pullrequest.branch=${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} \ + -Dsonar.pullrequest.key=${{ fromJson(steps.get_pr_data.outputs.data).number }} \ + -Dsonar.pullrequest.base=${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} \ + -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} \ + clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar + - name: Build and analyze (Push) + if: ${{ github.event.workflow_run.event == 'push' }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml -Psonar \ + ${{ steps.sonar_env.outputs.sonar_opts }} \ + -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} \ + -Dsonar.branch.name=${{ github.event.workflow_run.head_branch }} \ + clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml new file mode 100644 index 0000000..58e78fc --- /dev/null +++ b/.github/workflows/sonarcloud-build.yml @@ -0,0 +1,77 @@ +# SPDX-FileCopyrightText: 2022 Alliander N.V. +# +# SPDX-License-Identifier: Apache-2.0 + +name: SonarCloud Build + +on: + push: + branches: + - '**' + pull_request: + branches: + - 'main' + - 'develop' + pull_request_target: + branches: + - 'main' + - 'develop' + +jobs: + precheck-build: + name: Pre Check Build + runs-on: ubuntu-latest + timeout-minutes: 30 + + if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Cache SonarCloud packages + uses: actions/cache@v3 + 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@v3 + with: + distribution: 'zulu' + java-version: '17' + + - name: Create custom Maven Settings.xml + uses: whelk-io/maven-settings-xml-action@v21 + with: + output_file: custom_maven_settings.xml + servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' + - name: Build and analyze (Pull Request) + if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml clean verify + - name: Build and analyze (Push) + if: ${{ github.event_name == 'push' }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + ./mvnw -B -s custom_maven_settings.xml clean verify + - name: Save PR number to file + if: github.event_name == 'pull_request' + run: echo ${{ github.event.number }} > PR_NUMBER.txt + - name: Archive PR number + if: github.event_name == 'pull_request' + uses: actions/upload-artifact@v3 + with: + name: PR_NUMBER + path: PR_NUMBER.txt From af6443da224771b5fc56d24b38f2fd3ce878d987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mu=C3=B1oz?= Date: Wed, 7 Jun 2023 19:02:25 +0200 Subject: [PATCH 27/37] fix: restoring actions/setup-java version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Muñoz --- .github/workflows/sonarcloud-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 9796802..1a57995 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -67,7 +67,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v3.11.0 with: distribution: 'zulu' java-version: '17' From 77f6ca2294f157ac3f976ca547ce2306641b8659 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:16:08 +0000 Subject: [PATCH 28/37] build(deps): Bump microprofile-openapi-api from 3.1 to 3.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [microprofile-openapi-api](https://github.com/eclipse/microprofile-open-api) from 3.1 to 3.1.1. - [Release notes](https://github.com/eclipse/microprofile-open-api/releases) - [Commits](https://github.com/eclipse/microprofile-open-api/compare/3.1...3.1.1) --- updated-dependencies: - dependency-name: org.eclipse.microprofile.openapi:microprofile-openapi-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd045d8..65c5790 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ SPDX-License-Identifier: Apache-2.0 org.eclipse.microprofile.openapi microprofile-openapi-api - 3.1 + 3.1.1 From 3ddeb1c87c2ad38e524c54d4eb34f500c1d7de22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 17:42:28 +0000 Subject: [PATCH 29/37] build(deps): Bump fsfe/reuse-action from 1 to 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [fsfe/reuse-action](https://github.com/fsfe/reuse-action) from 1 to 2. - [Release notes](https://github.com/fsfe/reuse-action/releases) - [Commits](https://github.com/fsfe/reuse-action/compare/v1...v2) --- updated-dependencies: - dependency-name: fsfe/reuse-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- .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 9ebd56d..aff5848 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -13,4 +13,4 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: REUSE Compliance Check - uses: fsfe/reuse-action@v1 + uses: fsfe/reuse-action@v2 From f8589023c54c742ce5405da2efa4d94d06f387c5 Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Mon, 11 Sep 2023 14:50:37 +0200 Subject: [PATCH 30/37] Update reuse.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pascal Wilbrink Signed-off-by: Juan Muñoz --- .github/workflows/reuse.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index aff5848..f7e201b 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -14,3 +14,4 @@ jobs: uses: actions/checkout@v3 - name: REUSE Compliance Check uses: fsfe/reuse-action@v2 + From b1088c22cb8aacfb58cf41004aee5024a6647bd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:14:46 +0000 Subject: [PATCH 31/37] build(deps): Bump docker/setup-buildx-action from 2 to 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 8cd8275..9fa8b6c 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -37,7 +37,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index ecb530d..00d3b20 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -42,7 +42,7 @@ jobs: java-version: '17' - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub uses: docker/login-action@v2 with: From 34816779fe64ab6b4fdb58940b819d572091f0b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:15:06 +0000 Subject: [PATCH 32/37] build(deps): Bump ubi8/ubi-minimal in /app/src/main/docker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps ubi8/ubi-minimal from 8.8-860 to 8.8-1072. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- 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 8736459..8a66eb3 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.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 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 215d070..512ad33 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.8-860 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 18f4b0079e7ad60bcf73a131f166eee5e62f7aaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:58:58 +0000 Subject: [PATCH 33/37] Bump surefire-plugin.version from 3.0.0 to 3.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps `surefire-plugin.version` from 3.0.0 to 3.1.2. Updates `maven-surefire-plugin` from 3.0.0 to 3.1.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.2) Updates `maven-failsafe-plugin` from 3.0.0 to 3.1.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0...surefire-3.1.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65c5790..a4d6279 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 3.11.0 - 3.0.0 + 3.1.2 3.2.0 0.11.0 From c1a68b5f6ed6ad5db153f66833ddda1df475d0d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:55:49 +0000 Subject: [PATCH 34/37] build(deps): Bump actions/checkout from 3 to 4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- .github/workflows/reuse.yml | 2 +- .github/workflows/sonarcloud-analysis.yml | 2 +- .github/workflows/sonarcloud-build.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 9fa8b6c..5a234d2 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache Docker Register uses: actions/cache@v3 diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 00d3b20..1befe9f 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache Docker Register uses: actions/cache@v3 diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml index f7e201b..41ba9b2 100644 --- a/.github/workflows/reuse.yml +++ b/.github/workflows/reuse.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: REUSE Compliance Check uses: fsfe/reuse-action@v2 diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 1a57995..6493c60 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -40,7 +40,7 @@ jobs: full_name: ${{ github.event.repository.full_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: ${{ github.event.workflow_run.head_repository.full_name }} ref: ${{ github.event.workflow_run.head_branch }} diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml index 58e78fc..7228a74 100644 --- a/.github/workflows/sonarcloud-build.yml +++ b/.github/workflows/sonarcloud-build.yml @@ -26,7 +26,7 @@ jobs: if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 From 52622a8a586b939dfc0c9691999df07ccb467bdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:14:29 +0000 Subject: [PATCH 35/37] build(deps): Bump docker/login-action from 2 to 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: Juan Muñoz --- .github/workflows/release-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 1befe9f..f280cfb 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -44,7 +44,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_TOKEN }} From 18d720cc179b6be1b9611a061eaaa78b0fdefde1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 14:55:08 +0200 Subject: [PATCH 36/37] build(deps): Bump org.apache.maven.plugins:maven-javadoc-plugin (#224) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.5.0...maven-javadoc-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Juan Muñoz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4d6279..0a50f60 100644 --- a/pom.xml +++ b/pom.xml @@ -240,7 +240,7 @@ SPDX-License-Identifier: Apache-2.0 org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 attach-javadocs From 41f5072e33df0bc0cadfd3461471b8abbba6711b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mu=C3=B1oz?= Date: Wed, 4 Oct 2023 13:17:13 +0200 Subject: [PATCH 37/37] chore: update compas-core version to 0.16.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan Muñoz --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a50f60..54b8283 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ SPDX-License-Identifier: Apache-2.0 3.1.2 3.2.0 - 0.11.0 + 0.16.0 3.0.4.Final 2.20.0