upgrade to spring-3.2.0.RELEASE
git-svn-id: https://svn.apache.org/repos/asf/tiles/request/trunk@1484506 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index a723b6d..06160e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.2.0.RC2</version>
+ <version>3.2.0.RELEASE</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/tiles-request-portlet-wildcard/pom.xml b/tiles-request-portlet-wildcard/pom.xml
index b629211..d75a205 100644
--- a/tiles-request-portlet-wildcard/pom.xml
+++ b/tiles-request-portlet-wildcard/pom.xml
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc-portlet</artifactId>
- <version>3.2.0.RC2</version>
+ <version>3.2.0.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
diff --git a/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java b/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
index 1bf84f5..c2aa148 100644
--- a/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
+++ b/tiles-request-portlet-wildcard/src/test/java/org/apache/tiles/request/portlet/wildcard/WildcardPortletApplicationContextTest.java
@@ -102,13 +102,13 @@
.anyTimes();
File dir = new File(".");
EasyMock.expect(portletContext.getResource("/WEB-INF/")).andReturn(
- dir.toURI().toURL());
+ dir.toURI().toURL()).anyTimes();
URL pomUrl = new URL("file://tiles/pom.xml");
EasyMock.expect(portletContext.getResource("/WEB-INF/pom.xml"))
- .andReturn(pomUrl);
+ .andReturn(pomUrl).anyTimes();
Set<String> elementSet = new HashSet<String>();
elementSet.add("/WEB-INF/pom.xml");
- EasyMock.expect(portletContext.getResourcePaths("/WEB-INF/")).andReturn(elementSet);
+ EasyMock.expect(portletContext.getResourcePaths("/WEB-INF/")).andReturn(elementSet).anyTimes();
EasyMock.replay(portletContext);
assertEquals(new URLApplicationResource(u.toExternalForm(), u), context.getResource("/" + url));
diff --git a/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java b/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java
index 1b4cd77..f0d6abc 100644
--- a/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java
+++ b/tiles-request-servlet-wildcard/src/test/java/org/apache/tiles/request/servlet/wildcard/WildcardServletApplicationContextTest.java
@@ -97,13 +97,13 @@
.anyTimes();
File dir = new File(".");
EasyMock.expect(servletContext.getResource("/WEB-INF/")).andReturn(
- dir.toURI().toURL());
+ dir.toURI().toURL()).anyTimes();
URL pomUrl = new URL("file://tiles/pom.xml");
EasyMock.expect(servletContext.getResource("/WEB-INF/pom.xml"))
- .andReturn(pomUrl);
+ .andReturn(pomUrl).anyTimes();
Set<String> elementSet = new HashSet<String>();
elementSet.add("/WEB-INF/pom.xml");
- EasyMock.expect(servletContext.getResourcePaths("/WEB-INF/")).andReturn(elementSet);
+ EasyMock.expect(servletContext.getResourcePaths("/WEB-INF/")).andReturn(elementSet).anyTimes();
EasyMock.replay(servletContext);
assertEquals(new URLApplicationResource(u.toExternalForm(), u), context.getResource(url));