From 6862d39b755bcd78d362fee091d093dcd27280d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20S=C3=B8rensen?= <i.am.kasper.sorensen@gmail.com>
Date: Mon, 26 Nov 2018 18:57:46 -0800
Subject: [PATCH] METAMODEL-1205: Fixed issue with overlapping woodstox JAR
 files

---
 pom.xml          | 3 +++
 sugarcrm/pom.xml | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7c047336d..543809459 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,6 +317,9 @@ under the License.
 										<!-- stax-api is overlapping with xml-apis -->
 										<exclude>stax:stax-api:*</exclude>
 										<exclude>javax.xml.stream:stax-api</exclude>
+										
+										<!-- codehaus woodstox is overlapping with FasterXML woodstox -->
+										<exclude>org.codehaus.woodstox:woodstox-core-asl:*</exclude>
 
 										<!-- findbugs-annotations is overlapping with net.sourceforge.findbugs:annotations -->
 										<exclude>com.github.stephenc.findbugs:findbugs-annotations:*</exclude>
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 4a17f450a..b35a57ef1 100644
--- a/sugarcrm/pom.xml
+++ b/sugarcrm/pom.xml
@@ -171,6 +171,10 @@ under the License.
 					<groupId>javax.xml.stream</groupId>
 					<artifactId>stax-api</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.codehaus.woodstox</groupId>
+					<artifactId>woodstox-core-asl</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>