You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2020/12/08 02:43:35 UTC

[tapestry-5] branch master updated: TAP5-2653: Upgrade tapestry-spring's spring-web version to 3.2.9

This is an automated email from the ASF dual-hosted git repository.

thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git


The following commit(s) were added to refs/heads/master by this push:
     new 0a68141  TAP5-2653: Upgrade tapestry-spring's spring-web version to 3.2.9
0a68141 is described below

commit 0a681418169171ce93f87f102f70c8960f523f9d
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Mon Dec 7 23:43:16 2020 -0300

    TAP5-2653: Upgrade tapestry-spring's spring-web version to 3.2.9
---
 tapestry-spring/build.gradle                             | 16 +++++++++++++++-
 .../standard/TapestrySpringIntegrationTest.java          |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/tapestry-spring/build.gradle b/tapestry-spring/build.gradle
index 6f56966..42ac6f2 100644
--- a/tapestry-spring/build.gradle
+++ b/tapestry-spring/build.gradle
@@ -2,7 +2,7 @@ description = "Integration of Tapestry with the Spring Inversion Of Control Cont
 
 dependencies {
   compile project(':tapestry-core')
-  compile "org.springframework:spring-web:3.1.0.RELEASE"
+  compile "org.springframework:spring-web:3.2.9.RELEASE"
 
   provided "javax.servlet:javax.servlet-api:${versions.servletapi}"
 
@@ -13,4 +13,18 @@ jar {
     manifest {
         attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.spring.modules.SpringModule'
     }
+}
+
+task runTestApp(type:JavaExec) {
+    description 'Start tapestry-spring integration test app, useful when debugging failing integration tests'
+    main = 'org.apache.tapestry5.test.JettyRunner'
+    args "-d", "src/test/webapp", "-p", "8080"
+    classpath += project.sourceSets.test.runtimeClasspath
+}
+
+task runTestApp1(type:JavaExec) {
+    description 'Start tapestry-spring integration test app 1, useful when debugging failing integration tests'
+    main = 'org.apache.tapestry5.test.JettyRunner'
+    args "-d", "src/test/webapp1", "-p", "8080"
+    classpath += project.sourceSets.test.runtimeClasspath
 }
\ No newline at end of file
diff --git a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/integration/standard/TapestrySpringIntegrationTest.java b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/integration/standard/TapestrySpringIntegrationTest.java
index 64a341c..9d025e1 100644
--- a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/integration/standard/TapestrySpringIntegrationTest.java
+++ b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/integration/standard/TapestrySpringIntegrationTest.java
@@ -48,7 +48,7 @@ public class TapestrySpringIntegrationTest extends SeleniumTestCase
     {
         openBaseURL();
 
-        assertText("message", "SPRING VERSION 3.1.0.RELEASE: PIPELINE WAS INVOKED");
+        assertText("message", "SPRING VERSION 3.2.9.RELEASE: PIPELINE WAS INVOKED");
     }
 
     @Test