Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/maven/com.powsybl-powsybl-sing…
Browse files Browse the repository at this point in the history
…le-line-diagram-core-4.0.0
  • Loading branch information
Stef3st authored Dec 11, 2023
2 parents c8cb3b4 + 6b0b1e6 commit 7553cd6
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
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@v3
- name: Set up JDK 17
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"

- name: Set up JDK 17
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v4
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 @@ -67,7 +67,7 @@ jobs:
restore-keys: ${{ runner.os }}-m2

- name: Set up JDK 17
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud-build.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
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0

<compas.core.version>0.16.0</compas.core.version>

<quarkus.platform.version>3.5.3</quarkus.platform.version>
<quarkus.platform.version>3.6.1</quarkus.platform.version>
<log4j2.version>2.22.0</log4j2.version>
<powsybl.sld.version>4.0.0</powsybl.sld.version>
<gson.version>2.10.1</gson.version>
Expand Down Expand Up @@ -240,7 +240,7 @@ SPDX-License-Identifier: Apache-2.0
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down

0 comments on commit 7553cd6

Please sign in to comment.