From 35908eb2a271c31187b04af9623821439634c826 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 25 Oct 2010 10:58:50 +0000
Subject: Merge r999901 Fix incorrect version number for commons-lang and
 exclude junit dependencies

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027047 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/modules/implementation-bpel-ode/pom.xml  | 24 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'sca-java-1.x/trunk/modules')

diff --git a/sca-java-1.x/trunk/modules/implementation-bpel-ode/pom.xml b/sca-java-1.x/trunk/modules/implementation-bpel-ode/pom.xml
index 5af8dc5335..6eb6e10eca 100644
--- a/sca-java-1.x/trunk/modules/implementation-bpel-ode/pom.xml
+++ b/sca-java-1.x/trunk/modules/implementation-bpel-ode/pom.xml
@@ -209,7 +209,7 @@
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
-			<version>2.1</version>
+			<version>2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-collections</groupId>
@@ -253,7 +253,11 @@
 					<groupId>ognl</groupId>
 					<artifactId>ognl</artifactId>
 				</exclusion>
-			</exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
@@ -284,6 +288,12 @@
 			<groupId>tranql</groupId>
 			<artifactId>tranql-connector</artifactId>
 			<version>1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openjpa</groupId>
@@ -318,12 +328,22 @@
 					<groupId>org.apache.openjpa</groupId>
 					<artifactId>openjpa-xmlstore</artifactId>
 				</exclusion>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.serp</groupId>
 			<artifactId>serp</artifactId>
 			<version>1.12.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
                 <dependency>
                     <groupId>jaxen</groupId>
-- 
cgit v1.2.3