From e9767d320ce140e3accad00125abaadc7b4fe591 Mon Sep 17 00:00:00 2001
From: Javier Moran Rua <jmoran@igalia.com>
Date: Thu, 25 Mar 2010 23:02:11 +0100
Subject: [PATCH] Replacing SUN jta.jar dependency by Apache Geronimo open
 source implementation of JTA.

---
 INSTALL                       |  8 --------
 navalplanner-business/pom.xml |  4 ++++
 navalplanner-webapp/pom.xml   |  4 ++++
 pom.xml                       | 11 +++++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index 1157c1bdb..6d310ef8d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -40,14 +40,6 @@ Database creation
 Compilation
 -----------
 
-* Download Spring Framework 2.5.6 (http://www.springsource.org/download).
-
-* Execute the following commands::
-
-    mvn install:install-file -DgroupId=javax.transaction -DartifactId=jta \
-      -Dversion=1.0.1B -Dpackaging=jar \
-      -Dfile=<<spring-framework-2.5.6>>/lib/j2ee/jta.jar
-
     cd xestion-producion
 
     mvn install
diff --git a/navalplanner-business/pom.xml b/navalplanner-business/pom.xml
index 8a0c4d961..d377c91e2 100644
--- a/navalplanner-business/pom.xml
+++ b/navalplanner-business/pom.xml
@@ -37,6 +37,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml
index 8d52495b7..e73940d28 100644
--- a/navalplanner-webapp/pom.xml
+++ b/navalplanner-webapp/pom.xml
@@ -166,6 +166,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
diff --git a/pom.xml b/pom.xml
index c06f74759..2f5ee4f42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,6 +218,17 @@
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate</artifactId>
                 <version>3.2.7.ga</version>
+                <exclusions>
+                <exclusion>
+                    <groupId>javax.transaction</groupId>
+                    <artifactId>jta</artifactId>
+                </exclusion>
+            </exclusions>
+            </dependency>
+            <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+                <version>1.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>