Author: mlusetti
Date: Tue Dec 13 09:00:06 2011
New Revision: 1213610
URL: http://svn.apache.org/viewvc?rev=1213610&view=rev
Log:
TAP5-1780: Upgrade Selenium dependency to 2.14.0 (merged from trunk)
Modified:
tapestry/tapestry5/branches/5.3/ (props changed)
tapestry/tapestry5/branches/5.3/tapestry-core/src/main/java/org/apache/tapestry5/services/DelegatingRequest.java
(props changed)
tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle
Propchange: tapestry/tapestry5/branches/5.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 09:00:06 2011
@@ -2,4 +2,4 @@
/tapestry/tapestry5/branches/hlship-5.0-perf:726734-728728
/tapestry/tapestry5/tags/releases/5.0.17:719745
/tapestry/tapestry5/tags/releases/hlship-5.0-perf:726733
-/tapestry/tapestry5/trunk:1211947-1212379
+/tapestry/tapestry5/trunk:1211438-1211646,1211947-1212379
Propchange:
tapestry/tapestry5/branches/5.3/tapestry-core/src/main/java/org/apache/tapestry5/services/DelegatingRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 09:00:06 2011
@@ -1 +1 @@
-/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/DelegatingRequest.java:1211947-1212379
+/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/DelegatingRequest.java:1211438-1211646,1211947-1212379
Modified: tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle?rev=1213610&r1=1213609&r2=1213610&view=diff
==============================================================================
--- tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle (original)
+++ tapestry/tapestry5/branches/5.3/tapestry-test/build.gradle Tue Dec 13
09:00:06 2011
@@ -1,8 +1,10 @@
description = "Utilities for unit and integration testing of Tapestry
applications"
+seleniumVersion = '2.14.0'
+
dependencies {
- compile "org.seleniumhq.selenium:selenium-java:2.3.1"
- compile "org.seleniumhq.selenium:selenium-server:2.3.1"
+ compile "org.seleniumhq.selenium:selenium-java:$seleniumVersion"
+ compile "org.seleniumhq.selenium:selenium-server:$seleniumVersion"
compile "jetty:org.mortbay.jetty:5.1.12"
compile "org.testng:testng:$testngVersion"
