Repository: flex-asjs Updated Branches: refs/heads/develop bfc904cbc -> e85d9e134
remove GCL crypt folder (and upgrade Selenium) Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e85d9e13 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e85d9e13 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e85d9e13 Branch: refs/heads/develop Commit: e85d9e134f2ae37acec5eb72a981550b4de58ed7 Parents: bfc904c Author: Alex Harui <[email protected]> Authored: Thu Mar 31 19:30:31 2016 -0700 Committer: Alex Harui <[email protected]> Committed: Thu Mar 31 19:30:31 2016 -0700 ---------------------------------------------------------------------- build.xml | 26 ++++++++++++++++---------- marmotinni/java/downloads.xml | 6 +++--- 2 files changed, 19 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e85d9e13/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 8047641..651468c 100644 --- a/build.xml +++ b/build.xml @@ -782,14 +782,20 @@ <target name="copy-gcl-from-goog-home" if="GOOG_HOME"> <echo message="Copying GCL from ${GOOG_HOME}"></echo> <copy todir="${basedir}/temp/js/lib/google/closure-library"> - <fileset dir="${GOOG_HOME}" /> + <fileset dir="${GOOG_HOME}" > + <include name="**"/> + <exclude name="closure/goog/crypt/**" /> + </fileset> </copy> </target> <target name="copy-gcl-from-downloaded" unless="GOOG_HOME"> <echo message="Copying GCL from ${basedir}/temp/js/lib/google/closure-library"></echo> <copy todir="${basedir}/temp/js/lib/google/closure-library"> - <fileset dir="${basedir}/js/lib/google/closure-library" /> + <fileset dir="${basedir}/js/lib/google/closure-library" > + <include name="**"/> + <exclude name="closure/goog/crypt/**" /> + </fileset> </copy> </target> @@ -1064,7 +1070,7 @@ <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.48.2.jar"/> + <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.53.0.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/bsh-2.0b4.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/> @@ -1078,7 +1084,7 @@ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.2.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.16.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.1.jar"/> - <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-18.0.jar"/> + <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-19.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.18.jar"/> @@ -1090,7 +1096,7 @@ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jasper-compiler-jdt-5.5.15.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jasper-runtime-5.5.15.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/javax.servlet-api-3.1.0.jar"/> - <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.29.jar"/> + <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.48.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-continuation-9.2.3.v20150730.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-http-9.2.3.v20150730.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-io-9.2.3.v20150730.jar"/> @@ -1109,7 +1115,7 @@ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.2.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.2.jar"/> - <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.9.6.jar"/> + <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.9.9.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-api-9.2.13.v20150730.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-client-9.2.13.v20150730.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-common-9.2.13.v20150730.jar"/> @@ -1163,7 +1169,7 @@ <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.48.2.jar"/> + <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.53.0.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/bsh-2.0b4.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/> @@ -1177,7 +1183,7 @@ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.2.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.16.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.1.jar"/> - <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-18.0.jar"/> + <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-19.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.18.jar"/> @@ -1189,7 +1195,7 @@ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jasper-compiler-jdt-5.5.15.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jasper-runtime-5.5.15.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/javax.servlet-api-3.1.0.jar"/> - <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.29.jar"/> + <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.48.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-continuation-9.2.3.v20150730.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-http-9.2.3.v20150730.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-io-9.2.3.v20150730.jar"/> @@ -1208,7 +1214,7 @@ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.2.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.2.jar"/> - <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.9.6.jar"/> + <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.9.9.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-api-9.2.13.v20150730.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-client-9.2.13.v20150730.jar"/> <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-common-9.2.13.v20150730.jar"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e85d9e13/marmotinni/java/downloads.xml ---------------------------------------------------------------------- diff --git a/marmotinni/java/downloads.xml b/marmotinni/java/downloads.xml index 14c0b15..c644c75 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.48"/> - <property name="selenium2.jar.name" value="selenium-java-2.48.2"/> - <property name="selenium2.dir.name" value="selenium-2.48.2"/> + <property name="selenium2.jar.dir.name" value="2.53"/> + <property name="selenium2.jar.name" value="selenium-java-2.53.0"/> + <property name="selenium2.dir.name" value="selenium-2.53.0"/> <!-- Because the downloads requires a network connection and the JARs don't change very often,
