diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml index 00c837ee..8b88fa29 100644 --- a/core-tiger/pom.xml +++ b/core-tiger/pom.xml @@ -1,4 +1,5 @@ - + spring-ws-parent org.springframework.ws @@ -19,16 +20,6 @@ - - - - maven-javadoc-plugin - - ${basedir}/../src/main/javadoc/javadoc.css - - - - diff --git a/core/pom.xml b/core/pom.xml index 6fa5850e..cecfa801 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> spring-ws-parent org.springframework.ws @@ -10,16 +10,6 @@ jar Spring WS Core Spring Web Services Core package. - - - - maven-javadoc-plugin - - ${basedir}/../src/main/javadoc/javadoc.css - - - - spring-2.0 @@ -98,24 +88,6 @@ xom xom true - - - xerces - xmlParserAPIs - - - xerces - xercesImpl - - - xalan - xalan - - - jaxen - jaxen - - stax @@ -134,7 +106,7 @@ org.codehaus.woodstox wstx-asl - test + provided @@ -170,6 +142,10 @@ javax.activation activation + + javax.mail + mail + commons-httpclient diff --git a/full-assembly.sh b/full-assembly.sh deleted file mode 100755 index 436ca996..00000000 --- a/full-assembly.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -mvn -Ddescriptor=src/assembly/full.xml -Dmaven.test.skip=true clean install javadoc:javadoc docbkx:generate-html docbkx:generate-pdf assembly:assembly diff --git a/notice.txt b/notice.txt new file mode 100644 index 00000000..2cd3e112 --- /dev/null +++ b/notice.txt @@ -0,0 +1,21 @@ + ====================================================================== + == NOTICE file corresponding to section 4 d of the Apache License, == + == Version 2.0, in this case for the Spring Framework distribution. == + ====================================================================== + + This product includes software developed by + the Apache Software Foundation (http://www.apache.org). + + The end-user documentation included with a redistribution, if any, + must include the following acknowledgement: + + "This product includes software developed by the Spring Framework + Project (http://www.springframework.org)." + + Alternatively, this acknowledgement may appear in the software itself, + if and wherever such third-party acknowledgements normally appear. + + The names "Spring" and "Spring Framework" must not be used to + endorse or promote products derived from this software without + prior written permission. For written permission, please contact + rod.johnson@interface21.com or juergen.hoeller@interface21.com. diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml index 2c422b89..bd32224d 100644 --- a/oxm-tiger/pom.xml +++ b/oxm-tiger/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> spring-ws-parent org.springframework.ws @@ -41,16 +41,6 @@ - - - - maven-javadoc-plugin - - ${basedir}/../src/main/javadoc/javadoc.css - - - - @@ -100,14 +90,25 @@ javax.xml.bind jaxb-api + provided true 2.1 + + + javax.xml.stream + stax-api + + + javax.activation + activation + + com.sun.xml.bind jaxb-impl 2.1.5 - test + provided com.sun.xml.bind diff --git a/oxm/pom.xml b/oxm/pom.xml index f4c9ce11..42e28aae 100644 --- a/oxm/pom.xml +++ b/oxm/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> spring-ws-parent org.springframework.ws @@ -58,16 +58,6 @@ - - - - maven-javadoc-plugin - - ${basedir}/../src/main/javadoc/javadoc.css - - - - @@ -95,67 +85,17 @@ wstx-asl provided - - xpp3 - xpp3 - test - xerces xercesImpl provided - + + org.codehaus.castor castor true - - - adaptx - adaptx - - - ant - ant - - - cglib - cglib-full - - - com.cenqua.clover - clover - - - oro - oro - - - jakarta-regexp - jakarta-regexp - - - javax.servlet - servlet-api - - - javax.transaction - jta - - - ldapsdk - ldapsdk - - - log4j - log4j - - - xerces - xerces - - @@ -168,13 +108,13 @@ com.sun.xml.bind jaxb-impl 1.0.6 - test + provided com.sun.xml.bind jaxb-libs 1.0.6 - test + provided com.sun.xml.bind @@ -232,8 +172,6 @@ javax.activation activation - 1.1 - true diff --git a/parent/pom.xml b/parent/pom.xml index 36625f6a..6a57ddce 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,11 +41,13 @@ http://download.java.net/maven/1/ legacy - - spring-milestone - Springframework Maven Milestone Repository - http://s3.amazonaws.com/maven.springframework.org/milestone - + @@ -118,6 +120,12 @@ maven-project-info-reports-plugin + + maven-javadoc-plugin + + true + + @@ -261,6 +269,11 @@ test + + xml-apis + xml-apis + 1.3.04 + xerces xercesImpl @@ -280,16 +293,37 @@ jaxen jaxen 1.1.1 - - - xml-apis - xml-apis - 1.3.04 + + + xml-apis + xml-apis + + + dom4j + dom4j + + + jdom + jdom + + + xom + xom + + + xerces + xmlParserAPIs + + + xerces + xercesImpl + + org.codehaus.woodstox wstx-asl - 3.1.0 + 3.2.3 jdom @@ -300,11 +334,35 @@ dom4j dom4j 1.6.1 + + + xml-apis + xml-apis + + xom xom 1.1 + + + xerces + xmlParserAPIs + + + xerces + xercesImpl + + + xalan + xalan + + + jaxen + jaxen + + xpp3 @@ -317,6 +375,52 @@ org.codehaus.castor castor 1.1.1 + + + adaptx + adaptx + + + ant + ant + + + cglib + cglib-full + + + com.cenqua.clover + clover + + + oro + oro + + + jakarta-regexp + jakarta-regexp + + + javax.servlet + servlet-api + + + javax.transaction + jta + + + ldapsdk + ldapsdk + + + log4j + log4j + + + xerces + xerces + + @@ -329,6 +433,12 @@ org.jibx jibx-run 1.1.5 + + + org.codehaus.woodstox + wstx-asl + + org.jibx @@ -351,16 +461,58 @@ com.sun.xml.messaging.saaj saaj-impl 1.3 + + + javax.activation + activation + + org.apache.ws.commons.axiom axiom-api 1.2.5 + + + jaxen + jaxen + + + javax.mail + mail + + + xml-apis + xml-apis + + + org.codehaus.woodstox + wstx-asl + + org.apache.ws.commons.axiom axiom-impl 1.2.5 + + + jaxen + jaxen + + + javax.mail + mail + + + xml-apis + xml-apis + + + org.codehaus.woodstox + wstx-asl + + @@ -373,6 +525,32 @@ com.sun.xml.wss xws-security 2.0-FCS + + + javax.xml.parsers + jaxp-api + + + javax.xml.bind + jaxb-api + + + javax.xml.ws + jaxws-api + + + javax.xml + jaxrpc-api + + + javax.xml.soap + saaj-api + + + javax.mail + mail + + com.sun.org.apache.xml.security @@ -383,6 +561,44 @@ org.acegisecurity acegi-security 1.0.5 + + + log4j + log4j + + + org.springframework + spring-remoting + + + org.springframework + spring-jdbc + + + org.springframework + spring-support + + + commons-lang + commons-lang + + + commons-lang + commons-lang + + + commons-codec + commons-codec + + + commons-collections + commons-collections + + + oro + oro + + org.acegisecurity @@ -395,6 +611,12 @@ saaj-api 1.3 provided + + + javax.activation + activation + + javax.servlet @@ -407,6 +629,12 @@ mail 1.4.1 provided + + + javax.activation + activation + + javax.activation @@ -453,6 +681,24 @@ commons-logging commons-logging 1.1 + + + log4j + log4j + + + logkit + logkit + + + avalon-framework + avalon-framework + + + javax.servlet + servlet-api + + log4j @@ -497,20 +743,6 @@ commons-logging commons-logging - - - logkit - logkit - - - avalon-framework - avalon-framework - - - javax.servlet - servlet-api - - org.springframework diff --git a/pom.xml b/pom.xml index f617c39d..5a2e49db 100644 --- a/pom.xml +++ b/pom.xml @@ -111,21 +111,46 @@ samples + + release + + + + maven-assembly-plugin + false + + + with-dependencies + package + + single + + + + src/assembly/with-dependencies.xml + + + + + + + + - maven-assembly-plugin false - make-all-jar + all-jar package single + false true @@ -140,12 +165,13 @@ - make-minimal-zip + minimal-zip package single + false src/assembly/minimal.xml @@ -230,6 +256,7 @@ true
Spring Web Services Framework
1.5 + true ${basedir}/src/main/javadoc/javadoc.css ${basedir}/src/main/javadoc/overview.html @@ -267,6 +294,16 @@ + + maven-changes-plugin + + + + jira-report + + + + maven-project-info-reports-plugin diff --git a/security/pom.xml b/security/pom.xml index ced85e17..39d0a2e9 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> spring-ws-parent org.springframework.ws @@ -23,16 +23,6 @@ https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/ - - - - maven-javadoc-plugin - - ${basedir}/../src/main/javadoc/javadoc.css - - - - spring-2.0 @@ -100,24 +90,6 @@ com.sun.xml.wss xws-security - - - javax.xml.parsers - jaxp-api - - - javax.xml.bind - jaxb-api - - - javax.xml.ws - jaxws-api - - - javax.xml - jaxrpc-api - - xml-security @@ -127,42 +99,16 @@ org.acegisecurity acegi-security - - - org.springframework - spring-remoting - - - org.springframework - spring-jdbc - - - org.springframework - spring-support - - - commons-lang - commons-lang - - - commons-lang - commons-lang - - - commons-codec - commons-codec - - - commons-collections - commons-collections - - javax.xml.soap saaj-api + + javax.activation + activation + javax.mail mail diff --git a/src/assembly/docs.xml b/src/assembly/docs.xml index 6ab40967..e5e17b58 100644 --- a/src/assembly/docs.xml +++ b/src/assembly/docs.xml @@ -5,6 +5,7 @@ readme.txt license.txt + notice.txt dos diff --git a/src/assembly/minimal.xml b/src/assembly/minimal.xml index 4d754d4e..3016a004 100644 --- a/src/assembly/minimal.xml +++ b/src/assembly/minimal.xml @@ -22,7 +22,14 @@ false false + dist/modules/${artifactId}-${version}.${extension} + + + target/${artifactId}-${version}.jar + dist + + diff --git a/src/assembly/full.xml b/src/assembly/with-dependencies.xml similarity index 68% rename from src/assembly/full.xml rename to src/assembly/with-dependencies.xml index 9af82afe..dd69f89a 100644 --- a/src/assembly/full.xml +++ b/src/assembly/with-dependencies.xml @@ -1,6 +1,5 @@ - - full + with-dependencies zip @@ -11,6 +10,7 @@ + org.springframework.ws:spring-ws-parent org.springframework.ws:spring-xml org.springframework.ws:spring-oxm org.springframework.ws:spring-oxm-tiger @@ -22,9 +22,34 @@ false false + dist/modules/${artifactId}-${version}.${extension} + + + lib/${groupId}/${artifactId}-${version}.${extension} + runtime + + org.springframework.ws:spring-ws-parent + org.springframework.ws:spring-xml + org.springframework.ws:spring-oxm + org.springframework.ws:spring-oxm-tiger + org.springframework.ws:spring-ws-core + org.springframework.ws:spring-ws-core-tiger + + + + lib/${groupId}/${artifactId}-${version}.${extension} + provided + + + + + target/${artifactId}-${version}.jar + dist + + @@ -37,7 +62,7 @@ - modules + dist/module-sources xml/**/* oxm/**/* @@ -90,6 +115,6 @@ **/bin **/bin/** - + diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html index 9afc87e5..b3021202 100644 --- a/src/main/javadoc/overview.html +++ b/src/main/javadoc/overview.html @@ -1,6 +1,6 @@ -This document is the API specification for the Spring REST Framework +This document is the API specification for the Spring WS Framework

diff --git a/support/pom.xml b/support/pom.xml index c043edac..cb3f3781 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -11,16 +11,6 @@ jar Spring WS Support Spring Web Services Support package. - - - - maven-javadoc-plugin - - ${basedir}/../src/main/javadoc/javadoc.css - - - - spring-ext @@ -110,6 +100,10 @@ ejb true + + javax.activation + activation + javax.mail mail diff --git a/with-dependencies.sh b/with-dependencies.sh new file mode 100755 index 00000000..613e51d4 --- /dev/null +++ b/with-dependencies.sh @@ -0,0 +1,2 @@ +#!/bin/sh +mvn -Dmaven.test.skip=true -P release clean javadoc:javadoc docbkx:generate-html docbkx:generate-pdf install diff --git a/xml/pom.xml b/xml/pom.xml index 76b5fe52..52ced941 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -1,4 +1,5 @@ - + spring-ws-parent org.springframework.ws @@ -9,16 +10,6 @@ jar Spring XML Various XML support classes for Spring Web Services - - - - maven-javadoc-plugin - - ${basedir}/../src/main/javadoc/javadoc.css - - - - @@ -45,33 +36,11 @@ jaxen jaxen true - - - dom4j - dom4j - - - jdom - jdom - - - xom - xom - - - xerces - xmlParserAPIs - - - xerces - xercesImpl - - org.codehaus.woodstox wstx-asl - test + provided