Author: ramkumar
Date: Mon Dec 1 04:04:29 2008
New Revision: 722055
URL: http://svn.apache.org/viewvc?rev=722055&view=rev
Log:
Fixes for TUSCANY-2696
Modified:
tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/pom.xml
tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
tuscany/branches/sca-java-1.x/modules/binding-sca-jms/pom.xml
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/pom.xml
tuscany/branches/sca-java-1.x/modules/data-engine-helper/pom.xml
tuscany/branches/sca-java-1.x/modules/databinding-saxon/pom.xml
tuscany/branches/sca-java-1.x/modules/databinding-sdo/pom.xml
tuscany/branches/sca-java-1.x/modules/domain-manager/pom.xml
tuscany/branches/sca-java-1.x/modules/host-openejb/pom.xml
tuscany/branches/sca-java-1.x/modules/implementation-bpel-jbpm/pom.xml
tuscany/branches/sca-java-1.x/modules/implementation-bpel-ode/pom.xml
tuscany/branches/sca-java-1.x/modules/implementation-das/pom.xml
tuscany/branches/sca-java-1.x/modules/implementation-data-xml/pom.xml
tuscany/branches/sca-java-1.x/modules/node-dynamic/pom.xml
tuscany/branches/sca-java-1.x/modules/runtime/pom.xml
Modified: tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-atom-abdera/pom.xml Mon Dec
1 04:04:29 2008
@@ -81,7 +81,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
+ <version>3.1</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml Mon Dec
1 04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/binding-sca-jms/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-sca-jms/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-sca-jms/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-sca-jms/pom.xml Mon Dec 1
04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/pom.xml Mon Dec 1
04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/data-engine-helper/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/data-engine-helper/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/data-engine-helper/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/data-engine-helper/pom.xml Mon Dec 1
04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/databinding-saxon/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/databinding-saxon/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/databinding-saxon/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/databinding-saxon/pom.xml Mon Dec 1
04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/databinding-sdo/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/databinding-sdo/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/databinding-sdo/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/databinding-sdo/pom.xml Mon Dec 1
04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/domain-manager/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/domain-manager/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/domain-manager/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/domain-manager/pom.xml Mon Dec 1
04:04:29 2008
@@ -93,7 +93,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
+ <version>1.2</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-1.x/modules/host-openejb/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/host-openejb/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/host-openejb/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/host-openejb/pom.xml Mon Dec 1
04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-bpel-jbpm/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-bpel-jbpm/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-bpel-jbpm/pom.xml
(original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-bpel-jbpm/pom.xml Mon
Dec 1 04:04:29 2008
@@ -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>
+ <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>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-bpel-ode/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-bpel-ode/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-bpel-ode/pom.xml
(original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-bpel-ode/pom.xml Mon
Dec 1 04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-das/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-das/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-das/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-das/pom.xml Mon Dec 1
04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-data-xml/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-data-xml/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-data-xml/pom.xml
(original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-data-xml/pom.xml Mon
Dec 1 04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/node-dynamic/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-dynamic/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/node-dynamic/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/node-dynamic/pom.xml Mon Dec 1
04:04:29 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/modules/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/runtime/pom.xml?rev=722055&r1=722054&r2=722055&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/runtime/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/runtime/pom.xml Mon Dec 1 04:04:29
2008
@@ -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>
