Revert premature 2.0.2 release changes

2011-05-20 12:32:59 +00:00
parent 226685ca0b
commit f2e064e45e
40 changed files with 64 additions and 51 deletions
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>spring-ws-parent</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,20 @@ SPRING WEB SERVICES CHANGELOG
 =============================
 http://www.springframework.org/spring-ws

+Changes in version 2.0.2.RELEASE
+----------------------------------
+
+** Bug
+    * [SWS-702] - sws:annotation-driven does not pick up @Endpoint annotations on classes that are JDK proxies
+    * [SWS-705] - OSGi import of org.springframework.security.authentication seems to be the wrong version
+    * [SWS-708] - PayloadValidatingInterceptor errors not clearing SecurityContextHolder 
+
+** Improvement
+    * [SWS-706] - Jaxp13XPathTemplate should support StreamSources with only a systemId if it's a valid URL
+
+** New Feature
+    * [SWS-662] - Support for UriEndpointMapping in server-side test
+
 Changes in version 2.0.1.RELEASE
 ----------------------------------

--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <artifactId>spring-ws-parent</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/notes.txt
+++ b/notes.txt
@@ -1,17 +1,16 @@
 Dear Spring community,

-I'm pleased to announce that Spring Web Services 2.0.1.RELEASE has
+I'm pleased to announce that Spring Web Services 2.0.2.RELEASE has
 been released!

-This is the second GA release in the 2.0 release cycle. It contains bug fixes
-and minor updates.
+This is the third GA release in the 2.0 release cycle. Most importantly, it
+resolves a potential security issue when using WS-Security in combination with
+response payload validation.
+
+It is recommended that all current 2.0.x users upgrade to 2.0.2.

 Please see the changelog for more details.

 For more information, refer to 

-http://blog.springsource.com/2011/01/11/spring-web-services-2-0-released/
-
-or
-
 http://static.springframework.org/spring-ws/sites/2.0
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.springframework.ws</groupId>
    <artifactId>spring-ws-parent</artifactId>
    <packaging>pom</packaging>
-    <version>2.0.3.RELEASE-SNAPSHOT</version>
+    <version>2.0.2.RELEASE-SNAPSHOT</version>
    <name>Spring Web Services - Parent</name>
    <distributionManagement>
        <downloadUrl>http://static.springframework.org/spring-ws/site/downloads/releases.html</downloadUrl>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.springframework.ws</groupId>
    <artifactId>spring-ws</artifactId>
    <packaging>pom</packaging>
-    <version>2.0.3.RELEASE-SNAPSHOT</version>
+    <version>2.0.2.RELEASE-SNAPSHOT</version>
    <name>Spring Web Services</name>
    <description>
        Spring Web Services is a product of the Spring community focused on creating document-driven Web services. It
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,4 @@
-SPRING WEB SERVICES 2.0.1.RELEASE (March 2011)
+SPRING WEB SERVICES 2.0.2.RELEASE (May 2011)
 -------------------------------
 http://www.springframework.org/spring-ws
 http://forum.springframework.org/forumdisplay.php?f=39
@@ -36,31 +36,31 @@ The following distinct jar files are included in the distribution. This list spe
 third-party dependencies. Libraries in [brackets] are optional, i.e. just necessary for certain functionality. For an 
 exact list of Spring-WS project dependencies see the respective Maven2 pom.xml files.

-* spring-ws-core-2.0.1.RELEASE.jar
+* spring-ws-core-2.0.2.RELEASE.jar
 - Contents: The Spring-WS Core
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-oxm
                [Log4J, spring-web, spring-webmvc, SAAJ, JDOM, StAX, Servlet API, JAF, Axiom, DOM4J, XOM, WSDL4J]

-* spring-ws-support-2.0.1.RELEASE.jar
+* spring-ws-support-2.0.2.RELEASE.jar
 - Contents: The Spring-WS Support
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core
                [JMS, JavaMail]

-* spring-ws-security-2.0.1.RELEASE.jar
+* spring-ws-security-2.0.2.RELEASE.jar
 - Contents: Spring-WS Security integration
 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-ws-core
                [Log4J, xmlsdig, xmlsec, XWS-security, Acegi, WSS4J]

