Author: nash
Date: Tue Aug 24 20:12:34 2010
New Revision: 988702
URL: http://svn.apache.org/viewvc?rev=988702&view=rev
Log:
Merge revision 951571 from trunk into the 1.6.1 branch
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml?rev=988702&r1=988701&r2=988702&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
(original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml
Tue Aug 24 20:12:34 2010
@@ -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>
