Author: drobiazko
Date: Thu Dec 15 10:28:33 2011
New Revision: 1214689
URL: http://svn.apache.org/viewvc?rev=1214689&view=rev
Log:
TAP5-1792: Upgrade Tapestry/Spring integration to Spring 3.1.0.RELEASE
(5.3-branch backport)
Modified:
tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle
tapestry/tapestry5/branches/5.3/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
Modified: tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle?rev=1214689&r1=1214688&r2=1214689&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-spring/build.gradle Thu Dec 15
10:28:33 2011
@@ -2,7 +2,7 @@ description = "Integration of Tapestry w
dependencies {
compile project(':tapestry-core')
- compile "org.springframework:spring-web:3.0.0.RELEASE"
+ compile "org.springframework:spring-web:3.1.0.RELEASE"
provided "javax.servlet:servlet-api:$servletAPIVersion"
Modified:
tapestry/tapestry5/branches/5.3/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java?rev=1214689&r1=1214688&r2=1214689&view=diff
==============================================================================
---
tapestry/tapestry5/branches/5.3/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
(original)
+++
tapestry/tapestry5/branches/5.3/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
Thu Dec 15 10:28:33 2011
@@ -49,7 +49,7 @@ public class TapestrySpringIntegrationTe
{
open(BASE_URL);
- assertText("message", "SPRING VERSION 3.0.0.RELEASE: PIPELINE WAS
INVOKED");
+ assertText("message", "SPRING VERSION 3.1.0.RELEASE: PIPELINE WAS
INVOKED");
}
@Test