-* spring-ws-test-2.0.1.RELEASE.jar
+* spring-ws-test-2.0.2.RELEASE.jar
 - Contents: Spring-WS Testing framework
 - Dependencies: JUnit, XMLUnit

-* spring-xml-2.0.1.RELEASE.jar
+* spring-xml-2.0.2.RELEASE.jar
 - Contents: Spring XML utility framework
 - Dependencies: Commons Logging, spring-beans, spring-core
                [StAX, Xalan, Jaxen]

-* spring-ws-2.0.1.RELEASE-all.jar
+* spring-ws-2.0.2.RELEASE-all.jar
 - Contents: Convenient al-in-one jar containing all of the jars described above


--- a/samples/airline/client/axis1/pom.xml
+++ b/samples/airline/client/axis1/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>airline-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/airline/client/jax-ws/pom.xml
+++ b/samples/airline/client/jax-ws/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>airline-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/airline/client/jms/pom.xml
+++ b/samples/airline/client/jms/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>airline-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/airline/client/pom.xml
+++ b/samples/airline/client/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>airline</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/airline/client/saaj/pom.xml
+++ b/samples/airline/client/saaj/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>airline-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/airline/client/spring-ws/pom.xml
+++ b/samples/airline/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>airline-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/airline/pom.xml
+++ b/samples/airline/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>spring-ws-samples</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/airline/server/pom.xml
+++ b/samples/airline/server/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <artifactId>airline</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/echo/client/pom.xml
+++ b/samples/echo/client/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>echo</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/echo/client/saaj/pom.xml
+++ b/samples/echo/client/saaj/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>echo-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/echo/client/spring-ws/pom.xml
+++ b/samples/echo/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>echo-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/echo/pom.xml
+++ b/samples/echo/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>spring-ws-samples</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/echo/server/pom.xml
+++ b/samples/echo/server/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <artifactId>echo</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/mtom/client/jax-ws/pom.xml
+++ b/samples/mtom/client/jax-ws/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>mtom-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/mtom/client/pom.xml
+++ b/samples/mtom/client/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>mtom</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/mtom/client/spring-ws/pom.xml
+++ b/samples/mtom/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>mtom-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/mtom/pom.xml
+++ b/samples/mtom/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>spring-ws-samples</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/mtom/server/pom.xml
+++ b/samples/mtom/server/pom.xml
@@ -3,7 +3,7 @@
   <parent>
      <artifactId>mtom</artifactId>
      <groupId>org.springframework.ws</groupId>
-      <version>2.0.3.RELEASE-SNAPSHOT</version>
+      <version>2.0.2.RELEASE-SNAPSHOT</version>
      <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>spring-ws-parent</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/pox/client/pom.xml
+++ b/samples/pox/client/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>pox</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/pox/client/spring-ws/pom.xml
+++ b/samples/pox/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>pox-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/pox/pom.xml
+++ b/samples/pox/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>spring-ws-samples</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/pox/server/pom.xml
+++ b/samples/pox/server/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <artifactId>pox</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/stockquote/client/jax-ws/pom.xml
+++ b/samples/stockquote/client/jax-ws/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>stockquote-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/stockquote/client/pom.xml
+++ b/samples/stockquote/client/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>stockquote</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/stockquote/client/spring-ws/pom.xml
+++ b/samples/stockquote/client/spring-ws/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>stockquote-client</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/stockquote/pom.xml
+++ b/samples/stockquote/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>spring-ws-samples</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/stockquote/server/pom.xml
+++ b/samples/stockquote/server/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <artifactId>stockquote</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/samples/tutorial/pom.xml
+++ b/samples/tutorial/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>spring-ws-samples</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../samples/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <artifactId>spring-ws-parent</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <artifactId>spring-ws-parent</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <artifactId>spring-ws-parent</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/xml/pom.xml
+++ b/xml/pom.xml
@@ -2,7 +2,7 @@
    <parent>
        <artifactId>spring-ws-parent</artifactId>
        <groupId>org.springframework.ws</groupId>
-        <version>2.0.3.RELEASE-SNAPSHOT</version>
+        <version>2.0.2.RELEASE-SNAPSHOT</version>
        <relativePath>../parent/pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>