Skip to content

Commit

Permalink
Java 17 migration (#2617)
Browse files Browse the repository at this point in the history
* Upgrade to java17
* Bump to v6.0.0-SNAPSHOT
* Bump powsybl-parent to version 12

---------

Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
  • Loading branch information
olperr1 authored Jul 21, 2023
1 parent 86795ce commit 2e2bcf7
Show file tree
Hide file tree
Showing 92 changed files with 95 additions and 95 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v1

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Build with Maven (Ubuntu)
if: matrix.os == 'ubuntu-latest'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ https://github.com/powsybl/powsybl-gse page.
## Environment requirements

Powsybl-core project is fully written in Java, so you only need few requirements:
- JDK *(11 or greater)*
- JDK *(17 or greater)*
- Maven *(3.3.9 or greater)* - you could use the embedded maven wrapper instead if you prefer (see [Using Maven Wrapper](#using-maven-wrapper))

To run all the tests, simply launch the following command from the root of the repository:
Expand Down
2 changes: 1 addition & 1 deletion action/action-dsl-spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-action</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-action-dsl-spi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion action/action-dsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-action</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-action-dsl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion action/action-simulator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-action</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-action-simulator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion action/action-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-action</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-action-util</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion action/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ampl-converter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-ampl-converter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ampl-executor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ this
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-ampl-executor</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-completion/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cgmes</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes-completion</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-conformity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cgmes</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes-conformity</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-conversion/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cgmes</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes-conversion</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cgmes</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes-extensions</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-gl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<artifactId>powsybl-cgmes</artifactId>
<groupId>com.powsybl</groupId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes-gl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-measurements/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<artifactId>powsybl-cgmes</artifactId>
<groupId>com.powsybl</groupId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-model-alternatives/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cgmes</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes-model-alternatives</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-model-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<artifactId>powsybl-cgmes</artifactId>
<groupId>com.powsybl</groupId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes-model-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cgmes</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/cgmes-shortcircuit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-cgmes</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes-shortcircuit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cgmes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cgmes</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cim-anonymiser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-cim-anonymiser</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commons-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<artifactId>powsybl-core</artifactId>
<groupId>com.powsybl</groupId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-commons-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-commons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion computation-local-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-computation-local-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion computation-local/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-computation-local</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion computation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-computation</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion config-classic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-config-classic</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion config-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-config-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion contingency/contingency-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-contingency</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-contingency-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion contingency/contingency-dsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-contingency</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-contingency-dsl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion contingency/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion distribution-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion dsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<artifactId>powsybl-core</artifactId>
<groupId>com.powsybl</groupId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion dynamic-simulation/dynamic-simulation-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-dynamic-simulation</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-dynamic-simulation-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion dynamic-simulation/dynamic-simulation-dsl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-dynamic-simulation</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-dynamic-simulation-dsl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion dynamic-simulation/dynamic-simulation-tool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-dynamic-simulation</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-dynamic-simulation-tool</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion dynamic-simulation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion entsoe-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-core</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-entsoe-util</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ieee-cdf/ieee-cdf-converter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<artifactId>powsybl-ieee-cdf</artifactId>
<groupId>com.powsybl</groupId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-ieee-cdf-converter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ieee-cdf/ieee-cdf-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-ieee-cdf</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-ieee-cdf-model</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ieee-cdf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<artifactId>powsybl-core</artifactId>
<groupId>com.powsybl</groupId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion iidm/iidm-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-iidm</artifactId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-iidm-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion iidm/iidm-comparator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<artifactId>powsybl-iidm</artifactId>
<groupId>com.powsybl</groupId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-iidm-comparator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion iidm/iidm-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<artifactId>powsybl-iidm</artifactId>
<groupId>com.powsybl</groupId>
<version>5.4.0-SNAPSHOT</version>
<version>6.0.0-SNAPSHOT</version>
</parent>

<artifactId>powsybl-iidm-extensions</artifactId>
Expand Down
Loading

0 comments on commit 2e2bcf7

Please sign in to comment.