summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/implementation-bpel-runtime
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-10-12 13:42:56 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-10-12 13:42:56 +0000
commit4e68ab61926e3007d047e5a4e8652b0acb88edd1 (patch)
treea29c94a7b8bbce6c8d68b9445ad2450754e114b6 /sca-java-2.x/trunk/modules/implementation-bpel-runtime
parent6ff205c75b44baa2063bfe16542b39be6d70800b (diff)
Upgrade geronimo dependency versions so we only pull in one and add slf as it's subsequently required.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1021772 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/implementation-bpel-runtime')
-rw-r--r--sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml16
1 files changed, 14 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
index eedf738ddb..641ee3ff6d 100644
--- a/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-bpel-runtime/pom.xml
@@ -211,7 +211,7 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>2.0.1</version>
+ <version>2.1.3</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -263,7 +263,7 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>2.0.1</version>
+ <version>2.1.3</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
@@ -459,6 +459,18 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- Explicitly add slf4j so that ODE uses the latest versions -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.11</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.11</version>
+ </dependency>
</dependencies>
<build>