You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bm...@apache.org on 2024/03/03 21:28:36 UTC
(maven) branch master updated: [MNG-8061] Maven: Require Java 17 (#1430)
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 2bfa3a8fae [MNG-8061] Maven: Require Java 17 (#1430)
2bfa3a8fae is described below
commit 2bfa3a8fae6cc2eaca39a717bc2d9fbed55afbdd
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Sun Mar 3 22:28:30 2024 +0100
[MNG-8061] Maven: Require Java 17 (#1430)
---
.github/workflows/maven.yml | 6 +++---
.github/workflows/maven_build_itself.yml | 2 +-
Jenkinsfile | 4 ++--
Jenkinsfile.s390x | 4 ++--
README.md | 2 +-
pom.xml | 9 ++++++---
6 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2576c1c5ef..503cebff4c 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -42,7 +42,7 @@ jobs:
- uses: actions/setup-java@v4
with:
- java-version: 11
+ java-version: 17
distribution: 'temurin'
cache: 'maven'
@@ -61,7 +61,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
- java: [11, 17, 21]
+ java: [17, 21]
fail-fast: false
runs-on: ${{ matrix.os }}
@@ -130,4 +130,4 @@ jobs:
if: failure() && matrix.os != 'windows-latest'
with:
name: ${{ github.run_number }}-integration-test-artifact-${{ matrix.os }}-${{ matrix.java }}
- path: ./maven-integration-testing/core-it-suite/target/test-classes/
\ No newline at end of file
+ path: ./maven-integration-testing/core-it-suite/target/test-classes/
diff --git a/.github/workflows/maven_build_itself.yml b/.github/workflows/maven_build_itself.yml
index 9abbd15377..c201b11ea4 100644
--- a/.github/workflows/maven_build_itself.yml
+++ b/.github/workflows/maven_build_itself.yml
@@ -31,7 +31,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
- java: [11, 17, 21]
+ java: [17, 21]
fail-fast: false
runs-on: ${{ matrix.os }}
diff --git a/Jenkinsfile b/Jenkinsfile
index 97be9827b1..ffe7aa7321 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,10 +20,10 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))])
def buildOs = 'linux'
-def buildJdk = '11'
+def buildJdk = '17'
def buildMvn = '3.8.x'
def runITsOses = ['linux']
-def runITsJdks = ['11', '17', '21']
+def runITsJdks = ['17', '21']
def runITsMvn = '3.8.x'
def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
def tests
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index e760a62539..ef01369fa6 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -20,10 +20,10 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))])
def buildOs = 'linux'
-def buildJdk = '11'
+def buildJdk = '17'
def buildMvn = '3.8.x'
def runITsOses = ['linux']
-def runITsJdks = ['11', '17']
+def runITsJdks = ['17']
def runITsMvn = '3.8.x'
def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
def tests
diff --git a/README.md b/README.md
index 1cf5bc8c75..00e5685177 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ Do you like Apache Maven? Then [donate back to the ASF](https://www.apache.org/f
Quick Build
-------
If you want to bootstrap Maven, you'll need:
-- Java 11+
+- Java 17+
- Maven 3.6.3 or later
- Run Maven, specifying a location into which the completed Maven distro should be installed:
```
diff --git a/pom.xml b/pom.xml
index 1a2f2853a0..d8e968dd73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,10 @@ under the License.
</distributionManagement>
<properties>
- <javaVersion>8</javaVersion>
+ <javaVersion>17</javaVersion>
+ <maven.compiler.source>${javaVersion}</maven.compiler.source>
+ <maven.compiler.target>${javaVersion}</maven.compiler.target>
+ <maven.compiler.release>${javaVersion}</maven.compiler.release>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<maven.baseline>3.8.8</maven.baseline>
<!-- Control the name of the distribution and information output by mvn -->
@@ -816,10 +819,10 @@ under the License.
<configuration>
<rules>
<requireJavaVersion>
- <version>[11,)</version>
+ <version>[17,)</version>
</requireJavaVersion>
<enforceBytecodeVersion>
- <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+ <maxJdkVersion>${maven.compiler.release}</maxJdkVersion>
<ignoredScopes>
<ignoredScope>test</ignoredScope>
</ignoredScopes>