You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2014/08/01 04:55:40 UTC
[3/3] git commit: remove duplicate JTA library
remove duplicate JTA library
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/4e9ac1db
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/4e9ac1db
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/4e9ac1db
Branch: refs/heads/master
Commit: 4e9ac1db1ee696aea34d4ef33a6e9d06c6659eec
Parents: 8b1e1ff
Author: Brett Porter <br...@apache.org>
Authored: Fri Aug 1 12:22:24 2014 +1000
Committer: Brett Porter <br...@apache.org>
Committed: Fri Aug 1 12:51:12 2014 +1000
----------------------------------------------------------------------
pom.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/4e9ac1db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2b64c12..e70d09f 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>