Skip to content

Commit

Permalink
[MNG-8061] Maven: Require Java 17 (apache#1430)
Browse files Browse the repository at this point in the history
  • Loading branch information
bmarwell committed Mar 3, 2024
1 parent 5029cc2 commit 2bfa3a8
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: 'maven'

Expand All @@ -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 }}
Expand Down Expand Up @@ -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/
path: ./maven-integration-testing/core-it-suite/target/test-classes/
2 changes: 1 addition & 1 deletion .github/workflows/maven_build_itself.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile.s390x
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
```
Expand Down
9 changes: 6 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 2bfa3a8

Please sign in to comment.