You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2018/11/27 02:57:53 UTC
metamodel git commit: METAMODEL-1205: Fixed issue with overlapping
woodstox JAR files
Repository: metamodel
Updated Branches:
refs/heads/METAMODEL-1205-woodstox [created] 6862d39b7
METAMODEL-1205: Fixed issue with overlapping woodstox JAR files
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/6862d39b
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/6862d39b
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/6862d39b
Branch: refs/heads/METAMODEL-1205-woodstox
Commit: 6862d39b755bcd78d362fee091d093dcd27280d1
Parents: d467b55
Author: Kasper Sørensen <i....@gmail.com>
Authored: Mon Nov 26 18:57:46 2018 -0800
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Mon Nov 26 18:57:46 2018 -0800
----------------------------------------------------------------------
pom.xml | 3 +++
sugarcrm/pom.xml | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/6862d39b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7c04733..5438094 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>
http://git-wip-us.apache.org/repos/asf/metamodel/blob/6862d39b/sugarcrm/pom.xml
----------------------------------------------------------------------
diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml
index 4a17f45..b35a57e 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>