From 49ea40f1c41efdc335e5029a483e06597541c18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= <i.am.kasper.sorensen@gmail.com>
Date: Fri, 23 Nov 2018 12:07:04 -0800
Subject: [PATCH 1/2] METAMODEL-1205: Updated SugarCRM JAX-WS/WSDL codegen to
 work in JDK9+

---
 sugarcrm/pom.xml | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 9119dc65b..32383fcb0 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -26,13 +26,17 @@ under the License.
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>MetaModel-sugarcrm</artifactId>
 	<name>MetaModel module for SugarCRM</name>
+	
+	<properties>
+		<jaxws.version>2.3.1</jaxws.version>
+	</properties>
 
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.jvnet.jax-ws-commons</groupId>
+				<groupId>com.helger.maven</groupId>
 				<artifactId>jaxws-maven-plugin</artifactId>
-				<version>2.2</version>
+				<version>2.6</version>
 				<executions>
 					<execution>
 						<id>import-sugarcrm-wsdl</id>
@@ -54,24 +58,17 @@ under the License.
 					<dependency>
 						<groupId>com.sun.xml.ws</groupId>
 						<artifactId>jaxws-tools</artifactId>
-						<version>2.1.7</version>
-						<exclusions>
-							<exclusion>
-								<groupId>org.jvnet.staxex</groupId>
-								<artifactId>stax-ex</artifactId>
-							</exclusion>
-						</exclusions>
+						<version>2.3.0.2</version>
 					</dependency>
 					<dependency>
-						<groupId>org.jvnet.staxex</groupId>
-						<artifactId>stax-ex</artifactId>
-						<version>1.2</version>
-						<exclusions>
-							<exclusion>
-								<groupId>javax.xml.stream</groupId>
-								<artifactId>stax-api</artifactId>
-							</exclusion>
-						</exclusions>
+						<groupId>javax.xml.ws</groupId>
+						<artifactId>jaxws-api</artifactId>
+						<version>${jaxws.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>javax.activation</groupId>
+						<artifactId>activation</artifactId>
+						<version>1.1.1</version>
 					</dependency>
 				</dependencies>
 			</plugin>
@@ -139,12 +136,16 @@ under the License.
 			<artifactId>commons-codec</artifactId>
 		</dependency>
 
-		<!-- provided -->
+		<!-- JAX WS -->
 		<dependency>
 			<groupId>javax.xml.ws</groupId>
 			<artifactId>jaxws-api</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
+			<version>${jaxws.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.ws</groupId>
+			<artifactId>jaxws-rt</artifactId>
+			<version>${jaxws.version}</version>
 		</dependency>
 
 		<!-- test -->

From a2e481877ea8a0cb3e7497db3838267b911cbf44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= <i.am.kasper.sorensen@gmail.com>
Date: Sat, 24 Nov 2018 11:07:12 -0800
Subject: [PATCH 2/2] Implemented mvn profiles to use separate JAX-WS versions
 per JDK

---
 sugarcrm/pom.xml | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 32383fcb0..4a17f450a 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -17,7 +17,9 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<artifactId>MetaModel</artifactId>
 		<groupId>org.apache.metamodel</groupId>
@@ -26,11 +28,23 @@ under the License.
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>MetaModel-sugarcrm</artifactId>
 	<name>MetaModel module for SugarCRM</name>
-	
+
 	<properties>
 		<jaxws.version>2.3.1</jaxws.version>
 	</properties>
 
+	<profiles>
+		<profile>
+			<id>jdk8</id>
+			<activation>
+				<jdk>1.8</jdk>
+			</activation>
+			<properties>
+				<jaxws.version>2.2.10</jaxws.version>
+			</properties>
+		</profile>
+	</profiles>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -58,7 +72,7 @@ under the License.
 					<dependency>
 						<groupId>com.sun.xml.ws</groupId>
 						<artifactId>jaxws-tools</artifactId>
-						<version>2.3.0.2</version>
+						<version>${jaxws.version}</version>
 					</dependency>
 					<dependency>
 						<groupId>javax.xml.ws</groupId>
@@ -141,11 +155,23 @@ under the License.
 			<groupId>javax.xml.ws</groupId>
 			<artifactId>jaxws-api</artifactId>
 			<version>${jaxws.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.xml.stream</groupId>
+					<artifactId>stax-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.xml.ws</groupId>
 			<artifactId>jaxws-rt</artifactId>
 			<version>${jaxws.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.xml.stream</groupId>
+					<artifactId>stax-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- test -->