diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index 1841c1d9..d4a8edcc 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -15,12 +15,12 @@
org.springframework.ws
spring-oxm
- 1.5.2
+ 1.5.3
org.springframework.ws
spring-ws-core
- 1.5.2
+ 1.5.3
diff --git a/changelog.txt b/changelog.txt
index 9ae1401c..bae298cc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,39 @@ SPRING WEB SERVICES CHANGELOG
=============================
http://www.springframework.org/spring-ws
+Changes in version 1.5.3
+-------------------------
+** Bug
+ * [SWS-357] - Axiom does not support SwA attachments
+ * [SWS-358] - NPE in JmsSenderConnection.onReceiveBeforeRead() when the received Message is null
+ * [SWS-359] - Using Axiom with payload caching off sometimes creates empty soap bodies
+ * [SWS-363] - AcegiPlainTextPasswordValidationCallbackHandler doesn't implement InitializingBean
+ * [SWS-365] - wss4j-1.5.4.jar not in repository
+ * [SWS-366] - Dynamic AOP proxies for @Endpoints result in IllegalArgumentExceptions
+ * [SWS-367] - SOAP over JMS (BEA Weblogic 9.2) - empty body in SOAP responses with a jms TextMessage
+ * [SWS-370] - 'KeyStoreUtils.loadDefaultKeyStore()' issue
+ * [SWS-373] - broken links in FAQ
+ * [SWS-374] - DefaultURIResolver with witespaces
+ * [SWS-376] - SaajSoapMessage.setSaajMessage() and AxiomSoapMessage.setAxiomMessage() should clear cached fields
+ * [SWS-378] - Wss4jSecurityInterceptor.toDocument(..) causes decryption to fail when using SaajSoapMessageFactory
+ * [SWS-380] - Incorrect soap:address location="http://localhost:8080/holidayService/ for samples/tutorial - resource (/holidayService/) is not available
+ * [SWS-385] - Exceptions thrown using WS-Addressing result in Assert failure in Addressing10.addAddressingHeaders
+
+** Improvement
+ * [SWS-273] - AbstractAnnotationMethodEndpointMapping doesn't support proxied bean dependencies
+ * [SWS-361] - XStream.addImplicitCollection not supported by XStreamMarshaller
+ * [SWS-371] - Expose MaxConnectionsPerHost and TotalConnections in CommonsHttpMessageSender
+ * [SWS-377] - Create all-in-one source jar
+ * [SWS-382] - DefaultWsdl11Definition should throw exceptions when given an empty suffix
+ * [SWS-383] - JmsSenderConnection does not correlate response messages on permanent response queues
+
+** New Feature
+ * [SWS-346] - HandlerAdapter for XsdSchemas
+ * [SWS-356] - Document X509 support in Wss4jSecurityInterceptor
+
+** Task
+ * [SWS-369] - Website links broken
+
Changes in version 1.5.2
-------------------------
** Bug
@@ -14,7 +47,6 @@ Changes in version 1.5.2
* [SWS-329] - SaajContentHandler shouldn't repeat namespace declarations
* [SWS-344] - Add @Endpoints support to AbstractEndpointExceptionResolver
-
** Task
* [SWS-354] - Document AbstractValidatingMarshallingPayloadEndpoint and AbstractFaultCreatingValidatingMarshallingPayloadEndpoint
diff --git a/notes.txt b/notes.txt
index ab2937d7..45bc998d 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1,15 +1,15 @@
Dear Spring community,
-I'm pleased to announce that Spring Web Services 1.5.2 has been released!
+I'm pleased to announce that Spring Web Services 1.5.3 has been released!
-This is the second bug fix and enhancement release in the Spring-WS 1.5 series.
-It fixes all bugs reported since 1.5.1 and introduces various enhancements
+This is the third bug fix and enhancement release in the Spring-WS 1.5 series.
+It fixes all bugs reported since 1.5.2 and introduces various enhancements
throughout the framework:
-* Fixed WS-Security signatures when using WSS4J in combination with SAAJ
- messages (for real this time ;) )
-* Drastically improved performance of writing to Axiom Message payloads
+* Support for receiving SOAP messages on permanent JMS queues, and various
+ other JMS transport bug fixes
+* Support for Soap with Attachments using Axiom
-and more. Please see the changelog for details.
+and more, including more documentation. Please see the changelog for details.
-For more information, see http://static.springframework.org/spring-ws/site/
\ No newline at end of file
+For more information, see http://static.springframework.org/spring-ws/site/
diff --git a/pom.xml b/pom.xml
index a266bf04..0dc95d1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -497,7 +497,7 @@
maven-assembly-plugin
- 2.2-beta-1
+ 2.2-beta-2
false
diff --git a/samples/airline/client/jms/build.xml b/samples/airline/client/jms/build.xml
index a25fe4e0..c1724c34 100644
--- a/samples/airline/client/jms/build.xml
+++ b/samples/airline/client/jms/build.xml
@@ -23,7 +23,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml
index 7dac3ced..64d6d668 100644
--- a/samples/airline/client/spring-ws/build.xml
+++ b/samples/airline/client/spring-ws/build.xml
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml
index 60fe7bc4..f662a30c 100644
--- a/samples/echo/client/spring-ws/build.xml
+++ b/samples/echo/client/spring-ws/build.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/samples/pox/client/spring-ws/build.xml b/samples/pox/client/spring-ws/build.xml
index e1789e12..969243c8 100644
--- a/samples/pox/client/spring-ws/build.xml
+++ b/samples/pox/client/spring-ws/build.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/samples/stockquote/client/spring-ws/build.xml b/samples/stockquote/client/spring-ws/build.xml
index 95e968af..783746a0 100644
--- a/samples/stockquote/client/spring-ws/build.xml
+++ b/samples/stockquote/client/spring-ws/build.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index 41d321ba..79715205 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -3,7 +3,7 @@
spring-ws-parent
org.springframework.ws
- 1.5.2
+ 1.5.3
4.0.0
spring-ws-sandbox
diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml
index 2483fb86..c7605039 100644
--- a/src/assembly/with-dependencies.xml
+++ b/src/assembly/with-dependencies.xml
@@ -83,7 +83,7 @@
mtom/**/spring-ws-logo.png
maven-ant-tasks-*.jar
**/ant-dotnet-*.jar
- **/*.exe
+ **/*.exe
airline/activemq-data
diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml
index 2efa4108..be913bea 100644
--- a/src/docbkx/tutorial.xml
+++ b/src/docbkx/tutorial.xml
@@ -474,7 +474,7 @@
mvn archetype:create -DarchetypeGroupId=org.springframework.ws \
-DarchetypeArtifactId=spring-ws-archetype \
- -DarchetypeVersion=1.5.2 \
+ -DarchetypeVersion=1.5.3 \
-DgroupId=com.mycompany.hr \
-DartifactId=holidayService
@@ -634,7 +634,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint {
org.springframework.ws
spring-ws-core
- 1.5.2
+ 1.5.3
jdom
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
index 67987a20..b2c8e3f9 100644
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -6,9 +6,9 @@ Downloads
* Get the latest Spring Web Services releases here
- * <>
+ * <>
- * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=600343}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.2/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=54476}Announcement}}
+ * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=611368}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.3/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=56915}Announcement}}
* <>
diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt
index 644a817f..9c47c1e9 100644
--- a/src/site/apt/downloads/snapshots.apt
+++ b/src/site/apt/downloads/snapshots.apt
@@ -23,7 +23,7 @@ Snapshot Builds
org.springframework.ws
spring-ws-core
- 1.5.3-SNAPSHOT
+ 1.5.4-SNAPSHOT
+---------------