From 625cc40c9bb10dfc06d957966fc876b0c833e9c1 Mon Sep 17 00:00:00 2001 From: gleizesDor <115622893+gleizesDor@users.noreply.github.com> Date: Thu, 21 Mar 2024 13:49:31 +0100 Subject: [PATCH] feat(#375): Update to Java 21 Signed-off-by: gleizesDor <115622893+gleizesDor@users.noreply.github.com> --- .github/workflows/automate_javadoc.yml | 4 +- .github/workflows/build-project.yml | 4 +- .github/workflows/release-project.yml | 4 +- .github/workflows/sonarcloud-analysis.yml | 4 +- .github/workflows/sonarcloud-build.yml | 4 +- docs/examples/example-app/pom.xml | 6 +- pom.xml | 76 +++++++++++++++-------- sct-app/pom.xml | 13 ++-- sct-commons/pom.xml | 11 ++-- sct-coverage/pom.xml | 2 +- 10 files changed, 80 insertions(+), 48 deletions(-) diff --git a/.github/workflows/automate_javadoc.yml b/.github/workflows/automate_javadoc.yml index a9756bdb0..9372ad0e8 100644 --- a/.github/workflows/automate_javadoc.yml +++ b/.github/workflows/automate_javadoc.yml @@ -19,11 +19,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '17' + java-version: '21' - name: Create custom Maven Settings.xml uses: whelk-io/maven-settings-xml-action@v21 diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml index 7ca1b9905..ec62507b2 100644 --- a/.github/workflows/build-project.yml +++ b/.github/workflows/build-project.yml @@ -23,11 +23,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '17' + java-version: '21' - name: Create custom Maven Settings.xml uses: whelk-io/maven-settings-xml-action@v21 diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml index 20c9b7eee..f044f3d02 100644 --- a/.github/workflows/release-project.yml +++ b/.github/workflows/release-project.yml @@ -18,11 +18,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '17' + java-version: '21' - name: Create custom Maven Settings.xml uses: whelk-io/maven-settings-xml-action@v21 diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml index 4641ae4a5..da100bc1a 100644 --- a/.github/workflows/sonarcloud-analysis.yml +++ b/.github/workflows/sonarcloud-analysis.yml @@ -61,11 +61,11 @@ jobs: key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '17' + java-version: '21' cache: 'maven' - name: Set Common Sonar Variables diff --git a/.github/workflows/sonarcloud-build.yml b/.github/workflows/sonarcloud-build.yml index c71626f92..5c389fa42 100644 --- a/.github/workflows/sonarcloud-build.yml +++ b/.github/workflows/sonarcloud-build.yml @@ -26,11 +26,11 @@ jobs: key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '17' + java-version: '21' cache: 'maven' - name: Create custom Maven Settings.xml diff --git a/docs/examples/example-app/pom.xml b/docs/examples/example-app/pom.xml index d255c6df7..664c35c27 100644 --- a/docs/examples/example-app/pom.xml +++ b/docs/examples/example-app/pom.xml @@ -18,9 +18,9 @@ SPDX-License-Identifier: Apache-2.0 UTF-8 - 17 - 17 - 17 + 21 + 21 + 21 diff --git a/pom.xml b/pom.xml index 150a6b15a..97a37d1d8 100644 --- a/pom.xml +++ b/pom.xml @@ -29,21 +29,31 @@ - 17 - ${java.version} - ${java.version} + 21 UTF-8 - sct-coverage/** - ../sct-coverage/target/site/jacoco-aggregate/jacoco.xml - ${basedir}/${aggregate.report.dir} + + + 0.8.11 + + 0.19.0 0.0.4 - 3.4.1 - 3.2.1 + + + 3.2.5 + 3.6.3 + 3.3.0 + 3.3.0 + 3.13.0 + 3.6.1 + + 3.1.0 + 5.9.0 1.4.5 3.22.0 - 1.18.24 + + 1.18.30 5.5.0 2.13.4.1 @@ -130,37 +140,31 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + ${maven-compiler-plugin.version} ${java.version} ${java.version} - --enable-preview - - org.jacoco - jacoco-maven-plugin - 0.8.8 - org.apache.maven.plugins maven-surefire-plugin - 2.22.2 - - - - @{argLine} --enable-preview - + ${maven-surefire-plugin.version} org.apache.maven.plugins maven-jar-plugin - 3.2.2 + ${maven-jar-plugin.version} + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} org.apache.maven.plugins maven-javadoc-plugin - ${maven.plugin.javadoc} + ${maven-javadoc-plugin.version} attach-javadocs @@ -185,6 +189,16 @@ + + org.jacoco + jacoco-maven-plugin + ${jacoco-maven-plugin.version} + + + org.codehaus.mojo + jaxb2-maven-plugin + ${jaxb2-maven-plugin.version} + @@ -194,11 +208,23 @@ jacoco-maven-plugin - prepare-agent + pre-unit-tests prepare-agent + + post-unit-test + test + + report + + + + XML + + + diff --git a/sct-app/pom.xml b/sct-app/pom.xml index 23cd3d5a7..2edf11adc 100644 --- a/sct-app/pom.xml +++ b/sct-app/pom.xml @@ -17,10 +17,6 @@ local-SNAPSHOT SCT-APP - - ${basedir}/${aggregate.report.dir} - - org.lfenergy.compas @@ -62,6 +58,7 @@ mockito-junit-jupiter + @@ -88,13 +85,19 @@ report + + + + + XML + + org.apache.maven.plugins maven-dependency-plugin - 3.3.0 unpack diff --git a/sct-commons/pom.xml b/sct-commons/pom.xml index 285b507b1..a7e978f7a 100644 --- a/sct-commons/pom.xml +++ b/sct-commons/pom.xml @@ -18,8 +18,6 @@ SCT-COMMONS - ${basedir}/${aggregate.report.dir} - **/scl2007b4/**/* 5.7.1 4.0.0 4.0.3 @@ -124,13 +122,19 @@ report + + + + + XML + + org.apache.maven.plugins maven-dependency-plugin - 3.3.0 unpack @@ -158,7 +162,6 @@ org.codehaus.mojo jaxb2-maven-plugin - 3.1.0 scl diff --git a/sct-coverage/pom.xml b/sct-coverage/pom.xml index 95f98614e..ca1d14717 100644 --- a/sct-coverage/pom.xml +++ b/sct-coverage/pom.xml @@ -21,8 +21,8 @@ true true - **/scl2007b4/**/* + org.lfenergy.compas