You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/05/13 19:55:05 UTC
[isis] branch 2112_SpringBoot updated: ISIS-2112: allow for
maven-compiler-plugin to run with Jdk-11
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2112_SpringBoot by this push:
new e07cd26 ISIS-2112: allow for maven-compiler-plugin to run with Jdk-11
e07cd26 is described below
commit e07cd26ad31c1830eed0d3514f6547e84092a7a4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon May 13 21:54:55 2019 +0200
ISIS-2112: allow for maven-compiler-plugin to run with Jdk-11
- adding profiles that activate when building with Jdk-11
- however, this is still targeting a Java 8 compatible build
Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
core/pom.xml | 34 ++++++++++++++++++++++++++++++++++
core/schema/pom.xml | 35 ++++++++++++++++++++++++++++++++++-
core/unittestsupport/pom.xml | 32 ++++++++++++++++++++++++++++++++
3 files changed, 100 insertions(+), 1 deletion(-)
diff --git a/core/pom.xml b/core/pom.xml
index 3c86b27..7b9145b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2154,6 +2154,40 @@ ${license.additional-notes}
</plugins>
</build>
</profile>
+
+
+ <profile>
+ <id>jdk11</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <!-- Compile -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <source>8</source>
+ <target>8</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>0.14.0</version>
+ <configuration>
+ <removeOldOutput>true</removeOldOutput>
+ <episode>true</episode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
<id>jdk11plus</id>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 005e2d0..297c966 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -48,9 +48,42 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
+
</dependencies>
<profiles>
+
+ <profile>
+ <!-- Adds 'javax' packages, that were removed with JDK-11 -->
+ <id>jdk11</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-ri</artifactId>
+ <version>2.3.2</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<profile>
<id>xsd-to-java</id>
<activation>
@@ -65,7 +98,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.13.3</version>
+ <version>0.14.0</version>
<configuration>
<removeOldOutput>true</removeOldOutput>
<episode>true</episode>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 52fe0c4..d4d8f39 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -121,6 +121,38 @@
</dependencies>
<profiles>
+
+ <profile>
+ <!-- Adds 'javax' packages, that were removed with JDK-11 -->
+ <id>jdk11</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-ri</artifactId>
+ <version>2.3.2</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
+
<profile>
<id>flatten</id>
<activation>