diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-08-24 20:12:34 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-08-24 20:12:34 +0000 |
| commit | 30bb8253a1d5a74c6812aa4b2ca364eecd493f7e (patch) | |
| tree | f7d38ed44eef1d4250151af9e3f398f71b847886 /sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml | |
| parent | f887fa14b7a536bf34ee9ed80dd2c8eb97ccddac (diff) | |
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
Diffstat (limited to '')
| -rw-r--r-- | sca-java-1.x/branches/sca-java-1.6.1/distribution/bundle/pom.xml | 7 |
1 files changed, 7 insertions, 0 deletions
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> |