mirror of https://github.com/apache/maven.git
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:
parent
5797211100
commit
cf71c396dd
|
@ -31,7 +31,7 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest]
|
||||
java: [8, 17]
|
||||
java: [11, 17, 21]
|
||||
fail-fast: false
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
|
|
@ -16,8 +16,8 @@ junit:junit:4.12
|
|||
org.apache.ant:ant:1.10.8
|
||||
org.apache.commons:commons-text:1.10.0
|
||||
org.apache.geronimo.specs:geronimo-jcdi_2.0_spec:1.3
|
||||
org.apache.groovy:groovy-ant:4.0.6
|
||||
org.apache.groovy:groovy:4.0.6
|
||||
org.apache.groovy:groovy-ant:4.0.15
|
||||
org.apache.groovy:groovy:4.0.15
|
||||
org.apache.maven.extensions:maven-extensions:40:pom
|
||||
org.apache.maven.its.plugins.class-loader:dep-c:${project.version}
|
||||
org.apache.maven.its.plugins:maven-it-plugin-active-collection:${project.version}
|
||||
|
|
|
@ -43,13 +43,13 @@ javax.enterprise.inject.Instance.class.getDeclaredMethod("stream")]]></script>
|
|||
<dependency>
|
||||
<groupId>org.apache.groovy</groupId>
|
||||
<artifactId>groovy-ant</artifactId>
|
||||
<version>4.0.6</version>
|
||||
<version>4.0.15</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.groovy</groupId>
|
||||
<artifactId>groovy</artifactId>
|
||||
<version>4.0.6</version>
|
||||
<version>4.0.15</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
26
its/pom.xml
26
its/pom.xml
|
@ -151,6 +151,32 @@ under the License.
|
|||
<build>
|
||||
<pluginManagement>
|
||||
<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>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
|
|
Loading…
Reference in New Issue