Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into main #199

Merged
merged 27 commits into from
May 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2a71c66
Bump quarkus.platform.version from 2.16.3.Final to 2.16.4.Final
dependabot[bot] Mar 3, 2023
4f793f0
Merge pull request #188 from com-pas/dependabot/maven/quarkus.platfor…
Stef3st Mar 9, 2023
21dd57e
Bump maven-compiler-plugin from 3.10.1 to 3.11.0
dependabot[bot] Mar 9, 2023
69630a8
Merge pull request #187 from com-pas/dependabot/maven/org.apache.mave…
Stef3st Mar 9, 2023
17f9a17
Bump surefire-plugin.version from 3.0.0-M9 to 3.0.0
dependabot[bot] Mar 14, 2023
592b907
Merge pull request #189 from com-pas/dependabot/maven/surefire-plugin…
pascalwilbrink Mar 20, 2023
d73b433
Bump quarkus.platform.version from 2.16.4.Final to 2.16.5.Final
dependabot[bot] Mar 22, 2023
08e8043
Merge pull request #190 from com-pas/dependabot/maven/quarkus.platfor…
pascalwilbrink Mar 23, 2023
59a6474
Bump actions/setup-java from 3.10.0 to 3.11.0
dependabot[bot] Mar 27, 2023
92055f8
Merge pull request #192 from com-pas/dependabot/github_actions/action…
pascalwilbrink Mar 28, 2023
788366a
Bump ubi8/ubi-minimal in /app/src/main/docker
dependabot[bot] Mar 28, 2023
4865589
Merge pull request #191 from com-pas/dependabot/docker/app/src/main/d…
pascalwilbrink Mar 28, 2023
7da20bd
Bump jacoco-maven-plugin from 0.8.8 to 0.8.9
dependabot[bot] Apr 3, 2023
40d33da
Bump quarkus.platform.version from 2.16.5.Final to 2.16.6.Final
dependabot[bot] Apr 4, 2023
e15d419
Bump ubi8/ubi-minimal in /app/src/main/docker
dependabot[bot] Apr 4, 2023
f4a2423
Merge pull request #195 from com-pas/dependabot/docker/app/src/main/d…
pascalwilbrink Apr 24, 2023
6dbffd8
Merge branch 'develop' into dependabot/maven/quarkus.platform.version…
pascalwilbrink Apr 24, 2023
95a54ce
Merge branch 'develop' into dependabot/maven/org.jacoco-jacoco-maven-…
pascalwilbrink Apr 24, 2023
fdc9d25
Merge pull request #194 from com-pas/dependabot/maven/quarkus.platfor…
pascalwilbrink Apr 24, 2023
cfed739
Merge branch 'develop' into dependabot/maven/org.jacoco-jacoco-maven-…
pascalwilbrink Apr 24, 2023
52c1a30
Merge pull request #193 from com-pas/dependabot/maven/org.jacoco-jaco…
pascalwilbrink Apr 24, 2023
61ac99f
Bump powsybl-single-line-diagram-core from 3.1.0 to 3.2.0
dependabot[bot] Apr 24, 2023
2869a40
Fixed import
pascalwilbrink Apr 25, 2023
94b9108
Bump jacoco-maven-plugin from 0.8.9 to 0.8.10
dependabot[bot] Apr 25, 2023
ada82d4
Merge pull request #197 from com-pas/dependabot/maven/org.jacoco-jaco…
pascalwilbrink Apr 26, 2023
442eb0b
Merge branch 'develop' into dependabot/maven/com.powsybl-powsybl-sing…
pascalwilbrink Apr 26, 2023
3fc6d94
Merge pull request #196 from com-pas/dependabot/maven/com.powsybl-pow…
pascalwilbrink Apr 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/docker/Dockerfile.jvm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/docker/Dockerfile.native
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ SPDX-License-Identifier: Apache-2.0
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<compiler-plugin.version>3.10.1</compiler-plugin.version>
<surefire-plugin.version>3.0.0-M9</surefire-plugin.version>
<compiler-plugin.version>3.11.0</compiler-plugin.version>
<surefire-plugin.version>3.0.0</surefire-plugin.version>
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>

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

<quarkus.platform.version>2.16.3.Final</quarkus.platform.version>
<quarkus.platform.version>2.16.6.Final</quarkus.platform.version>
<log4j2.version>2.20.0</log4j2.version>
<powsybl.sld.version>3.1.0</powsybl.sld.version>
<powsybl.sld.version>3.2.0</powsybl.sld.version>
<gson.version>2.10.1</gson.version>
<openpojo.version>0.9.1</openpojo.version>
</properties>
Expand Down Expand Up @@ -172,7 +172,7 @@ SPDX-License-Identifier: Apache-2.0
<sonar.language>java</sonar.language>

<!-- JaCoCo Properties -->
<jacoco.version>0.8.8</jacoco.version>
<jacoco.version>0.8.10</jacoco.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<sonar.coverage.jacoco.xmlReportPaths>
target/site/jacoco/jacoco.xml,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down