Fixes for TUSCANY-2696

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@722055 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 145 insertions, 19 deletions

diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/pom.xml b/branches/sca-java-1.x/modules/binding-atom-abdera/pom.xml
index 7adc36b770..e95fcebd5d 100644
--- a/branches/sca-java-1.x/modules/binding-atom-abdera/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-atom-abdera/pom.xml
@@ -81,7 +81,7 @@
         <dependency>
            <groupId>commons-httpclient</groupId>
            <artifactId>commons-httpclient</artifactId>
-           <version>3.0.1</version>
+           <version>3.1</version>
         </dependency>
 
         <dependency>
diff --git a/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml b/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
index c89585c95c..2e66ab669a 100644
--- a/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
@@ -49,6 +49,12 @@
             <version>2.1_3</version>
             <scope>compile</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/branches/sca-java-1.x/modules/binding-sca-jms/pom.xml b/branches/sca-java-1.x/modules/binding-sca-jms/pom.xml
index 680928ad55..c389614d71 100644
--- a/branches/sca-java-1.x/modules/binding-sca-jms/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-sca-jms/pom.xml
@@ -49,6 +49,12 @@
             <artifactId>activemq-core</artifactId>

             <version>5.1.0</version>

         </dependency>

+        

+        <dependency>

+            <groupId>backport-util-concurrent</groupId>

+            <artifactId>backport-util-concurrent</artifactId>

+            <version>3.1</version>

+        </dependency>

 

         <dependency>

             <groupId>org.easymock</groupId>

diff --git a/branches/sca-java-1.x/modules/binding-ws-axis2/pom.xml b/branches/sca-java-1.x/modules/binding-ws-axis2/pom.xml
index 74d217e98b..b91e86bbd4 100644
--- a/branches/sca-java-1.x/modules/binding-ws-axis2/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-ws-axis2/pom.xml
@@ -107,6 +107,10 @@
             <version>1.4.1</version>
             <exclusions>
                 <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>org.apache.ant</groupId>
                     <artifactId>ant</artifactId>
                 </exclusion>
@@ -116,6 +120,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.axis2</groupId>
@@ -167,6 +178,18 @@
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
         </dependency>
+        
+        <dependency>
+           <groupId>commons-codec</groupId>
+           <artifactId>commons-codec</artifactId>
+           <version>1.3</version>
+           <exclusions>
+               <exclusion>
+                   <groupId>commons-codec</groupId>
+                   <artifactId>commons-codec</artifactId>
+               </exclusion>
+           </exclusions>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.axis2</groupId>
diff --git a/branches/sca-java-1.x/modules/data-engine-helper/pom.xml b/branches/sca-java-1.x/modules/data-engine-helper/pom.xml
index c8a4689650..8c81d4fe3d 100644
--- a/branches/sca-java-1.x/modules/data-engine-helper/pom.xml
+++ b/branches/sca-java-1.x/modules/data-engine-helper/pom.xml
@@ -41,6 +41,17 @@
             <artifactId>tuscany-das-rdb</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
+            <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.1</version>
         </dependency>
 
         <dependency>
diff --git a/branches/sca-java-1.x/modules/databinding-saxon/pom.xml b/branches/sca-java-1.x/modules/databinding-saxon/pom.xml
index 390bf1f4f5..9014f0c27a 100644
--- a/branches/sca-java-1.x/modules/databinding-saxon/pom.xml
+++ b/branches/sca-java-1.x/modules/databinding-saxon/pom.xml
@@ -93,12 +93,24 @@
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
             <version>1.1.1</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.1</version>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.1</version>
+            <version>4.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/branches/sca-java-1.x/modules/databinding-sdo/pom.xml b/branches/sca-java-1.x/modules/databinding-sdo/pom.xml
index 3d8afc544c..f3643eb2bc 100644
--- a/branches/sca-java-1.x/modules/databinding-sdo/pom.xml
+++ b/branches/sca-java-1.x/modules/databinding-sdo/pom.xml
@@ -54,6 +54,17 @@
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
             <version>1.1.1</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.1</version>
         </dependency>
     </dependencies>
 
diff --git a/branches/sca-java-1.x/modules/domain-manager/pom.xml b/branches/sca-java-1.x/modules/domain-manager/pom.xml
index 6ca199de11..24d4e56fd7 100644
--- a/branches/sca-java-1.x/modules/domain-manager/pom.xml
+++ b/branches/sca-java-1.x/modules/domain-manager/pom.xml
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <version>1.1.1</version>
+            <version>1.2</version>
         </dependency>
 
         <dependency>
diff --git a/branches/sca-java-1.x/modules/host-openejb/pom.xml b/branches/sca-java-1.x/modules/host-openejb/pom.xml
index 396d847f15..6120d3dbb6 100644
--- a/branches/sca-java-1.x/modules/host-openejb/pom.xml
+++ b/branches/sca-java-1.x/modules/host-openejb/pom.xml
@@ -68,6 +68,12 @@
         </dependency>

         

         <dependency>

+            <groupId>backport-util-concurrent</groupId>

+            <artifactId>backport-util-concurrent</artifactId>

+            <version>3.1</version>

