diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-30 09:13:25 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-30 09:13:25 +0000 |
| commit | eb340a208f49de11848fb3c667279ca106ec3ff3 (patch) | |
| tree | 838707db222191602c379f0a5d60a70b36e069e2 | |
| parent | 9aa066a61816b9d10927bf3634bbfcf5105313fa (diff) | |
TUSCANY-2432 - resolve some dependencies to a single version
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@672731 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/sca/distribution/pom.xml | 5 | ||||
| -rw-r--r-- | java/sca/modules/binding-ws-axis2/pom.xml | 15 | ||||
| -rw-r--r-- | java/sca/modules/domain-manager/pom.xml | 2 | ||||
| -rw-r--r-- | java/sca/modules/interface-wsdl-java2wsdl/pom.xml | 9 | ||||
| -rw-r--r-- | java/sca/modules/policy-security-ws/pom.xml | 17 |
5 files changed, 43 insertions, 5 deletions
diff --git a/java/sca/distribution/pom.xml b/java/sca/distribution/pom.xml index 4fabe620f9..87c868ee35 100644 --- a/java/sca/distribution/pom.xml +++ b/java/sca/distribution/pom.xml @@ -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> diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml index 946493ba3c..8d2c7eb27e 100644 --- a/java/sca/modules/binding-ws-axis2/pom.xml +++ b/java/sca/modules/binding-ws-axis2/pom.xml @@ -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> diff --git a/java/sca/modules/domain-manager/pom.xml b/java/sca/modules/domain-manager/pom.xml index a3bd04a5eb..70b4e39302 100644 --- a/java/sca/modules/domain-manager/pom.xml +++ b/java/sca/modules/domain-manager/pom.xml @@ -80,7 +80,7 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.2</version> + <version>1.1.1</version> </dependency> <dependency> diff --git a/java/sca/modules/interface-wsdl-java2wsdl/pom.xml b/java/sca/modules/interface-wsdl-java2wsdl/pom.xml index 4f18f4444b..77cb0b8d64 100644 --- a/java/sca/modules/interface-wsdl-java2wsdl/pom.xml +++ b/java/sca/modules/interface-wsdl-java2wsdl/pom.xml @@ -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> diff --git a/java/sca/modules/policy-security-ws/pom.xml b/java/sca/modules/policy-security-ws/pom.xml index 6acc208f38..39451178f3 100644 --- a/java/sca/modules/policy-security-ws/pom.xml +++ b/java/sca/modules/policy-security-ws/pom.xml @@ -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>
|