diff --git a/build.properties b/build.properties index 5f7d08a8dca..4f3d372542d 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ -version=3.1.0 +version=3.1.1 natural.name=spring-framework project.name=Spring Framework @@ -17,13 +17,13 @@ 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 diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml index d21357bb2ff..8a3a9085575 100644 --- a/org.springframework.aop/pom.xml +++ b/org.springframework.aop/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-aop jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml index 789e6ef3dae..3b089c93ba7 100644 --- a/org.springframework.asm/pom.xml +++ b/org.springframework.asm/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-asm jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml index 5feff8a29d0..423cbe54a07 100644 --- a/org.springframework.aspects/pom.xml +++ b/org.springframework.aspects/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-aspects jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml index 664a729e864..56992da524e 100644 --- a/org.springframework.beans/pom.xml +++ b/org.springframework.beans/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-beans jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml index 5017fbf1732..f364d5c1c14 100644 --- a/org.springframework.context.support/pom.xml +++ b/org.springframework.context.support/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-context-support jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml index 3d77ff69fc8..a51e768ea14 100644 --- a/org.springframework.context/pom.xml +++ b/org.springframework.context/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-context jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml index 85f51005548..0fd00579f62 100644 --- a/org.springframework.core/pom.xml +++ b/org.springframework.core/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-core jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml index 67a3902ae6b..b3795a6414e 100644 --- a/org.springframework.expression/pom.xml +++ b/org.springframework.expression/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-expression jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.instrument.tomcat/pom.xml b/org.springframework.instrument.tomcat/pom.xml index 113421d663a..93594d1b56e 100644 --- a/org.springframework.instrument.tomcat/pom.xml +++ b/org.springframework.instrument.tomcat/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-instrument-tomcat jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml index 0069efc1a56..d66b844c735 100644 --- a/org.springframework.instrument/pom.xml +++ b/org.springframework.instrument/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-instrument jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml index 5eff89a392e..be0ee6b8aa9 100644 --- a/org.springframework.integration-tests/pom.xml +++ b/org.springframework.integration-tests/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-integration-tests jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml index 9a7b1b3917d..dcf8f1c2c76 100644 --- a/org.springframework.jdbc/pom.xml +++ b/org.springframework.jdbc/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-jdbc jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml index fccb1e4be6d..244442bb470 100644 --- a/org.springframework.jms/pom.xml +++ b/org.springframework.jms/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-jms jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml index b9afd4b7022..2916ab021c9 100644 --- a/org.springframework.orm/pom.xml +++ b/org.springframework.orm/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-orm jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml index 2217326212d..a52d5f383b4 100644 --- a/org.springframework.oxm/pom.xml +++ b/org.springframework.oxm/pom.xml @@ -6,12 +6,12 @@ org.springframework spring-oxm jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.spring-library/pom.xml b/org.springframework.spring-library/pom.xml index 67d84b46b7b..cae43e3ca2c 100644 --- a/org.springframework.spring-library/pom.xml +++ b/org.springframework.spring-library/pom.xml @@ -14,7 +14,7 @@ org.springframework spring-library libd - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT 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 2d8a567c2f7..1956c7d96c0 100644 --- a/org.springframework.spring-parent/pom.xml +++ b/org.springframework.spring-parent/pom.xml @@ -14,7 +14,7 @@ spring-parent pom Spring Framework - Parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT 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 628227cc639..85b279cf149 100644 --- a/org.springframework.test/pom.xml +++ b/org.springframework.test/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-test jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml index a425a3d58ed..c043933a5c0 100644 --- a/org.springframework.transaction/pom.xml +++ b/org.springframework.transaction/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-tx jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml index 8375d335ceb..a29673296bf 100644 --- a/org.springframework.web.portlet/pom.xml +++ b/org.springframework.web.portlet/pom.xml @@ -4,12 +4,12 @@ org.springframework spring-webmvc-portlet jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml index 5d73ea5fe0f..c528170f82f 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.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.web.struts/pom.xml b/org.springframework.web.struts/pom.xml index ef83df0bf23..08c8d04d141 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.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml index 40a18e0b6d6..834b5edb01d 100644 --- a/org.springframework.web/pom.xml +++ b/org.springframework.web/pom.xml @@ -5,12 +5,12 @@ org.springframework spring-web jar - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT org.springframework spring-parent ../org.springframework.spring-parent - 3.1.0.RELEASE + 3.1.1.BUILD-SNAPSHOT