+        </dependency>

+        

+        <dependency>

             <groupId>asm</groupId>

             <artifactId>asm-all</artifactId>

             <version>3.1</version>

diff --git a/branches/sca-java-1.x/modules/implementation-bpel-jbpm/pom.xml b/branches/sca-java-1.x/modules/implementation-bpel-jbpm/pom.xml
index 465a631a68..3e4111e5c4 100644
--- a/branches/sca-java-1.x/modules/implementation-bpel-jbpm/pom.xml
+++ b/branches/sca-java-1.x/modules/implementation-bpel-jbpm/pom.xml
@@ -98,17 +98,26 @@
 			<artifactId>tuscany-sdo-impl</artifactId>
 			<version>1.1.1</version>
 			<scope>compile</scope>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>stax</groupId>
-                                <artifactId>stax-api</artifactId>
-                            </exclusion>
-                        </exclusions>
-		</dependency>
+            <exclusions>
+                 <exclusion>
+                     <groupId>stax</groupId>
+                     <artifactId>stax-api</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.1</version>
+        </dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
+			<version>4.5</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/branches/sca-java-1.x/modules/implementation-bpel-ode/pom.xml b/branches/sca-java-1.x/modules/implementation-bpel-ode/pom.xml
index bd829fc33f..98e267e044 100644
--- a/branches/sca-java-1.x/modules/implementation-bpel-ode/pom.xml
+++ b/branches/sca-java-1.x/modules/implementation-bpel-ode/pom.xml
@@ -98,17 +98,26 @@
 			<artifactId>tuscany-sdo-impl</artifactId>

 			<version>1.1.1</version>

 			<scope>compile</scope>

-                        <exclusions>

-                            <exclusion>

-                                <groupId>stax</groupId>

-                                <artifactId>stax-api</artifactId>

-                            </exclusion>

-                        </exclusions>

-		</dependency>

+            <exclusions>

+                 <exclusion>

+                     <groupId>stax</groupId>

+                     <artifactId>stax-api</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.1</version>

+        </dependency>

 		<dependency>

 			<groupId>junit</groupId>

 			<artifactId>junit</artifactId>

-			<version>3.8.1</version>

+			<version>4.5</version>

 			<scope>test</scope>

 		</dependency>

 		<dependency>

diff --git a/branches/sca-java-1.x/modules/implementation-das/pom.xml b/branches/sca-java-1.x/modules/implementation-das/pom.xml
index b9e42fb6a9..c4e003be03 100644
--- a/branches/sca-java-1.x/modules/implementation-das/pom.xml
+++ b/branches/sca-java-1.x/modules/implementation-das/pom.xml
@@ -41,8 +41,19 @@
 			<artifactId>tuscany-das-rdb</artifactId>

 			<version>1.0-SNAPSHOT</version>

 			<scope>compile</scope>

+			<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.1</version>

+        </dependency>

+		<dependency>

 			<groupId>org.apache.tuscany.sca</groupId>

 			<artifactId>tuscany-assembly</artifactId>

 			<version>1.4-SNAPSHOT</version>

diff --git a/branches/sca-java-1.x/modules/implementation-data-xml/pom.xml b/branches/sca-java-1.x/modules/implementation-data-xml/pom.xml
index 44c92f164e..46a08d01df 100644
--- a/branches/sca-java-1.x/modules/implementation-data-xml/pom.xml
+++ b/branches/sca-java-1.x/modules/implementation-data-xml/pom.xml
@@ -40,8 +40,19 @@
 			<artifactId>tuscany-das-rdb</artifactId>

 			<version>1.0-SNAPSHOT</version>

 			<scope>compile</scope>

+			<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.1</version>

+        </dependency>

+		<dependency>

 			<groupId>org.apache.tuscany.sca</groupId>

 			<artifactId>tuscany-assembly</artifactId>

 			<version>1.4-SNAPSHOT</version>

diff --git a/branches/sca-java-1.x/modules/node-dynamic/pom.xml b/branches/sca-java-1.x/modules/node-dynamic/pom.xml
index 91fbc9e025..90fe8d5a33 100644
--- a/branches/sca-java-1.x/modules/node-dynamic/pom.xml
+++ b/branches/sca-java-1.x/modules/node-dynamic/pom.xml
@@ -50,6 +50,12 @@
             <artifactId>tuscany-implementation-java-runtime</artifactId>

             <version>1.4-SNAPSHOT</version>

             <scope>runtime</scope>

+        </dependency>

+        

+        <dependency>

+            <groupId>backport-util-concurrent</groupId>

+            <artifactId>backport-util-concurrent</artifactId>

+            <version>3.1</version>

         </dependency>          

 

     </dependencies>

diff --git a/branches/sca-java-1.x/modules/runtime/pom.xml b/branches/sca-java-1.x/modules/runtime/pom.xml
index 832abe7bb6..ef5c2cc3aa 100644
--- a/branches/sca-java-1.x/modules/runtime/pom.xml
+++ b/branches/sca-java-1.x/modules/runtime/pom.xml
@@ -342,6 +342,11 @@
             <version>1.2</version>
         </dependency>
         <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
             <version>4.1.1</version>