[MNG-8061] Maven: Require Java 17 (#1430)

This commit is contained in:
Benjamin Marwell 2024-03-03 22:28:30 +01:00 committed by GitHub
parent 5029cc238c
commit 2bfa3a8fae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 12 deletions

View File

@ -42,7 +42,7 @@ jobs:
- uses: actions/setup-java@v4 - uses: actions/setup-java@v4
with: with:
java-version: 11 java-version: 17
distribution: 'temurin' distribution: 'temurin'
cache: 'maven' cache: 'maven'
@ -61,7 +61,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, windows-latest, macOS-latest] os: [ubuntu-latest, windows-latest, macOS-latest]
java: [11, 17, 21] java: [17, 21]
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -130,4 +130,4 @@ jobs:
if: failure() && matrix.os != 'windows-latest' if: failure() && matrix.os != 'windows-latest'
with: with:
name: ${{ github.run_number }}-integration-test-artifact-${{ matrix.os }}-${{ matrix.java }} name: ${{ github.run_number }}-integration-test-artifact-${{ matrix.os }}-${{ matrix.java }}
path: ./maven-integration-testing/core-it-suite/target/test-classes/ path: ./maven-integration-testing/core-it-suite/target/test-classes/

View File

@ -31,7 +31,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, windows-latest] os: [ubuntu-latest, windows-latest]
java: [11, 17, 21] java: [17, 21]
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

4
Jenkinsfile vendored
View File

@ -20,10 +20,10 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))]) properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))])
def buildOs = 'linux' def buildOs = 'linux'
def buildJdk = '11' def buildJdk = '17'
def buildMvn = '3.8.x' def buildMvn = '3.8.x'
def runITsOses = ['linux'] def runITsOses = ['linux']
def runITsJdks = ['11', '17', '21'] def runITsJdks = ['17', '21']
def runITsMvn = '3.8.x' def runITsMvn = '3.8.x'
def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
def tests def tests

View File

@ -20,10 +20,10 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))]) properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))])
def buildOs = 'linux' def buildOs = 'linux'
def buildJdk = '11' def buildJdk = '17'
def buildMvn = '3.8.x' def buildMvn = '3.8.x'
def runITsOses = ['linux'] def runITsOses = ['linux']
def runITsJdks = ['11', '17'] def runITsJdks = ['17']
def runITsMvn = '3.8.x' def runITsMvn = '3.8.x'
def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
def tests def tests

View File

@ -65,7 +65,7 @@ Do you like Apache Maven? Then [donate back to the ASF](https://www.apache.org/f
Quick Build Quick Build
------- -------
If you want to bootstrap Maven, you'll need: If you want to bootstrap Maven, you'll need:
- Java 11+ - Java 17+
- Maven 3.6.3 or later - Maven 3.6.3 or later
- Run Maven, specifying a location into which the completed Maven distro should be installed: - Run Maven, specifying a location into which the completed Maven distro should be installed:
``` ```

View File

@ -147,7 +147,10 @@ under the License.
</distributionManagement> </distributionManagement>
<properties> <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.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<maven.baseline>3.8.8</maven.baseline> <maven.baseline>3.8.8</maven.baseline>
<!-- Control the name of the distribution and information output by mvn --> <!-- Control the name of the distribution and information output by mvn -->
@ -816,10 +819,10 @@ under the License.
<configuration> <configuration>
<rules> <rules>
<requireJavaVersion> <requireJavaVersion>
<version>[11,)</version> <version>[17,)</version>
</requireJavaVersion> </requireJavaVersion>
<enforceBytecodeVersion> <enforceBytecodeVersion>
<maxJdkVersion>${maven.compiler.target}</maxJdkVersion> <maxJdkVersion>${maven.compiler.release}</maxJdkVersion>
<ignoredScopes> <ignoredScopes>
<ignoredScope>test</ignoredScope> <ignoredScope>test</ignoredScope>
</ignoredScopes> </ignoredScopes>