Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Require JDK 11 and support JDK 21 at build time (#310) 

* Support JDK 21

* Update groovy to latest

* Drop jdk 8, add jdk 11 and 21
This commit is contained in:
Guillaume Nodet 2023-10-16 13:24:46 +02:00 committed by GitHub
parent 5797211100
commit cf71c396dd
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
its/.github/workflows/maven-verify.yml vendored
View File

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

4
its/core-it-suite/src/test/resources-filtered/bootstrap.txt
View File

@ -16,8 +16,8 @@ junit:junit:4.12
org.apache.ant:ant:1.10.8 org.apache.ant:ant:1.10.8
org.apache.commons:commons-text:1.10.0 org.apache.commons:commons-text:1.10.0
org.apache.geronimo.specs:geronimo-jcdi_2.0_spec:1.3 org.apache.geronimo.specs:geronimo-jcdi_2.0_spec:1.3
org.apache.groovy:groovy-ant:4.0.6 org.apache.groovy:groovy-ant:4.0.15
org.apache.groovy:groovy:4.0.6 org.apache.groovy:groovy:4.0.15
org.apache.maven.extensions:maven-extensions:40:pom org.apache.maven.extensions:maven-extensions:40:pom
org.apache.maven.its.plugins.class-loader:dep-c:${project.version} org.apache.maven.its.plugins.class-loader:dep-c:${project.version}
org.apache.maven.its.plugins:maven-it-plugin-active-collection:${project.version} org.apache.maven.its.plugins:maven-it-plugin-active-collection:${project.version}

4
its/core-it-suite/src/test/resources/mng-7045/pom.xml
View File

@ -43,13 +43,13 @@ javax.enterprise.inject.Instance.class.getDeclaredMethod("stream")]]></script>
<dependency> <dependency>
<groupId>org.apache.groovy</groupId> <groupId>org.apache.groovy</groupId>
<artifactId>groovy-ant</artifactId> <artifactId>groovy-ant</artifactId>
<version>4.0.6</version> <version>4.0.15</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.groovy</groupId> <groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId> <artifactId>groovy</artifactId>
<version>4.0.6</version> <version>4.0.15</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>

26
its/pom.xml
View File

@ -151,6 +151,32 @@ under the License.
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!-- Remove when Parent 41 used -->
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.40.0</version>
<configuration>
<java>
<!-- orders of used formatters are important MPOM-376 -->
<!-- eg. palantir override importOrder, so should be first -->
<palantirJavaFormat>
<version>2.38.0</version>
</palantirJavaFormat>
<removeUnusedImports />
</java>
<pom>
<sortPom>
<expandEmptyElements>false</expandEmptyElements>
<!-- https://issues.apache.org/jira/browse/MRELEASE-1111 -->
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
</sortPom>
</pom>
<upToDateChecking>
<enabled>true</enabled>
</upToDateChecking>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>