diff options
author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-01 11:42:20 +0000 |
---|---|---|
committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-01 11:42:20 +0000 |
commit | 1217062fcef6b7d7b8c4c4f1a49521ede58e1654 (patch) | |
tree | b44e4d4fc5cd1d893f8e5b2d4e23560c086fb37d | |
parent | db033b2e2e8e0e652de49ef023c9e7735a7b927f (diff) |
Fixes for TUSCANY-2691
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@722042 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | branches/sca-java-1.x/distribution/bundle/pom.xml | 5 | ||||
-rw-r--r-- | branches/sca-java-1.x/distribution/manifest/pom.xml | 5 | ||||
-rw-r--r-- | branches/sca-java-1.x/distribution/pom.xml | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/branches/sca-java-1.x/distribution/bundle/pom.xml b/branches/sca-java-1.x/distribution/bundle/pom.xml index ae590c01d3..ec8d41b1ae 100644 --- a/branches/sca-java-1.x/distribution/bundle/pom.xml +++ b/branches/sca-java-1.x/distribution/bundle/pom.xml @@ -550,6 +550,11 @@ <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> </exclusion> + <!-- exclude backport-util-concurrent-3.0.jar since we are using version 3.1 --> + <exclusion> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/branches/sca-java-1.x/distribution/manifest/pom.xml b/branches/sca-java-1.x/distribution/manifest/pom.xml index 95fef9ca10..0a869981bf 100644 --- a/branches/sca-java-1.x/distribution/manifest/pom.xml +++ b/branches/sca-java-1.x/distribution/manifest/pom.xml @@ -553,6 +553,11 @@ <groupId>org.codehaus.woodstox</groupId> <artifactId>wstx-asl</artifactId> </exclusion> + <!-- exclude backport-util-concurrent-3.0.jar since we are using version 3.1 --> + <exclusion> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/branches/sca-java-1.x/distribution/pom.xml b/branches/sca-java-1.x/distribution/pom.xml index c7ce6ae531..698c33bf2b 100644 --- a/branches/sca-java-1.x/distribution/pom.xml +++ b/branches/sca-java-1.x/distribution/pom.xml @@ -131,6 +131,11 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.main</artifactId> </exclusion> + <!-- exclude backport-util-concurrent-3.0.jar since we are using version 3.1 --> + <exclusion> + <groupId>backport-util-concurrent</groupId> + <artifactId>backport-util-concurrent</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |