From 19399523d3c252666812898771616eb9a4f353b3 Mon Sep 17 00:00:00 2001 From: Bertrand DELION Date: Sun, 30 Jan 2022 18:35:20 +0100 Subject: [PATCH] :arrow_up: Java 11 and Maven plugins GitHub Actions : specify Java distribution TravisCI : specify Java distribution and version --- .github/workflows/maven-java-feature.yml | 9 ++++-- .github/workflows/maven-java.yml | 9 ++++-- .travis.yml | 2 +- CHANGELOG.md | 5 +-- pom.xml | 39 +++++++++++++----------- 5 files changed, 37 insertions(+), 27 deletions(-) diff --git a/.github/workflows/maven-java-feature.yml b/.github/workflows/maven-java-feature.yml index 22c2e2f..d253e02 100644 --- a/.github/workflows/maven-java-feature.yml +++ b/.github/workflows/maven-java-feature.yml @@ -14,10 +14,13 @@ jobs: name: Maven test, package and deploy Java project runs-on: ubuntu-latest steps: - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '11' + cache: 'maven' - name: Maven version run: mvn -version env: diff --git a/.github/workflows/maven-java.yml b/.github/workflows/maven-java.yml index d46a386..f32923b 100644 --- a/.github/workflows/maven-java.yml +++ b/.github/workflows/maven-java.yml @@ -43,10 +43,13 @@ jobs: name: Maven test, package and deploy Java project runs-on: ubuntu-latest steps: - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '11' + cache: 'maven' - name: Maven version run: mvn -version env: diff --git a/.travis.yml b/.travis.yml index 4497448..089940e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: java jdk: - - openjdk8 + - openjdk11 cache: directories: - $HOME/.m2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b1921f..043faa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ Tous les changements notables apportés à ce projet seront documentés dans ce ## [Unreleased] > ## [8.1.0] - 2020-mm-jj -> +> - Montée de version vers Java 11 > - Intégration plus propre de Jacoco. > - Intégration plus propre de SonarCloud. > - Montée de version `sonar-maven-plugin` @@ -48,6 +48,7 @@ Download at TODO [keep a changelog]: https://keepachangelog.com/fr/1.0.0/ [semantic versioning]: https://semver.org/lang/fr/ -[unreleased]: https://github.com/bdelion/java-parent/compare/8.0.0...HEAD +[unreleased]: https://github.com/bdelion/java-parent/compare/8.1.0...HEAD +[8.1.0]: https://github.com/bdelion/java-parent/compare/8.1.0...8.0.1 [8.0.1]: https://github.com/bdelion/java-parent/compare/8.0.1...8.0.0 [8.0.0]: https://github.com/bdelion/java-parent/releases/tag/8.0.0 diff --git a/pom.xml b/pom.xml index 5500a7c..d412236 100644 --- a/pom.xml +++ b/pom.xml @@ -85,23 +85,23 @@ - 1.8 + 11 UTF-8 3.6.3 - 3.0.0-M3 - 2.7 + 3.0.0 + 2.9.0 1.8 3.1.0 3.0.0-M1 - 3.0.0-M1 + 3.0.0-M2 - 3.1.0 - 3.8.1 + 3.2.0 + 3.9.0 ${java.version} ${java.version} @@ -111,27 +111,27 @@ true true - 3.2.0 - 3.2.0 + 3.2.2 + 3.3.0 3.2.1 - 3.2.0 - 3.1.2 - 3.0.0 + 3.3.1 + 3.2.0 + 3.1.2 - 4.0.0 + 4.9.10 - 5.6.2 - 3.0.0-M4 + 5.8.2 + 3.0.0-M5 ${project.build.directory}/surefire-reports - 3.0.0-M4 - 0.8.5 + 3.0.0-M5 + 0.8.7 ${project.build.directory}/coverage-reports/jacoco-ut.exec ${project.build.directory}/coverage-reports/jacoco-it.exec true - 3.9.0 - 3.0.0 + 3.10.0 + 3.1.1 2.3 3.9.1.2184 @@ -219,6 +219,9 @@ org.apache.maven.plugins maven-compiler-plugin ${maven-compiler-plugin.version} + + 11 +