From 49afb7e69a618e80c290c7693afd96dd3d49239d Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 26 Jun 2008 13:42:20 +0000
Subject: [PATCH] TUSCANY-2432, TUSCANY-2427, TUSCANY-2428. remove multiple
 dependency versions

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@671897 13f79535-47bb-0310-9956-ffa450edef68
---
 branches/sca-java-1.3/distribution/pom.xml    |  5 +++++
 .../modules/binding-ws-axis2/pom.xml          | 15 +++++++++++++-
 .../modules/domain-manager/pom.xml            |  2 +-
 .../modules/interface-wsdl-java2wsdl/pom.xml  |  9 +++++++++
 .../modules/policy-security-ws/pom.xml        | 20 +++++++++++++++----
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/branches/sca-java-1.3/distribution/pom.xml b/branches/sca-java-1.3/distribution/pom.xml
index 202b5f028a..1386fb50e0 100644
--- a/branches/sca-java-1.3/distribution/pom.xml
+++ b/branches/sca-java-1.3/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/branches/sca-java-1.3/modules/binding-ws-axis2/pom.xml b/branches/sca-java-1.3/modules/binding-ws-axis2/pom.xml
index 76eb984863..a12aba3018 100644
--- a/branches/sca-java-1.3/modules/binding-ws-axis2/pom.xml
+++ b/branches/sca-java-1.3/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,9 +392,18 @@
                 <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>
diff --git a/branches/sca-java-1.3/modules/domain-manager/pom.xml b/branches/sca-java-1.3/modules/domain-manager/pom.xml
index fd0486f75a..8bfadf4936 100644
--- a/branches/sca-java-1.3/modules/domain-manager/pom.xml
+++ b/branches/sca-java-1.3/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/branches/sca-java-1.3/modules/interface-wsdl-java2wsdl/pom.xml b/branches/sca-java-1.3/modules/interface-wsdl-java2wsdl/pom.xml
index f140b0a089..8b189aa520 100644
--- a/branches/sca-java-1.3/modules/interface-wsdl-java2wsdl/pom.xml
+++ b/branches/sca-java-1.3/modules/interface-wsdl-java2wsdl/pom.xml
@@ -74,8 +74,17 @@
                     <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>
diff --git a/branches/sca-java-1.3/modules/policy-security-ws/pom.xml b/branches/sca-java-1.3/modules/policy-security-ws/pom.xml
index 504128c9cd..838a26cd31 100644
--- a/branches/sca-java-1.3/modules/policy-security-ws/pom.xml
+++ b/branches/sca-java-1.3/modules/policy-security-ws/pom.xml
@@ -79,14 +79,26 @@
             <artifactId>axiom-impl</artifactId>
             <version>1.2.5</version>
         </dependency>
-        
-
+     
         
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
-            <version>1.3</version>
-        </dependency>
+            <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>
             <groupId>org.apache.neethi</groupId>