From 81430074ab0fcced2376497c88ebccc2974270ab Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Mon, 7 Apr 2008 17:21:04 +0000 Subject: [PATCH] Backported changes for 1.0.4 release (11678:11702) --- .../main/resources/archetype-resources/pom.xml | 4 ++-- pom.xml | 1 + readme.txt | 16 ++++++++-------- samples/airline/client/spring-ws/build.xml | 2 +- samples/echo/client/spring-ws/build.xml | 2 +- src/docbkx/tutorial.xml | 4 ++-- src/site/apt/downloads/releases.apt | 6 +++--- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml index 039c25f1..6f9492d9 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.0.3 + 1.0.4 org.springframework.ws spring-ws-core - 1.0.3 + 1.0.4 diff --git a/pom.xml b/pom.xml index 75c5b210..55c52dc0 100644 --- a/pom.xml +++ b/pom.xml @@ -172,6 +172,7 @@ maven-assembly-plugin + 2.2-beta-1 src/assembly/minimal.xml diff --git a/readme.txt b/readme.txt index e8d8a7bb..54749992 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -SPRING WEB SERVICES 1.0.3 (December 2007) +SPRING WEB SERVICES 1.0.4 (March 2008) ------------------------------- http://www.springframework.org/spring-ws http://forum.springframework.org/forumdisplay.php?f=39 @@ -14,7 +14,7 @@ XMLBeans, Castor, JiBX and XStream; and a Web service framework that resembles S 2. RELEASE INFO -Spring-WS requires J2SE 1.4 and J2EE 1.4. J2SE 1.5 is required for building. J2SE 1.6 is not yet supported. +Spring-WS requires J2SE 1.3 and J2EE 1.4. J2SE 1.5 is required for building. J2SE 1.6 is supported in version 1.5.0 and higher. Release contents: @@ -37,30 +37,30 @@ 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-oxm-1.0.3.jar +* spring-oxm-1.0.4.jar - Contents: The Spring Object/XML Mapping framework - Dependencies: Commons Logging, spring-beans, spring-core [Log4J, JAXB 1, Castor, XMLBeans, StAX, JiBX, XStream] -* spring-oxm-tiger-1.0.3.jar +* spring-oxm-tiger-1.0.4.jar - Contents: The Spring Object/XML Mapping framework for Java 5 - Dependencies: Commons Logging, spring-beans, spring-core, JAXB 2 -* spring-ws-core-1.0.3.jar +* spring-ws-core-1.0.4.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] -* spring-ws-core-tiger-1.0.3.jar +* spring-ws-core-tiger-1.0.4.jar - Contents: The Spring-WS Core for Java 5 - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-core -* spring-ws-security-1.0.3.jar +* spring-ws-security-1.0.4.jar - Contents: Spring-WS Security integration - Dependencies: Commons Logging, spring-beans, spring-core, spring-context, spring-ws-core [Log4J, xmlsdig, xmlsec, XWS-security, Acegi] -* spring-xml-1.0.3.jar +* spring-xml-1.0.4.jar - Contents: Spring XML utility framework - Dependencies: Commons Logging, spring-beans, spring-core [StAX, Xalan, Jaxen] diff --git a/samples/airline/client/spring-ws/build.xml b/samples/airline/client/spring-ws/build.xml index 430a3f29..c16a81fb 100644 --- a/samples/airline/client/spring-ws/build.xml +++ b/samples/airline/client/spring-ws/build.xml @@ -14,7 +14,7 @@ - + diff --git a/samples/echo/client/spring-ws/build.xml b/samples/echo/client/spring-ws/build.xml index 2664cf6a..cbea06a8 100644 --- a/samples/echo/client/spring-ws/build.xml +++ b/samples/echo/client/spring-ws/build.xml @@ -12,7 +12,7 @@ - + diff --git a/src/docbkx/tutorial.xml b/src/docbkx/tutorial.xml index 9090ddfd..5b708ee0 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.0.3 \ + -DarchetypeVersion=1.0.4 \ -DgroupId=com.mycompany.hr \ -DartifactId=holidayService @@ -634,7 +634,7 @@ public class HolidayEndpoint extends AbstractJDomPayloadEndpoint { org.springframework.ws spring-ws-core - 1.0.3 + 1.0.4 jdom diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt index 5547755b..5d61628e 100644 --- a/src/site/apt/downloads/releases.apt +++ b/src/site/apt/downloads/releases.apt @@ -6,13 +6,13 @@ Downloads * Get the latest Spring Web Services releases here - * <> + * <> * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=587838}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.5.0/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=51796}Announcement}} - * <> + * <> - * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=563313}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.0.3/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=47787}Announcement}} + * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=178569&release_id=590453}Download}} | {{{http://static.springframework.org/spring-ws/docs/1.0.4/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=52246}Announcement}} * <>