diff --git a/spring-binding/.classpath b/spring-binding/.classpath index 228823ca..f3d21d22 100644 --- a/spring-binding/.classpath +++ b/spring-binding/.classpath @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml index 4bc806a7..9869db48 100644 --- a/spring-binding/ivy.xml +++ b/spring-binding/ivy.xml @@ -23,10 +23,10 @@ - - - - + + + + diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml index e03739dd..6ffd84fc 100644 --- a/spring-binding/pom.xml +++ b/spring-binding/pom.xml @@ -59,6 +59,6 @@ - 3.0.2.RELEASE + 3.0.3.RELEASE diff --git a/spring-binding/template.mf b/spring-binding/template.mf index 2bb3b285..fc25dee4 100644 --- a/spring-binding/template.mf +++ b/spring-binding/template.mf @@ -6,7 +6,7 @@ Import-Package: ognl;version="[2.6.9, 3.0.0)";resolution:=optional, org.jboss.el;version="[2.0.0, 3.0.0)";resolution:=optional Import-Template: - org.springframework.*;version="[3.0.2.RELEASE, 3.1.0)", + org.springframework.*;version="[3.0.3.RELEASE, 3.1.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)", javax.el;version="[1.0.0, 2.0.0)";resolution:=optional, ognl;version="[2.6.9, 3.0.0)";resolution:=optional, diff --git a/spring-faces/.classpath b/spring-faces/.classpath index 35488b00..271552c4 100644 --- a/spring-faces/.classpath +++ b/spring-faces/.classpath @@ -22,12 +22,12 @@ - - - - - - - + + + + + + + diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml index 7bd85e15..adcdca12 100644 --- a/spring-faces/ivy.xml +++ b/spring-faces/ivy.xml @@ -31,12 +31,12 @@ - - - - - - + + + + + + @@ -77,7 +77,7 @@ - + diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml index e29b4659..0a63c496 100644 --- a/spring-faces/pom.xml +++ b/spring-faces/pom.xml @@ -113,6 +113,6 @@ - 3.0.2.RELEASE + 3.0.3.RELEASE diff --git a/spring-faces/template.mf b/spring-faces/template.mf index 0ba14caa..b46a25ae 100644 --- a/spring-faces/template.mf +++ b/spring-faces/template.mf @@ -8,7 +8,7 @@ Import-Template: org.springframework.binding.*;version="[2.1.0, 2.1.1)", org.springframework.js.*;version="[2.1.0, 2.1.1)", org.springframework.webflow.*;version="[2.1.0, 2.1.1)", - org.springframework.*;version="[3.0.2.RELEASE, 3.1.0)", + org.springframework.*;version="[3.0.3.RELEASE, 3.1.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)", javax.el;version="[1.0.0, 2.0.0)", javax.servlet;version="[2.4.0, 3.0.0)", diff --git a/spring-js/.classpath b/spring-js/.classpath index 997b014a..4f57846a 100644 --- a/spring-js/.classpath +++ b/spring-js/.classpath @@ -14,14 +14,14 @@ - - - - - - - - + + + + + + + + diff --git a/spring-js/ivy.xml b/spring-js/ivy.xml index 664a8ac4..466d04bb 100644 --- a/spring-js/ivy.xml +++ b/spring-js/ivy.xml @@ -26,17 +26,17 @@ - - - - - + + + + + - + diff --git a/spring-js/pom.xml b/spring-js/pom.xml index 8ea3b25e..667a4b87 100644 --- a/spring-js/pom.xml +++ b/spring-js/pom.xml @@ -71,6 +71,6 @@ - 3.0.2.RELEASE + 3.0.3.RELEASE diff --git a/spring-js/src/test/java/org/springframework/js/ajax/tiles2/AjaxTilesViewTests.java b/spring-js/src/test/java/org/springframework/js/ajax/tiles2/AjaxTilesViewTests.java index 19789c60..7f7df721 100644 --- a/spring-js/src/test/java/org/springframework/js/ajax/tiles2/AjaxTilesViewTests.java +++ b/spring-js/src/test/java/org/springframework/js/ajax/tiles2/AjaxTilesViewTests.java @@ -1,8 +1,6 @@ package org.springframework.js.ajax.tiles2; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import junit.framework.TestCase; @@ -28,14 +26,14 @@ public class AjaxTilesViewTests extends TestCase { private AjaxTilesView ajaxTilesView; private MockHttpServletRequest request; - private MultipleIncludeUrlMockHttpServletResponse response; + private MockHttpServletResponse response; private MockServletContext servletContext; protected void setUp() throws Exception { servletContext = new MockServletContext("/org/springframework/js/ajax/tiles2/"); request = new MockHttpServletRequest(servletContext); - response = new MultipleIncludeUrlMockHttpServletResponse(); + response = new MockHttpServletResponse(); TilesConfigurer tc = new TilesConfigurer(); tc.setDefinitions(new String[] { "tiles-definitions.xml" }); @@ -151,17 +149,4 @@ public class AjaxTilesViewTests extends TestCase { assertEquals("f3", fragments[2]); } - // Remove this class when no longer needed (http://jira.springframework.org/browse/SPR-7188) - private class MultipleIncludeUrlMockHttpServletResponse extends MockHttpServletResponse { - List includedUrls = new ArrayList(); - - public void setIncludedUrl(String includedUrl) { - super.setIncludedUrl(includedUrl); - includedUrls.add(includedUrl); - } - - public List getIncludedUrls() { - return includedUrls; - } - } } diff --git a/spring-js/template.mf b/spring-js/template.mf index 2f3a77c6..f7b9abdc 100644 --- a/spring-js/template.mf +++ b/spring-js/template.mf @@ -3,7 +3,7 @@ Bundle-Name: Spring JS Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: - org.springframework.*;version="[3.0.2.RELEASE, 3.1.0)", + org.springframework.*;version="[3.0.3.RELEASE, 3.1.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)", javax.servlet;version="[2.4.0, 3.0.0)", javax.servlet.http;version="[2.4.0, 3.0.0)", diff --git a/spring-webflow-samples/booking-faces/ivy.xml b/spring-webflow-samples/booking-faces/ivy.xml index 8b86c340..a0e44e20 100755 --- a/spring-webflow-samples/booking-faces/ivy.xml +++ b/spring-webflow-samples/booking-faces/ivy.xml @@ -32,16 +32,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -65,7 +65,7 @@ - + diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml index 23f0f035..b8686dbc 100644 --- a/spring-webflow-samples/booking-faces/pom.xml +++ b/spring-webflow-samples/booking-faces/pom.xml @@ -211,6 +211,6 @@ - 3.0.2.RELEASE + 3.0.3.RELEASE diff --git a/spring-webflow-samples/booking-mvc/ivy.xml b/spring-webflow-samples/booking-mvc/ivy.xml index 3be23c88..37c2bf5f 100755 --- a/spring-webflow-samples/booking-mvc/ivy.xml +++ b/spring-webflow-samples/booking-mvc/ivy.xml @@ -37,17 +37,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -57,7 +57,7 @@ - + diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml index 1db82fb7..c2cc491b 100644 --- a/spring-webflow-samples/booking-mvc/pom.xml +++ b/spring-webflow-samples/booking-mvc/pom.xml @@ -221,6 +221,6 @@ - 3.0.2.RELEASE + 3.0.3.RELEASE diff --git a/spring-webflow-samples/booking-portlet-faces/ivy.xml b/spring-webflow-samples/booking-portlet-faces/ivy.xml index 8b79bc56..eef671ee 100644 --- a/spring-webflow-samples/booking-portlet-faces/ivy.xml +++ b/spring-webflow-samples/booking-portlet-faces/ivy.xml @@ -34,17 +34,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -52,7 +52,7 @@ - + diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml index b9fee1e2..1f99aed6 100644 --- a/spring-webflow-samples/booking-portlet-faces/pom.xml +++ b/spring-webflow-samples/booking-portlet-faces/pom.xml @@ -206,7 +206,7 @@ - 3.0.2.RELEASE + 3.0.3.RELEASE 1.2.0.09 diff --git a/spring-webflow-samples/booking-portlet-mvc/ivy.xml b/spring-webflow-samples/booking-portlet-mvc/ivy.xml index caa751cd..4d673e17 100644 --- a/spring-webflow-samples/booking-portlet-mvc/ivy.xml +++ b/spring-webflow-samples/booking-portlet-mvc/ivy.xml @@ -34,23 +34,23 @@ - - - - - - - - - - - + + + + + + + + + + + - + diff --git a/spring-webflow-samples/booking-portlet-mvc/pom.xml b/spring-webflow-samples/booking-portlet-mvc/pom.xml index 5d9ae567..ed71536d 100644 --- a/spring-webflow-samples/booking-portlet-mvc/pom.xml +++ b/spring-webflow-samples/booking-portlet-mvc/pom.xml @@ -173,6 +173,6 @@ - 3.0.2.RELEASE + 3.0.3.RELEASE diff --git a/spring-webflow-samples/jsf-booking/ivy.xml b/spring-webflow-samples/jsf-booking/ivy.xml index a3a9baaa..ce4535ae 100644 --- a/spring-webflow-samples/jsf-booking/ivy.xml +++ b/spring-webflow-samples/jsf-booking/ivy.xml @@ -34,19 +34,19 @@ - - - - - - - - - + + + + + + + + + - + diff --git a/spring-webflow-samples/jsf-booking/pom.xml b/spring-webflow-samples/jsf-booking/pom.xml index d64c04f8..f4be47c4 100644 --- a/spring-webflow-samples/jsf-booking/pom.xml +++ b/spring-webflow-samples/jsf-booking/pom.xml @@ -165,6 +165,6 @@ - 3.0.2.RELEASE + 3.0.3.RELEASE diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath index f4dab87b..cb07d0f8 100644 --- a/spring-webflow/.classpath +++ b/spring-webflow/.classpath @@ -34,18 +34,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml index b5df4b8e..bee40d50 100644 --- a/spring-webflow/ivy.xml +++ b/spring-webflow/ivy.xml @@ -30,15 +30,15 @@ - - - - - - - - - + + + + + + + + + @@ -52,9 +52,9 @@ - - - + + + diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml index 3aa12857..42721a5d 100644 --- a/spring-webflow/pom.xml +++ b/spring-webflow/pom.xml @@ -139,6 +139,6 @@ - 3.0.2.RELEASE + 3.0.3.RELEASE diff --git a/spring-webflow/template.mf b/spring-webflow/template.mf index 47032375..b9b441cd 100644 --- a/spring-webflow/template.mf +++ b/spring-webflow/template.mf @@ -5,10 +5,10 @@ Bundle-ManifestVersion: 2 Import-Template: org.springframework.binding.*;version="[2.1.0, 2.1.1)", org.springframework.js.*;version="[2.1.0, 2.1.1)", - org.springframework.*;version="[3.0.2.RELEASE, 3.1.0)", - org.springframework.orm.*;version="[3.0.2.RELEASE, 3.1.0)";resolution:=optional, - org.springframework.transaction.*;version="[3.0.2.RELEASE, 3.1.0)";resolution:=optional, - org.springframework.web.portlet.*;version="[3.0.2.RELEASE, 3.1.0)";resolution:=optional, + org.springframework.*;version="[3.0.3.RELEASE, 3.1.0)", + org.springframework.orm.*;version="[3.0.3.RELEASE, 3.1.0)";resolution:=optional, + org.springframework.transaction.*;version="[3.0.3.RELEASE, 3.1.0)";resolution:=optional, + org.springframework.web.portlet.*;version="[3.0.3.RELEASE, 3.1.0)";resolution:=optional, org.springframework.security.*;version="[3.0.0, 4.0.0)";resolution:=optional, org.apache.commons.logging;version="[1.1.1, 2.0.0)", javax.servlet;version="[2.4.0, 3.0.0)",