diff --git a/build.properties b/build.properties index 065ca8012971..a60c29a93a55 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ -version=3.1.3 +version=3.1.4 natural.name=spring-framework project.name=Spring Framework @@ -17,16 +17,16 @@ spring.osgi.range="${spring.osgi.range.nq}" aj.osgi.range="[1.6.8, 2.0.0)" ## For GA releases -#release.type=release -#build.stamp=RELEASE +release.type=release +build.stamp=RELEASE ## For milestone releases #release.type=milestone #build.stamp=M1 ## For trunk development / ci builds -release.type=integration -build.stamp=BUILD-SNAPSHOT +#release.type=integration +#build.stamp=BUILD-SNAPSHOT #bundlor fail.on.warnings=false diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml index 541d98469016..eee2d6fe06cd 100644 --- a/org.springframework.aop/pom.xml +++ b/org.springframework.aop/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-aop jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml index ac666e92c85a..6251a5582426 100644 --- a/org.springframework.asm/pom.xml +++ b/org.springframework.asm/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-asm jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml index 44c636702014..d054eacf9196 100644 --- a/org.springframework.aspects/pom.xml +++ b/org.springframework.aspects/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-aspects jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml index 8606a8c6bd0b..b78e0834753c 100644 --- a/org.springframework.beans/pom.xml +++ b/org.springframework.beans/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-beans jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml index d774432ad285..07a82a53ca0b 100644 --- a/org.springframework.context.support/pom.xml +++ b/org.springframework.context.support/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-context-support jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml index 6f3fe20b63f9..2bd5f3475176 100644 --- a/org.springframework.context/pom.xml +++ b/org.springframework.context/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-context jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml index 1634c1f6e169..b70656448493 100644 --- a/org.springframework.core/pom.xml +++ b/org.springframework.core/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-core jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml index 1c3895b1acdc..2016dd98d86a 100644 --- a/org.springframework.expression/pom.xml +++ b/org.springframework.expression/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-expression jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.instrument.tomcat/pom.xml b/org.springframework.instrument.tomcat/pom.xml index 2cd05ea446cc..6b8ba459371a 100644 --- a/org.springframework.instrument.tomcat/pom.xml +++ b/org.springframework.instrument.tomcat/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-instrument-tomcat jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml index ec8ede6ea0d2..eaa38791a5d2 100644 --- a/org.springframework.instrument/pom.xml +++ b/org.springframework.instrument/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-instrument jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml index ba80d869113a..b138a4dfc888 100644 --- a/org.springframework.integration-tests/pom.xml +++ b/org.springframework.integration-tests/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-integration-tests jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml index 9250106059a1..e7a391fe8fcb 100644 --- a/org.springframework.jdbc/pom.xml +++ b/org.springframework.jdbc/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-jdbc jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml index 04cdf2676c1d..1171baecf94c 100644 --- a/org.springframework.jms/pom.xml +++ b/org.springframework.jms/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-jms jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml index ba4f2ba74ba6..5cdd260af1f3 100644 --- a/org.springframework.orm/pom.xml +++ b/org.springframework.orm/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-orm jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml index 4d994c957e46..54fa6c056422 100644 --- a/org.springframework.oxm/pom.xml +++ b/org.springframework.oxm/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-oxm jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.spring-library/pom.xml b/org.springframework.spring-library/pom.xml index 787ff60a75b2..66d3815aab42 100644 --- a/org.springframework.spring-library/pom.xml +++ b/org.springframework.spring-library/pom.xml @@ -6,7 +6,7 @@ org.springframework spring-library libd - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE Spring Framework Spring is a layered Java/J2EE application platform, based on code published in Expert One-on-One J2EE Design and Development by Rod Johnson (Wrox, 2002). diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml index 6fdf603f25e8..2b37dcfb40b5 100644 --- a/org.springframework.spring-parent/pom.xml +++ b/org.springframework.spring-parent/pom.xml @@ -6,7 +6,7 @@ spring-parent pom Spring Framework - Parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE Spring Framework Parent https://fisheye.springframework.org/browse/spring-framework diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml index d85d6b8b9f5d..ac6ff32b39dc 100644 --- a/org.springframework.test/pom.xml +++ b/org.springframework.test/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-test jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml index 49adabd2bbee..56ef4702c5af 100644 --- a/org.springframework.transaction/pom.xml +++ b/org.springframework.transaction/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-tx jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml index 7539a1342c4e..b27bcccd9bfb 100644 --- a/org.springframework.web.portlet/pom.xml +++ b/org.springframework.web.portlet/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-webmvc-portlet jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml index 4b8d103cd629..29cd91eccda1 100644 --- a/org.springframework.web.servlet/pom.xml +++ b/org.springframework.web.servlet/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-webmvc jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.web.struts/pom.xml b/org.springframework.web.struts/pom.xml index 21b51da79d9b..a61bcacec437 100644 --- a/org.springframework.web.struts/pom.xml +++ b/org.springframework.web.struts/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-struts jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml index 9bad9d273b77..7c21585961f1 100644 --- a/org.springframework.web/pom.xml +++ b/org.springframework.web/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-web jar - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE org.springframework spring-parent ../org.springframework.spring-parent - 3.1.4.BUILD-SNAPSHOT + 3.1.4.RELEASE