You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2022/08/06 01:30:17 UTC
[archiva-parent] branch master updated: [MRM-2031] Switch to jdk 11
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 24a80f9 [MRM-2031] Switch to jdk 11
24a80f9 is described below
commit 24a80f9db7d4e5367f1bfacc4acebcd1119ef2ae
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Aug 5 21:40:06 2022 +1000
[MRM-2031] Switch to jdk 11
Signed-off-by: Olivier Lamy <ol...@apache.org>
---
.github/workflows/maven.yml | 2 +-
pom.xml | 60 ++++++++++++---------------------------------
2 files changed, 17 insertions(+), 45 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 09dcf0c..e617678 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,7 +25,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
- java: [8, 11]
+ java: [11, 17]
fail-fast: false
runs-on: ${{ matrix.os }}
diff --git a/pom.xml b/pom.xml
index 37d64e5..b969a30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,10 +96,8 @@
<enunciate.version>2.14.0</enunciate.version>
<enunciate.debug>false</enunciate.debug>
- <javaVersion>8</javaVersion>
- <javaFullVersion>1.${javaVersion}.0</javaFullVersion>
- <compiler.source>1.${javaVersion}</compiler.source>
- <compiler.target>1.${javaVersion}</compiler.target>
+ <maven.compiler.release>11</maven.compiler.release>
+ <maven.compiler.testRelease>11</maven.compiler.testRelease>
<quartz.version>2.3.2</quartz.version>
@@ -632,7 +630,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[${javaFullVersion},)</version>
+ <version>[${maven.compiler.release},)</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -701,10 +699,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
- <configuration>
- <source>${compiler.source}</source>
- <target>${compiler.target}</target>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -859,6 +853,19 @@
<artifactId>versions-maven-plugin</artifactId>
<version>2.11.0</version>
</plugin>
+ <plugin>
+ <groupId>com.webcohesion.enunciate</groupId>
+ <artifactId>enunciate-maven-plugin</artifactId>
+ <version>${enunciate.version}</version>
+ <dependencies>
+ <!-- needed for jdk 11 -->
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -1091,41 +1098,6 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>jdk9+</id>
- <activation>
- <jdk>[1.9,)</jdk>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.webcohesion.enunciate</groupId>
- <artifactId>enunciate-maven-plugin</artifactId>
- <version>${enunciate.version}</version>
- <dependencies>
- <!-- needed for jdk 11 -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <release>${javaVersion}</release>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>