From 2a4b1bfefaa66063a613189f1a14413c6988acd0 Mon Sep 17 00:00:00 2001 From: Steffen van den Driest <35229971+Stef3st@users.noreply.github.com> Date: Tue, 2 May 2023 12:17:17 +0200 Subject: [PATCH] Merge develop into main (#199) * Bump quarkus.platform.version from 2.16.3.Final to 2.16.4.Final Bumps `quarkus.platform.version` from 2.16.3.Final to 2.16.4.Final. Updates `quarkus-universe-bom` from 2.16.3.Final to 2.16.4.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.16.3.Final...2.16.4.Final) Updates `quarkus-maven-plugin` from 2.16.3.Final to 2.16.4.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump maven-compiler-plugin from 3.10.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.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] * Bump surefire-plugin.version from 3.0.0-M9 to 3.0.0 Bumps `surefire-plugin.version` from 3.0.0-M9 to 3.0.0. Updates `maven-surefire-plugin` from 3.0.0-M9 to 3.0.0 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) Updates `maven-failsafe-plugin` from 3.0.0-M9 to 3.0.0 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M9...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump quarkus.platform.version from 2.16.4.Final to 2.16.5.Final Bumps `quarkus.platform.version` from 2.16.4.Final to 2.16.5.Final. Updates `quarkus-universe-bom` from 2.16.4.Final to 2.16.5.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.16.4.Final...2.16.5.Final) Updates `quarkus-maven-plugin` from 2.16.4.Final to 2.16.5.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump actions/setup-java from 3.10.0 to 3.11.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.10.0 to 3.11.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.10.0...v3.11.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-1085 to 8.7-1085.1679482090. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Bump jacoco-maven-plugin from 0.8.8 to 0.8.9 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] * Bump quarkus.platform.version from 2.16.5.Final to 2.16.6.Final Bumps `quarkus.platform.version` from 2.16.5.Final to 2.16.6.Final. Updates `quarkus-universe-bom` from 2.16.5.Final to 2.16.6.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.16.5.Final...2.16.6.Final) Updates `quarkus-maven-plugin` from 2.16.5.Final to 2.16.6.Final --- updated-dependencies: - dependency-name: io.quarkus:quarkus-universe-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump ubi8/ubi-minimal in /app/src/main/docker Bumps ubi8/ubi-minimal from 8.7-1085.1679482090 to 8.7-1107. --- updated-dependencies: - dependency-name: ubi8/ubi-minimal dependency-type: direct:production ... Signed-off-by: dependabot[bot] * 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] * Fixed import * 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] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pascal Wilbrink Co-authored-by: Pascal Wilbrink --- .github/workflows/build-project.yml | 2 +- .github/workflows/release-project.yml | 2 +- .github/workflows/sonarcloud-analysis.yml | 2 +- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- pom.xml | 10 +++++----- .../alignment/service/SclAutoAlignmentService.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index a7495a5..8cd8275 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -39,7 +39,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v2 - name: Set up JDK 17 - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.11.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 6391335..ecb530d 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -36,7 +36,7 @@ jobs: run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})" - name: Set up JDK 17 - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.11.0 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 24f79fe..da4d2bc 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -44,7 +44,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Set up JDK 17 - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.11.0 with: distribution: 'zulu' java-version: '17' diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index cd0db85..7fae8d0 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-1085 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107 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 2743b79..15681ae 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-1085 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ diff --git a/pom.xml b/pom.xml index 5e4f1f9..ca9c497 100644 --- a/pom.xml +++ b/pom.xml @@ -19,15 +19,15 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 UTF-8 - 3.10.1 - 3.0.0-M9 + 3.11.0 + 3.0.0 3.2.0 0.11.0 - 2.16.3.Final + 2.16.6.Final 2.20.0 - 3.1.0 + 3.2.0 2.10.1 0.9.1 @@ -172,7 +172,7 @@ SPDX-License-Identifier: Apache-2.0 java - 0.8.8 + 0.8.10 jacoco target/site/jacoco/jacoco.xml, 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;