From 30bb8253a1d5a74c6812aa4b2ca364eecd493f7e Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 24 Aug 2010 20:12:34 +0000
Subject: Merge revision 951571 from trunk into the 1.6.1 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@988702 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'sca-java-1.x/branches/sca-java-1.6.1')

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
index 59e97518ab..e22b783cd5 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
@@ -385,6 +385,13 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
             <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <!-- this uses commons-lang 2.1, but we need 2.3 for domain-manager -->
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-- 
cgit v1.2.3