Skip to content

Commit 2a4b1bf

Browse files
Stef3stdependabot[bot]pascalwilbrink
authored
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](quarkusio/quarkus-platform@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] <support@github.com> * 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](apache/maven-compiler-plugin@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] <support@github.com> * 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](apache/maven-surefire@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](apache/maven-surefire@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] <support@github.com> * 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](quarkusio/quarkus-platform@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] <support@github.com> * 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](actions/setup-java@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] <support@github.com> * 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] <support@github.com> * 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](jacoco/jacoco@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] <support@github.com> * 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](quarkusio/quarkus-platform@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] <support@github.com> * 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] <support@github.com> * 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] <support@github.com> * 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](jacoco/jacoco@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] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pascal Wilbrink <pascal.wilbrink@gmail.com> Co-authored-by: Pascal Wilbrink <pascal.wilbrink@alliander.com>
1 parent f8e1fff commit 2a4b1bf

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

.github/workflows/build-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
id: buildx
4040
uses: docker/setup-buildx-action@v2
4141
- name: Set up JDK 17
42-
uses: actions/setup-java@v3.10.0
42+
uses: actions/setup-java@v3.11.0
4343
with:
4444
distribution: 'zulu'
4545
java-version: '17'

.github/workflows/release-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
3737

3838
- name: Set up JDK 17
39-
uses: actions/setup-java@v3.10.0
39+
uses: actions/setup-java@v3.11.0
4040
with:
4141
distribution: 'zulu'
4242
java-version: '17'

.github/workflows/sonarcloud-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
restore-keys: ${{ runner.os }}-m2
4545

4646
- name: Set up JDK 17
47-
uses: actions/setup-java@v3.10.0
47+
uses: actions/setup-java@v3.11.0
4848
with:
4949
distribution: 'zulu'
5050
java-version: '17'

app/src/main/docker/Dockerfile.jvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm
2222
#
2323
###
24-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
24+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
2525

2626
ARG JAVA_PACKAGE=java-17-openjdk-headless
2727
ARG RUN_JAVA_VERSION=1.3.8

app/src/main/docker/Dockerfile.native

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# docker run -i --rm -p 8080:8080 quarkus/app
1515
#
1616
###
17-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1085
17+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
1818
WORKDIR /work/
1919
RUN chown 1001 /work \
2020
&& chmod "g+rwX" /work \

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ SPDX-License-Identifier: Apache-2.0
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2020
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2121

22-
<compiler-plugin.version>3.10.1</compiler-plugin.version>
23-
<surefire-plugin.version>3.0.0-M9</surefire-plugin.version>
22+
<compiler-plugin.version>3.11.0</compiler-plugin.version>
23+
<surefire-plugin.version>3.0.0</surefire-plugin.version>
2424
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
2525

2626
<compas.core.version>0.11.0</compas.core.version>
2727

28-
<quarkus.platform.version>2.16.3.Final</quarkus.platform.version>
28+
<quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
2929
<log4j2.version>2.20.0</log4j2.version>
30-
<powsybl.sld.version>3.1.0</powsybl.sld.version>
30+
<powsybl.sld.version>3.2.0</powsybl.sld.version>
3131
<gson.version>2.10.1</gson.version>
3232
<openpojo.version>0.9.1</openpojo.version>
3333
</properties>
@@ -172,7 +172,7 @@ SPDX-License-Identifier: Apache-2.0
172172
<sonar.language>java</sonar.language>
173173

174174
<!-- JaCoCo Properties -->
175-
<jacoco.version>0.8.8</jacoco.version>
175+
<jacoco.version>0.8.10</jacoco.version>
176176
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
177177
<sonar.coverage.jacoco.xmlReportPaths>
178178
target/site/jacoco/jacoco.xml,

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import com.powsybl.sld.layout.PositionVoltageLevelLayoutFactory;
99
import com.powsybl.sld.library.ConvergenceComponentLibrary;
1010
import com.powsybl.sld.model.graphs.SubstationGraph;
11-
import com.powsybl.sld.svg.BasicStyleProvider;
1211
import com.powsybl.sld.svg.DefaultSVGWriter;
12+
import com.powsybl.sld.svg.styles.BasicStyleProvider;
1313
import org.lfenergy.compas.core.commons.ElementConverter;
1414
import org.lfenergy.compas.scl.auto.alignment.builder.SubstationGraphBuilder;
1515
import org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentException;

0 commit comments

Comments
 (0)