From 96882a4e5b0674bff393faec5c466c755ea39b15 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Sat, 10 Nov 2007 04:02:55 +0000
Subject: [PATCH] Supporting Spring 2.5 for building.

---
 core/pom.xml                                  | 36 +++++++++++++---
 pom.xml                                       | 16 ++++++++
 security/pom.xml                              | 41 ++++++++++++++-----
 .../validation/XmlValidatorFactoryTest.java   |  5 +++
 4 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 217e4007..2c5dfe72 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <artifactId>spring-ws</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -19,6 +20,35 @@
             </plugin>
         </plugins>
     </reporting>
+    <profiles>
+        <profile>
+            <id>spring-2.0</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-mock</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>spring-2.5</id>
+            <activation>
+                <property>
+                    <name>spring.version</name>
+                    <value>2.5-rc1</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-test</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
@@ -48,10 +78,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-        </dependency>
         <!-- XML handling dependencies -->
         <dependency>
             <groupId>xml-apis</groupId>
diff --git a/pom.xml b/pom.xml
index 2a554c83..6a83a16a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,11 @@
             <url>http://download.java.net/maven/1/</url>
             <layout>legacy</layout>
         </repository>
+        <repository>
+            <id>spring-milestone</id>
+            <name>Springframework Maven Milestone Repository</name>
+            <url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+        </repository>
     </repositories>
     <build>
         <extensions>
@@ -442,6 +447,11 @@
                 <artifactId>spring-jdbc</artifactId>
                 <version>${spring.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-tx</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-jms</artifactId>
@@ -458,6 +468,12 @@
                 <version>${spring.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring.version}</version>
+                <scope>test</scope>
+            </dependency>
             <!-- XML handling dependencies -->
             <dependency>
                 <groupId>xerces</groupId>
diff --git a/security/pom.xml b/security/pom.xml
index 520d1b03..3f6067df 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <artifactId>spring-ws</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -32,6 +33,35 @@
             </plugin>
         </plugins>
     </reporting>
+    <profiles>
+        <profile>
+            <id>spring-2.0</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-dao</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>spring-2.5</id>
+            <activation>
+                <property>
+                    <name>spring.version</name>
+                    <value>2.5-rc1</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-tx</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
     <dependencies>
         <!-- Spring-WS dependencies -->
         <dependency>
@@ -49,15 +79,6 @@
             <artifactId>spring-xml</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- Spring dependencies -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-dao</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-        </dependency>
         <!-- XML handling dependencies -->
         <dependency>
             <groupId>xml-apis</groupId>
diff --git a/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java b/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java
index 9965e821..4f347266 100644
--- a/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java
+++ b/xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java
@@ -19,6 +19,7 @@ package org.springframework.xml.validation;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 
 import junit.framework.TestCase;
@@ -81,6 +82,10 @@ public class XmlValidatorFactoryTest extends TestCase {
             throw new IOException();
         }
 
+        public URI getURI() throws IOException {
+            throw new IOException();
+        }
+
         public boolean isOpen() {
             return false;
         }