You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/11/19 06:53:29 UTC

[isis] branch master updated: ISIS-2084: more messing about with jdk11

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new b8dd550  ISIS-2084: more messing about with jdk11
b8dd550 is described below

commit b8dd5505f256a30b502807fb174bd2c802f03ad6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Nov 19 06:52:50 2019 +0000

    ISIS-2084: more messing about with jdk11
---
 core/schema/pom.xml                      |  4 ++++
 core/testsupport/unittestsupport/pom.xml |  4 ++++
 examples/pom.xml                         | 32 -----------------------------
 extensions/pom.xml                       | 35 --------------------------------
 4 files changed, 8 insertions(+), 67 deletions(-)

diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index e8a9dcc..506003a 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -53,6 +53,9 @@
 				<jdk>[11,)</jdk>
 			</activation>
 
+			<!--
+			REMOVED BECAUSE IF BUILT ON JDK11, THEN ADDS DEPENDENCIES ALWAYS
+
 			<dependencies>
 				<dependency>
 					<groupId>javax.xml.bind</groupId>
@@ -67,6 +70,7 @@
 					<artifactId>jaxb-impl</artifactId>
 				</dependency>
 			</dependencies>
+			-->
 
 			<build>			
 				<pluginManagement>
diff --git a/core/testsupport/unittestsupport/pom.xml b/core/testsupport/unittestsupport/pom.xml
index 59b0300..d66064d 100644
--- a/core/testsupport/unittestsupport/pom.xml
+++ b/core/testsupport/unittestsupport/pom.xml
@@ -182,6 +182,9 @@
 
 	<profiles>
 
+		<!--
+		REMOVED BECAUSE IF BUILT ON JDK11, THEN ADDS DEPENDENCIES ALWAYS
+
 		<profile>
 			<id>jdk11</id>
 			<activation>
@@ -207,6 +210,7 @@
 				</dependency>
 			</dependencies>
 		</profile>
+		-->
 
 		<profile>
 			<id>flatten</id>
diff --git a/examples/pom.xml b/examples/pom.xml
index 542da9b..b8e6712 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -78,38 +78,6 @@
 			</modules>
 		</profile>
 
-		<!--
-		REMOVED BECAUSE THE PARENT PROFILE IS FLATTENED INTO CHILD ...
-		IF BUILT ON JDK11, THEN ADDS DEPENDENCIES ALWAYS
-
-		<profile>
-			<id>jdk11</id>
-			<activation>
-				<jdk>[11,)</jdk>
-			</activation>
-
-			<dependencies>
-				<dependency>
-					<groupId>com.sun.xml.ws</groupId>
-					<artifactId>jaxws-ri</artifactId>
-					<type>pom</type>
-				</dependency>
-				<dependency>
-					<groupId>javax.xml.bind</groupId>
-					<artifactId>jaxb-api</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-core</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-impl</artifactId>
-				</dependency>
-			</dependencies>
-
-		</profile>
-		-->
 
 		<!-- ECLIPSE SPECIFIC -->
 
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 29c9e78..3cac67c 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -147,41 +147,6 @@
 		</plugins>
 	</build>
 
-	<profiles>
-		<!--
-		REMOVED BECAUSE THE PARENT PROFILE IS FLATTENED INTO CHILD ...
-		IF BUILT ON JDK11, THEN ADDS DEPENDENCIES ALWAYS
-
-		<profile>
-			<id>jdk11</id>
-			<activation>
-				<jdk>[11,)</jdk>
-			</activation>
-
-			<dependencies>
-				<dependency>
-					<groupId>com.sun.xml.ws</groupId>
-					<artifactId>jaxws-ri</artifactId>
-					<type>pom</type>
-				</dependency>
-				<dependency>
-					<groupId>javax.xml.bind</groupId>
-					<artifactId>jaxb-api</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-core</artifactId>
-				</dependency>
-				<dependency>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-impl</artifactId>
-				</dependency>
-			</dependencies>
-
-		</profile>
-		-->
-	</profiles>
-
 	<dependencyManagement>
 		<dependencies>