You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/06/30 11:13:26 UTC
svn commit: r672731 - in /tuscany/java/sca: distribution/pom.xml
modules/binding-ws-axis2/pom.xml modules/domain-manager/pom.xml
modules/interface-wsdl-java2wsdl/pom.xml modules/policy-security-ws/pom.xml
Author: slaws
Date: Mon Jun 30 02:13:25 2008
New Revision: 672731
URL: http://svn.apache.org/viewvc?rev=672731&view=rev
Log:
TUSCANY-2432 - resolve some dependencies to a single version
Modified:
tuscany/java/sca/distribution/pom.xml
tuscany/java/sca/modules/binding-ws-axis2/pom.xml
tuscany/java/sca/modules/domain-manager/pom.xml
tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml
tuscany/java/sca/modules/policy-security-ws/pom.xml
Modified: tuscany/java/sca/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/pom.xml?rev=672731&r1=672730&r2=672731&view=diff
==============================================================================
--- tuscany/java/sca/distribution/pom.xml (original)
+++ tuscany/java/sca/distribution/pom.xml Mon Jun 30 02:13:25 2008
@@ -229,6 +229,11 @@
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
</exclusion>
+ <exclusion>
+ <!-- exclude backport-util-concurrent-2.2.jar since we are using version 3.0 -->
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
Modified: tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=672731&r1=672730&r2=672731&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/pom.xml Mon Jun 30 02:13:25 2008
@@ -357,6 +357,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -388,10 +392,19 @@
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- </exclusion>
+ </exclusion>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.12</version>
Modified: tuscany/java/sca/modules/domain-manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-manager/pom.xml?rev=672731&r1=672730&r2=672731&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-manager/pom.xml (original)
+++ tuscany/java/sca/modules/domain-manager/pom.xml Mon Jun 30 02:13:25 2008
@@ -80,7 +80,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
Modified: tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml?rev=672731&r1=672730&r2=672731&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml (original)
+++ tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml Mon Jun 30 02:13:25 2008
@@ -74,9 +74,18 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
<version>1.3</version>
Modified: tuscany/java/sca/modules/policy-security-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-security-ws/pom.xml?rev=672731&r1=672730&r2=672731&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-security-ws/pom.xml (original)
+++ tuscany/java/sca/modules/policy-security-ws/pom.xml Mon Jun 30 02:13:25 2008
@@ -80,12 +80,23 @@
<version>1.2.5</version>
</dependency>
-
-
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
+ <version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0</version>
+ <scope>test</scope>
</dependency>
<dependency>