Fixed overlapping JAR file issue for activation-api Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/3faebed1 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/3faebed1 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/3faebed1
Branch: refs/heads/master Commit: 3faebed1eff0f075038719037df6c7464c752bbe Parents: ab70985 Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Sat Dec 1 13:23:01 2018 -0800 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Sat Dec 1 13:23:01 2018 -0800 ---------------------------------------------------------------------- pom.xml | 3 +++ sugarcrm/pom.xml | 4 ++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/3faebed1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5438094..e5230b6 100644 --- a/pom.xml +++ b/pom.xml @@ -326,6 +326,9 @@ under the License. <!-- net.jcip:jcip-annotations is overlapping with net.sourceforge.findbugs:annotations --> <exclude>net.jcip:jcip-annotations</exclude> + + <!-- com.sun.activation:javax.activation is overlapping with javax.activation:javax.activation-api --> + <exclude>com.sun.activation:javax.activation</exclude> </excludes> </bannedDependencies> </rules> http://git-wip-us.apache.org/repos/asf/metamodel/blob/3faebed1/sugarcrm/pom.xml ---------------------------------------------------------------------- diff --git a/sugarcrm/pom.xml b/sugarcrm/pom.xml index b35a57e..c19f95e 100644 --- a/sugarcrm/pom.xml +++ b/sugarcrm/pom.xml @@ -172,6 +172,10 @@ under the License. <artifactId>stax-api</artifactId> </exclusion> <exclusion> + <groupId>com.sun.activation</groupId> + <artifactId>javax.activation</artifactId> + </exclusion> + <exclusion> <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-asl</artifactId> </exclusion>
