Upgraded to Spring 2.5.1

Author: poutsma

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>

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>

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>

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>