From 4acc73e3502b4d380e35d01192b68f682cb7b1c6 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 24 Jan 2008 13:19:57 +0000
Subject: [PATCH] Upgraded to Spring 2.5.1

---
 parent/pom.xml           |  2 +-
 samples/airline/pom.xml  |  7 +++----
 samples/mtom/pom.xml     | 11 -----------
 samples/tutorial/pom.xml |  4 ----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 697f1e27..c802e3fc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -242,7 +242,7 @@
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>spring-jpa</artifactId>
+                <artifactId>spring-orm</artifactId>
                 <version>${spring.version}</version>
             </dependency>
             <dependency>
diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml
index 76dd82db..3785d559 100644
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -148,12 +148,12 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-jpa</artifactId>
+            <artifactId>spring-orm</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-dao</artifactId>
+            <artifactId>spring-tx</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -174,8 +174,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-            <scope>test</scope>
+            <artifactId>spring-test</artifactId>
         </dependency>
         <!-- JEE dependencies -->
         <dependency>
diff --git a/samples/mtom/pom.xml b/samples/mtom/pom.xml
index a92fb592..c2fd302e 100644
--- a/samples/mtom/pom.xml
+++ b/samples/mtom/pom.xml
@@ -88,16 +88,5 @@
           <artifactId>stax-api</artifactId>
           <scope>runtime</scope>
       </dependency>
-      <!-- Test dependencies -->
-      <dependency>
-         <groupId>org.springframework</groupId>
-         <artifactId>spring-mock</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>easymock</groupId>
-         <artifactId>easymock</artifactId>
-         <version>1.2_Java1.3</version>
-         <scope>test</scope>
-      </dependency>
    </dependencies>
 </project>
diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml
index 316c7f64..9d76dc40 100644
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -58,10 +58,6 @@
             </exclusions>
         </dependency>
         <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-        </dependency>
         <dependency>
             <groupId>easymock</groupId>
             <artifactId>easymock</artifactId>