From: Brett Porter <brett@apache.org>
Date: Fri, 1 Aug 2014 02:22:24 +0000 (+1000)
Subject: remove duplicate JTA library
X-Git-Tag: archiva-2.1.1~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4e9ac1db1ee696aea34d4ef33a6e9d06c6659eec;p=archiva.git

remove duplicate JTA library
---

diff --git a/pom.xml b/pom.xml
index 2b64c1253..e70d09f1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -491,6 +491,12 @@
         <groupId>org.apache.archiva.redback.components</groupId>
         <artifactId>spring-jdo2</artifactId>
         <version>2.2</version>
+        <exclusions>
+          <exclusion>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-jta</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -1602,6 +1608,7 @@
                     <exclude>velocity:velocity</exclude>
                     <exclude>classworlds:classworlds</exclude>
                     <exclude>javax.transaction:jta</exclude>
+                    <exclude>*:geronimo-spec-jta</exclude>
                     <exclude>javax.sql:jdbc-stdext</exclude>
                     <exclude>ant:ant-optional</exclude>
                     <exclude>xom:xom</exclude>
@@ -1619,7 +1626,6 @@
                     <exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude>
                     <exclude>org.codehaus.plexus:plexus-taskqueue</exclude>
 
-
                     <exclude>commons-logging:commons-logging-api</exclude>
                     <exclude>log4j:log4j</exclude>