You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/10/29 19:16:17 UTC

[22/23] git commit: [flex-asjs] [refs/heads/develop] - upgrade to selenium 2.44

upgrade to selenium 2.44


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e2ad230b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e2ad230b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e2ad230b

Branch: refs/heads/develop
Commit: e2ad230bb684ec13cb66184552ff434645f3d7ad
Parents: 9ec0bfa
Author: Alex Harui <ah...@apache.org>
Authored: Wed Oct 29 11:12:51 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Oct 29 11:15:45 2014 -0700

----------------------------------------------------------------------
 build.xml                     | 62 ++++++++++++++++++++------------------
 marmotinni/build.xml          |  6 ++--
 marmotinni/java/downloads.xml |  6 ++--
 3 files changed, 39 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e2ad230b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 740a9ee..ac62822 100644
--- a/build.xml
+++ b/build.xml
@@ -1206,26 +1206,27 @@
 		    <arg value="script=${basedir}/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml" />
 		    <!--<arg value="showSteps=true" />-->
             <classpath>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.40.0.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.44.0.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/bsh-1.3.0.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-codec-1.8.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-codec-1.9.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-collections-3.2.1.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-exec-1.1.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-io-2.2.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-io-2.4.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-jxpath-1.3.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-lang3-3.1.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.1.1.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.11.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-15.0.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-lang3-3.3.2.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.1.3.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.14.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-18.0.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-2.13.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-core-js-2.13.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpclient-4.3.1.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpcore-4.3.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpmime-4.3.1.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-2.15.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-core-js-2.15.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpclient-4.3.4.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpcore-4.3.2.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpmime-4.3.4.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/ini4j-0.5.2.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.29.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-websocket-8.1.8.jar"/>
@@ -1233,16 +1234,16 @@
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jna-platform-3.4.0.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/json-20080701.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/junit-dep-4.11.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/nekohtml-1.9.17.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/nekohtml-1.9.21.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/netty-3.5.7.Final.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/operadriver-1.2.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/operadriver-1.5.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.1.0.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/protobuf-java-2.4.1.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/sac-1.3.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/serializer-2.7.1.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.8.5.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xalan-2.7.1.jar"/>
-            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xercesImpl-2.10.0.jar"/>
+            	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xercesImpl-2.11.0.jar"/>
             	<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xml-apis-1.4.01.jar"/>
             </classpath>
 		</java>
@@ -1294,26 +1295,27 @@
         <mkdir dir="${basedir}/mustella/java/bin"/>
         <javac srcdir="${basedir}/mustella/java/src/marmotinni" destdir="${basedir}/mustella/java/bin" debug="off" optimize="on">
             <classpath>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.40.0.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.44.0.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/bsh-1.3.0.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-codec-1.8.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-codec-1.9.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-collections-3.2.1.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-exec-1.1.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-io-2.2.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-io-2.4.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-jxpath-1.3.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-lang3-3.1.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.1.1.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.11.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-15.0.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-lang3-3.3.2.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.1.3.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.14.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-18.0.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-2.13.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-core-js-2.13.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpclient-4.3.1.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpcore-4.3.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpmime-4.3.1.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-2.15.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-core-js-2.15.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpclient-4.3.4.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpcore-4.3.2.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpmime-4.3.4.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/ini4j-0.5.2.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.29.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-websocket-8.1.8.jar"/>
@@ -1321,16 +1323,16 @@
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jna-platform-3.4.0.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/json-20080701.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/junit-dep-4.11.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/nekohtml-1.9.17.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/nekohtml-1.9.21.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/netty-3.5.7.Final.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/operadriver-1.2.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/operadriver-1.5.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.1.0.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/protobuf-java-2.4.1.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/sac-1.3.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/serializer-2.7.1.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.8.5.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xalan-2.7.1.jar"/>
-                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xercesImpl-2.10.0.jar"/>
+                <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xercesImpl-2.11.0.jar"/>
                 <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xml-apis-1.4.01.jar"/>
             </classpath>
         </javac>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e2ad230b/marmotinni/build.xml
----------------------------------------------------------------------
diff --git a/marmotinni/build.xml b/marmotinni/build.xml
index 71b31c8..0fa501f 100644
--- a/marmotinni/build.xml
+++ b/marmotinni/build.xml
@@ -91,7 +91,7 @@
 		<java classname="${param.test.class}" outputproperty="stdout" classpath="${basedir}/java/bin" fork="true" failonerror="yes">
 		    <arg value="url=${param.test.url}" />
             <classpath>
-            	<pathelement location="${basedir}/java/lib/selenium/selenium-java-2.32.0.jar"/>
+            	<pathelement location="${basedir}/java/lib/selenium/selenium-java-2.44.0.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/bsh-1.3.0.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
@@ -103,6 +103,7 @@
             	<pathelement location="${basedir}/java/lib/selenium/libs/commons-lang3-3.1.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/commons-logging-1.1.1.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/cssparser-0.9.9.jar"/>
+                <pathelement location="${basedir}/java/lib/selenium/libs/gson-2.3.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/guava-14.0.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
@@ -154,7 +155,7 @@
     <target name="test_compile" depends="test_prepare">
         <javac srcdir="${basedir}/java/src/org/apache/flex/html/textButton" destdir="${basedir}/java/bin" debug="off" optimize="on">
             <classpath>
-            	<pathelement location="${basedir}/java/lib/selenium/selenium-java-2.32.0.jar"/>
+            	<pathelement location="${basedir}/java/lib/selenium/selenium-java-2.44.0.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/bsh-1.3.0.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
@@ -166,6 +167,7 @@
             	<pathelement location="${basedir}/java/lib/selenium/libs/commons-lang3-3.1.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/commons-logging-1.1.1.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/cssparser-0.9.9.jar"/>
+                <pathelement location="${basedir}/java/lib/selenium/libs/gson-2.3.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/guava-14.0.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
             	<pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e2ad230b/marmotinni/java/downloads.xml
----------------------------------------------------------------------
diff --git a/marmotinni/java/downloads.xml b/marmotinni/java/downloads.xml
index 6b22ca7..b25d5c0 100644
--- a/marmotinni/java/downloads.xml
+++ b/marmotinni/java/downloads.xml
@@ -32,9 +32,9 @@
             selenium (2.32.0) - Apache 2.0
 	-->
 	
-    <property name="selenium2.jar.dir.name" value="2.40"/>
-    <property name="selenium2.jar.name" value="selenium-java-2.40.0"/>
-    <property name="selenium2.dir.name" value="selenium-2.40.0"/>
+    <property name="selenium2.jar.dir.name" value="2.44"/>
+    <property name="selenium2.jar.name" value="selenium-java-2.44.0"/>
+    <property name="selenium2.dir.name" value="selenium-2.44.0"/>
 	
     <!-- 
         Because the downloads requires a network connection and the JARs don't change very often,