Upgrading to Spring 3.0.1

2010-02-25 09:31:48 +00:00
parent 52206ca5f4
commit 9a608b4ba3
8 changed files with 32 additions and 67 deletions
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -39,20 +39,6 @@
    </profiles>
    <build>
        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <excludes>
-                        <!--TODO: include-->
-                        <exclude>org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapter.java</exclude>
-                    </excludes>
-                    <testExcludes>
-                        <testExclude>org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java</testExclude>
-                        <testExclude>org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java</testExclude>
-                    </testExcludes>
-                </configuration>
-            </plugin>
            <plugin>
                <groupId>com.springsource.bundlor</groupId>
                <artifactId>com.springsource.bundlor.maven</artifactId>
--- a/core/template.mf
+++ b/core/template.mf
@@ -18,15 +18,15 @@ Import-Template:
 org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
 org.dom4j.*;version="[1.6.1, 2.0.0)";resolution:=optional,
 org.jdom.*;version="[1.0.0, 2.0.0)";resolution:=optional,
- org.springframework.aop.*;version="[3.0.0, 4.0.0)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.context.*;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.oxm.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.stereotype.*;version="[3.0.0, 4.0.0)",
- org.springframework.validation.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.*;version="[3.0.0, 4.0.0)",
+ org.springframework.aop.*;version="[3.0.1, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.1, 4.0.0)",
+ org.springframework.context.*;version="[3.0.1, 4.0.0)",
+ org.springframework.core.*;version="[3.0.1, 4.0.0)",
+ org.springframework.oxm.*;version="[3.0.1, 4.0.0)",
+ org.springframework.util.*;version="[3.0.1, 4.0.0)",
+ org.springframework.stereotype.*;version="[3.0.1, 4.0.0)",
+ org.springframework.validation.*;version="[3.0.1, 4.0.0)",
+ org.springframework.web.*;version="[3.0.1, 4.0.0)",
 org.springframework.xml.*;version="[${version}, ${version}]",
 org.w3c.dom.*;version="0",
 org.xml.sax.*;version="0"
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -19,7 +19,7 @@
        </snapshotRepository>
        <site>
            <id>static.springframework.org</id>
-            <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/sites/1.5</url>
+            <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ws/sites/2.0</url>
        </site>
    </distributionManagement>
    <scm>
@@ -28,27 +28,9 @@
        <url>https://fisheye.springframework.org/browse/spring-ws/trunk</url>
    </scm>
    <properties>
-        <spring.framework.version>3.0.0.RELEASE</spring.framework.version>
+        <spring.framework.version>3.0.1.RELEASE</spring.framework.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
-    <repositories>
-        <repository>
-            <id>spring-release</id>
-            <name>Spring Portfolio Release Repository</name>
-            <url>http://maven.springframework.org/release</url>
-        </repository>
-        <repository>
-            <id>spring-external</id>
-            <name>Spring Portfolio External Repository</name>
-            <url>http://maven.springframework.org/external</url>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <name>Java.net Repository for Maven</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
    <pluginRepositories>
        <pluginRepository>
            <id>com.springsource.repository.bundles.release</id>
@@ -247,11 +229,6 @@
                <artifactId>spring-jms</artifactId>
                <version>${spring.framework.version}</version>
            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-remoting</artifactId>
-                <version>${spring.framework.version}</version>
-            </dependency>
            <dependency>
                <groupId>org.springframework</groupId>
                <artifactId>spring-test</artifactId>
@@ -298,7 +275,7 @@
            <dependency>
                <groupId>org.codehaus.woodstox</groupId>
                <artifactId>wstx-asl</artifactId>
-                <version>3.2.7</version>
+                <version>3.2.9</version>
                <exclusions>
                    <exclusion>
                        <groupId>stax</groupId>
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
        <url>https://fisheye.springframework.org/browse/spring-ws/tags/spring-ws-1.5.6</url>
    </scm>
    <properties>
-        <spring.framework.version>3.0.0.RELEASE</spring.framework.version>
+        <spring.framework.version>3.0.1.RELEASE</spring.framework.version>
    </properties>
    <modules>
        <module>parent</module>
@@ -240,7 +240,7 @@
                                        <artifactItem>
                                            <groupId>org.codehaus.woodstox</groupId>
                                            <artifactId>wstx-asl</artifactId>
-                                            <version>3.2.7</version>
+                                            <version>3.2.9</version>
                                            <outputDirectory>${project.build.directory}/dependency/stax/</outputDirectory>
                                        </artifactItem>
                                        <artifactItem>
--- a/security/template.mf
+++ b/security/template.mf
@@ -12,11 +12,11 @@ Import-Template:
 org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
 org.apache.ws.security.*;version="[1.5.8, 2.0.0)";resolution:=optional,
 org.apache.xml.security.*;version="[1.0.5.D2, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.dao.*;version="[3.0.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.1, 4.0.0)",
+ org.springframework.core.*;version="[3.0.1, 4.0.0)",
+ org.springframework.dao.*;version="[3.0.1, 4.0.0)",
 org.springframework.security.*;version="[3.0.0.A, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.util.*;version="[3.0.1, 4.0.0)",
 org.springframework.ws.*;version="[${version}, ${version}]",
 org.w3c.dom.*;version="0"
 Ignored-Existing-Headers:
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -11,6 +11,7 @@
    <packaging>jar</packaging>
    <name>Spring WS Support</name>
    <description>Spring Web Services Support package.</description>
+<!--
    <repositories>
        <repository>
            <id>spring-ext</id>
@@ -23,6 +24,7 @@
            <url>http://download.java.net/maven/2/</url>
        </repository>
    </repositories>
+-->
    <profiles>
        <profile>
            <id>jdk15</id>
--- a/support/template.mf
+++ b/support/template.mf
@@ -14,14 +14,14 @@ Import-Template:
 javax.net.ssl.*;version="0",
 javax.xml.transform.*;version="0",
 org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.context.*;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.ejb.*;version="[3.0.0, 4.0.0)",
- org.springframework.jms.*;version="[3.0.0, 4.0.0)",
- org.springframework.jndi.*;version="[3.0.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.1, 4.0.0)",
+ org.springframework.context.*;version="[3.0.1, 4.0.0)",
+ org.springframework.core.*;version="[3.0.1, 4.0.0)",
+ org.springframework.ejb.*;version="[3.0.1, 4.0.0)",
+ org.springframework.jms.*;version="[3.0.1, 4.0.0)",
+ org.springframework.jndi.*;version="[3.0.1, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.1, 4.0.0)",
+ org.springframework.util.*;version="[3.0.1, 4.0.0)",
 org.springframework.ws.*;version="[${version}, ${version}]",
 org.springframework.xml.*;version="[${version}, ${version}]"
 Excluded-Imports:
--- a/xml/template.mf
+++ b/xml/template.mf
@@ -14,10 +14,10 @@ Import-Template:
 org.apache.commons.logging;version="[1.1.1, 2.0.0)",
 org.apache.ws.commons.schema.*;version="[1.3.2, 2.0.0)";resolution:=optional,
 org.jaxen.*;version="[1.1.1, 2.0.0)";resolution:=optional,
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.context.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.1, 4.0.0)",
+ org.springframework.core.*;version="[3.0.1, 4.0.0)",
+ org.springframework.context.*;version="[3.0.1, 4.0.0)",
+ org.springframework.util.*;version="[3.0.1, 4.0.0)",
 org.w3c.dom.*;version="0",
 org.xml.sax.*;version="0"
 Ignored-Existing-Headers: