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;