From f2e064e45e92f4bc218e3e44b99f1f36afb9d39a Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Fri, 20 May 2011 12:32:59 +0000 Subject: [PATCH] Revert premature 2.0.2 release changes --- archetype/pom.xml | 2 +- changelog.txt | 14 ++++++++++++++ core/pom.xml | 2 +- notes.txt | 13 ++++++------- parent/pom.xml | 2 +- pom.xml | 2 +- readme.txt | 14 +++++++------- samples/airline/client/axis1/pom.xml | 2 +- samples/airline/client/jax-ws/pom.xml | 2 +- samples/airline/client/jms/pom.xml | 2 +- samples/airline/client/pom.xml | 2 +- samples/airline/client/saaj/pom.xml | 2 +- samples/airline/client/spring-ws/pom.xml | 2 +- samples/airline/pom.xml | 2 +- samples/airline/server/pom.xml | 2 +- samples/echo/client/pom.xml | 2 +- samples/echo/client/saaj/pom.xml | 2 +- samples/echo/client/spring-ws/pom.xml | 2 +- samples/echo/pom.xml | 2 +- samples/echo/server/pom.xml | 2 +- samples/mtom/client/jax-ws/pom.xml | 2 +- samples/mtom/client/pom.xml | 2 +- samples/mtom/client/spring-ws/pom.xml | 2 +- samples/mtom/pom.xml | 2 +- samples/mtom/server/pom.xml | 2 +- samples/pom.xml | 2 +- samples/pox/client/pom.xml | 2 +- samples/pox/client/spring-ws/pom.xml | 2 +- samples/pox/pom.xml | 2 +- samples/pox/server/pom.xml | 2 +- samples/stockquote/client/jax-ws/pom.xml | 2 +- samples/stockquote/client/pom.xml | 2 +- samples/stockquote/client/spring-ws/pom.xml | 2 +- samples/stockquote/pom.xml | 2 +- samples/stockquote/server/pom.xml | 2 +- samples/tutorial/pom.xml | 2 +- security/pom.xml | 2 +- support/pom.xml | 2 +- test/pom.xml | 2 +- xml/pom.xml | 2 +- 40 files changed, 64 insertions(+), 51 deletions(-) diff --git a/archetype/pom.xml b/archetype/pom.xml index f68b45c4..37e2f943 100644 --- a/archetype/pom.xml +++ b/archetype/pom.xml @@ -3,7 +3,7 @@ spring-ws-parent org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/changelog.txt b/changelog.txt index 2f346c3e..13aff629 100644 --- 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 ---------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 90d1b654..4352bc04 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -2,7 +2,7 @@ spring-ws-parent org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/notes.txt b/notes.txt index 2049913d..4e71ba78 100644 --- 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 diff --git a/parent/pom.xml b/parent/pom.xml index 6aaa5911..355a3d08 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -4,7 +4,7 @@ org.springframework.ws spring-ws-parent pom - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT Spring Web Services - Parent http://static.springframework.org/spring-ws/site/downloads/releases.html diff --git a/pom.xml b/pom.xml index ada17c5a..10f3477d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.ws spring-ws pom - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT Spring Web Services Spring Web Services is a product of the Spring community focused on creating document-driven Web services. It diff --git a/readme.txt b/readme.txt index 9463964e..edf37b38 100644 --- 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 diff --git a/samples/airline/client/axis1/pom.xml b/samples/airline/client/axis1/pom.xml index b6067a58..1edfacf6 100644 --- a/samples/airline/client/axis1/pom.xml +++ b/samples/airline/client/axis1/pom.xml @@ -3,7 +3,7 @@ airline-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/airline/client/jax-ws/pom.xml b/samples/airline/client/jax-ws/pom.xml index ac2011a0..bb3e014f 100644 --- a/samples/airline/client/jax-ws/pom.xml +++ b/samples/airline/client/jax-ws/pom.xml @@ -3,7 +3,7 @@ airline-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/airline/client/jms/pom.xml b/samples/airline/client/jms/pom.xml index c45c80ec..695230ad 100644 --- a/samples/airline/client/jms/pom.xml +++ b/samples/airline/client/jms/pom.xml @@ -3,7 +3,7 @@ airline-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/airline/client/pom.xml b/samples/airline/client/pom.xml index 7d4118e8..fd024433 100644 --- a/samples/airline/client/pom.xml +++ b/samples/airline/client/pom.xml @@ -3,7 +3,7 @@ airline org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/airline/client/saaj/pom.xml b/samples/airline/client/saaj/pom.xml index 99e2e02f..5333a0c9 100644 --- a/samples/airline/client/saaj/pom.xml +++ b/samples/airline/client/saaj/pom.xml @@ -3,7 +3,7 @@ airline-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/airline/client/spring-ws/pom.xml b/samples/airline/client/spring-ws/pom.xml index d2e8d830..90968984 100644 --- a/samples/airline/client/spring-ws/pom.xml +++ b/samples/airline/client/spring-ws/pom.xml @@ -3,7 +3,7 @@ airline-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/airline/pom.xml b/samples/airline/pom.xml index 931270bb..6662ad8e 100644 --- a/samples/airline/pom.xml +++ b/samples/airline/pom.xml @@ -3,7 +3,7 @@ spring-ws-samples org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/airline/server/pom.xml b/samples/airline/server/pom.xml index aaf233a4..95160429 100644 --- a/samples/airline/server/pom.xml +++ b/samples/airline/server/pom.xml @@ -2,7 +2,7 @@ airline org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/echo/client/pom.xml b/samples/echo/client/pom.xml index f288063c..53319f6b 100644 --- a/samples/echo/client/pom.xml +++ b/samples/echo/client/pom.xml @@ -3,7 +3,7 @@ echo org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/echo/client/saaj/pom.xml b/samples/echo/client/saaj/pom.xml index fd088e7c..04793054 100644 --- a/samples/echo/client/saaj/pom.xml +++ b/samples/echo/client/saaj/pom.xml @@ -3,7 +3,7 @@ echo-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/echo/client/spring-ws/pom.xml b/samples/echo/client/spring-ws/pom.xml index dd8f05fb..170efdc7 100644 --- a/samples/echo/client/spring-ws/pom.xml +++ b/samples/echo/client/spring-ws/pom.xml @@ -3,7 +3,7 @@ echo-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/echo/pom.xml b/samples/echo/pom.xml index f1b5df6e..bff28b78 100644 --- a/samples/echo/pom.xml +++ b/samples/echo/pom.xml @@ -3,7 +3,7 @@ spring-ws-samples org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/echo/server/pom.xml b/samples/echo/server/pom.xml index e5aa6edc..fc62a7d1 100644 --- a/samples/echo/server/pom.xml +++ b/samples/echo/server/pom.xml @@ -2,7 +2,7 @@ echo org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/mtom/client/jax-ws/pom.xml b/samples/mtom/client/jax-ws/pom.xml index 9f7d104b..de4b058c 100644 --- a/samples/mtom/client/jax-ws/pom.xml +++ b/samples/mtom/client/jax-ws/pom.xml @@ -3,7 +3,7 @@ mtom-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/mtom/client/pom.xml b/samples/mtom/client/pom.xml index ccfbd920..284cbb6f 100644 --- a/samples/mtom/client/pom.xml +++ b/samples/mtom/client/pom.xml @@ -3,7 +3,7 @@ mtom org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/mtom/client/spring-ws/pom.xml b/samples/mtom/client/spring-ws/pom.xml index 16637638..ee47fa5a 100644 --- a/samples/mtom/client/spring-ws/pom.xml +++ b/samples/mtom/client/spring-ws/pom.xml @@ -3,7 +3,7 @@ mtom-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/mtom/pom.xml b/samples/mtom/pom.xml index 3e96f4b8..4c33fe05 100644 --- a/samples/mtom/pom.xml +++ b/samples/mtom/pom.xml @@ -3,7 +3,7 @@ spring-ws-samples org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/mtom/server/pom.xml b/samples/mtom/server/pom.xml index 65f84908..40282724 100644 --- a/samples/mtom/server/pom.xml +++ b/samples/mtom/server/pom.xml @@ -3,7 +3,7 @@ mtom org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/pom.xml b/samples/pom.xml index 6ce263ea..cf72dab9 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -3,7 +3,7 @@ spring-ws-parent org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/samples/pox/client/pom.xml b/samples/pox/client/pom.xml index fa37a414..3a45c9dd 100644 --- a/samples/pox/client/pom.xml +++ b/samples/pox/client/pom.xml @@ -3,7 +3,7 @@ pox org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/pox/client/spring-ws/pom.xml b/samples/pox/client/spring-ws/pom.xml index c4bd6a29..dae7af1b 100644 --- a/samples/pox/client/spring-ws/pom.xml +++ b/samples/pox/client/spring-ws/pom.xml @@ -3,7 +3,7 @@ pox-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/pox/pom.xml b/samples/pox/pom.xml index eb88e56f..d82999aa 100644 --- a/samples/pox/pom.xml +++ b/samples/pox/pom.xml @@ -3,7 +3,7 @@ spring-ws-samples org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/pox/server/pom.xml b/samples/pox/server/pom.xml index e02d2fb7..7f68ddb6 100644 --- a/samples/pox/server/pom.xml +++ b/samples/pox/server/pom.xml @@ -2,7 +2,7 @@ pox org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/stockquote/client/jax-ws/pom.xml b/samples/stockquote/client/jax-ws/pom.xml index 150c72dd..b282b512 100644 --- a/samples/stockquote/client/jax-ws/pom.xml +++ b/samples/stockquote/client/jax-ws/pom.xml @@ -3,7 +3,7 @@ stockquote-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/stockquote/client/pom.xml b/samples/stockquote/client/pom.xml index d4c669a8..5c4a8839 100644 --- a/samples/stockquote/client/pom.xml +++ b/samples/stockquote/client/pom.xml @@ -3,7 +3,7 @@ stockquote org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/stockquote/client/spring-ws/pom.xml b/samples/stockquote/client/spring-ws/pom.xml index 8cacc54e..88a47142 100644 --- a/samples/stockquote/client/spring-ws/pom.xml +++ b/samples/stockquote/client/spring-ws/pom.xml @@ -3,7 +3,7 @@ stockquote-client org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/stockquote/pom.xml b/samples/stockquote/pom.xml index cd8b2cc1..d34eb143 100644 --- a/samples/stockquote/pom.xml +++ b/samples/stockquote/pom.xml @@ -3,7 +3,7 @@ spring-ws-samples org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/stockquote/server/pom.xml b/samples/stockquote/server/pom.xml index 6243a0e6..68d9f179 100644 --- a/samples/stockquote/server/pom.xml +++ b/samples/stockquote/server/pom.xml @@ -2,7 +2,7 @@ stockquote org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../pom.xml 4.0.0 diff --git a/samples/tutorial/pom.xml b/samples/tutorial/pom.xml index 3bd6ce0d..a569b7ce 100644 --- a/samples/tutorial/pom.xml +++ b/samples/tutorial/pom.xml @@ -3,7 +3,7 @@ spring-ws-samples org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../samples/pom.xml 4.0.0 diff --git a/security/pom.xml b/security/pom.xml index 510f404b..36996db6 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -2,7 +2,7 @@ spring-ws-parent org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/support/pom.xml b/support/pom.xml index 9800bd38..ed4852db 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -2,7 +2,7 @@ spring-ws-parent org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/test/pom.xml b/test/pom.xml index 5ab64ce4..9202457d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -2,7 +2,7 @@ spring-ws-parent org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/xml/pom.xml b/xml/pom.xml index ce0a3889..26391921 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -2,7 +2,7 @@ spring-ws-parent org.springframework.ws - 2.0.3.RELEASE-SNAPSHOT + 2.0.2.RELEASE-SNAPSHOT ../parent/pom.xml 4.0.0