tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r671897 - in /tuscany/branches/sca-java-1.3: 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
Date Thu, 26 Jun 2008 13:42:20 GMT
Author: slaws
Date: Thu Jun 26 06:42:20 2008
New Revision: 671897

URL: http://svn.apache.org/viewvc?rev=671897&view=rev
Log:
TUSCANY-2432, TUSCANY-2427, TUSCANY-2428. remove multiple dependency versions

Modified:
    tuscany/branches/sca-java-1.3/distribution/pom.xml
    tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/pom.xml
    tuscany/branches/sca-java-1.3/modules/domain-manager/pom.xml
    tuscany/branches/sca-java-1.3/modules/interface-wsdl-java2wsdl/pom.xml
    tuscany/branches/sca-java-1.3/modules/policy-security-ws/pom.xml

Modified: tuscany/branches/sca-java-1.3/distribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/distribution/pom.xml?rev=671897&r1=671896&r2=671897&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/distribution/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/distribution/pom.xml Thu Jun 26 06:42:20 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/branches/sca-java-1.3/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/pom.xml?rev=671897&r1=671896&r2=671897&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/binding-ws-axis2/pom.xml Thu Jun 26 06:42:20 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/branches/sca-java-1.3/modules/domain-manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/domain-manager/pom.xml?rev=671897&r1=671896&r2=671897&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/domain-manager/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/domain-manager/pom.xml Thu Jun 26 06:42:20 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/branches/sca-java-1.3/modules/interface-wsdl-java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/interface-wsdl-java2wsdl/pom.xml?rev=671897&r1=671896&r2=671897&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/interface-wsdl-java2wsdl/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/interface-wsdl-java2wsdl/pom.xml Thu Jun 26 06:42:20
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/branches/sca-java-1.3/modules/policy-security-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/policy-security-ws/pom.xml?rev=671897&r1=671896&r2=671897&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/policy-security-ws/pom.xml (original)
+++ tuscany/branches/sca-java-1.3/modules/policy-security-ws/pom.xml Thu Jun 26 06:42:20 2008
@@ -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>



Mime
View raw message