THRIFT-3142 Make JavaScript use downloaded libraries
diff --git a/lib/js/test/build.xml b/lib/js/test/build.xml
index 6083cd1..682ecc6 100755
--- a/lib/js/test/build.xml
+++ b/lib/js/test/build.xml
@@ -93,12 +93,12 @@
</target>
<target name="jslibs" depends="init, proxy">
- <get src="http://code.jquery.com/jquery-1.7.2.js" dest="${build}/js/lib/jquery-1.7.2.js" usetimestamp="true"/>
+ <get src="http://code.jquery.com/jquery-1.11.3.min.js" dest="${build}/js/lib/jquery.js" usetimestamp="true"/>
<get src="http://js-test-driver.googlecode.com/svn/trunk/JsTestDriver/contrib/qunit/src/equiv.js" dest="${build}/js/lib/equiv.js" usetimestamp="true"/>
<get src="http://js-test-driver.googlecode.com/svn/trunk/JsTestDriver/contrib/qunit/src/QUnitAdapter.js" dest="${build}/js/lib/QUnitAdapter.js" usetimestamp="true"/>
- <get src="http://code.jquery.com/qunit/qunit-1.5.0.js" dest="${build}/js/lib/qunit.js" usetimestamp="true"/>
- <get src="http://code.jquery.com/qunit/qunit-1.5.0.css" dest="${build}/js/lib/qunit.css" usetimestamp="true"/>
+ <get src="http://code.jquery.com/qunit/qunit-1.18.0.js" dest="${build}/js/lib/qunit.js" usetimestamp="true"/>
+ <get src="http://code.jquery.com/qunit/qunit-1.18.0.css" dest="${build}/js/lib/qunit.css" usetimestamp="true"/>
<!-- js-test-driver has issues with relative path...so we need a copy -->
<copy file="../src/thrift.js" todir="${build}/js"/>
</target>
@@ -161,7 +161,7 @@
<target name="jstestdriver-server" description="start the js-test-driver server" depends="init, resolve">
<echo>Starting js-test-driver Server...</echo>
- <java jar="${build}/lib/jstestdriver-1.3.2.jar" dir="." fork="true"
+ <java jar="${build}/lib/jstestdriver-1.3.5.jar" dir="." fork="true"
failonerror="true" output="${build}/log/jstestdriver-server.log">
<arg line="--port 9876"/>
</java>
@@ -176,7 +176,7 @@
<sequential>
<sleep seconds="2"/>
<echo>Running Unit Tests with js-test-driver</echo>
- <java jar="${build}/lib/jstestdriver-1.3.2.jar" dir="." fork="true"
+ <java jar="${build}/lib/jstestdriver-1.3.5.jar" dir="." fork="true"
failonerror="true" output="${build}/log/jstestdriver.log">
<arg value="--config" />
<arg value="jsTestDriver.conf" />
@@ -254,9 +254,9 @@
<dependency groupId="org.apache.httpcomponents" artifactId="httpclient" version="4.0.1"/>
<dependency groupId="com.googlecode.jslint4java" artifactId="jslint4java-ant" version="1.4.6"/>
<dependency groupId="eu.medsea.mimeutil" artifactId="mime-util" version="2.1.3"/>
+
<!-- get jstestdriver.jar via maven-->
- <remoteRepository id="jstd-maven-plugin google code repo" url="http://jstd-maven-plugin.googlecode.com/svn/maven2"/>
- <dependency groupId="com.google.jstestdriver" artifactId="maven-jstestdriver-plugin" version="1.3.2.3"/>
+ <dependency groupId="com.googlecode.jstd-maven-plugin" artifactId="jstd-maven-plugin" version="1.3.5.1"/>
</artifact:dependencies>
<!-- Copy the dependencies to the build/lib dir -->
diff --git a/lib/js/test/jsTestDriver.conf b/lib/js/test/jsTestDriver.conf
index 22e62ea..b9702cd 100755
--- a/lib/js/test/jsTestDriver.conf
+++ b/lib/js/test/jsTestDriver.conf
@@ -5,7 +5,7 @@
- build/js/lib/equiv.js
- build/js/lib/QUnitAdapter.js
# dependencies
- - build/js/lib/jquery-1.5.2.js
+ - build/js/lib/jquery.js
- build/js/thrift.js
- gen-js/ThriftTest_types.js
- gen-js/ThriftTest.js
diff --git a/lib/js/test/test-nojq.html b/lib/js/test/test-nojq.html
index 9b33845..541bffe 100644
--- a/lib/js/test/test-nojq.html
+++ b/lib/js/test/test-nojq.html
@@ -27,8 +27,8 @@
<script src="gen-js/ThriftTest.js" type="text/javascript" charset="utf-8"></script>
<!-- QUnit Test framework-->
- <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.14.0.js" charset="utf-8"></script>
- <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.14.0.css" type="text/css" media="screen" />
+ <script type="text/javascript" src="build/js/lib/qunit.js" charset="utf-8"></script>
+ <link rel="stylesheet" href="build/js/lib/qunit.css" type="text/css" media="screen" />
<!-- the Test Suite-->
<script type="text/javascript" src="test.js" charset="utf-8"></script>
diff --git a/lib/js/test/test.html b/lib/js/test/test.html
index b9c39f2..c654e8c 100755
--- a/lib/js/test/test.html
+++ b/lib/js/test/test.html
@@ -27,11 +27,11 @@
<script src="gen-js/ThriftTest.js" type="text/javascript" charset="utf-8"></script>
<!-- jQuery -->
- <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.js" charset="utf-8"></script>
+ <script type="text/javascript" src="build/js/lib/jquery.js" charset="utf-8"></script>
<!-- QUnit Test framework-->
- <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.14.0.js" charset="utf-8"></script>
- <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.14.0.css" type="text/css" media="screen" />
+ <script type="text/javascript" src="build/js/lib/qunit.js" charset="utf-8"></script>
+ <link rel="stylesheet" href="build/js/lib/qunit.css" type="text/css" media="screen" />
<!-- the Test Suite-->
<script>
diff --git a/lib/js/test/testws.html b/lib/js/test/testws.html
index ed2fe36..f99a146 100644
--- a/lib/js/test/testws.html
+++ b/lib/js/test/testws.html
@@ -27,11 +27,11 @@
<script src="gen-js/ThriftTest.js" type="text/javascript" charset="utf-8"></script>
<!-- jQuery -->
- <script type="text/javascript" src="https://code.jquery.com/jquery-1.7.2.js" charset="utf-8"></script>
+ <script type="text/javascript" src="build/js/lib/jquery.js" charset="utf-8"></script>
<!-- QUnit Test framework-->
- <script type="text/javascript" src="https://code.jquery.com/qunit/qunit-1.14.0.js" charset="utf-8"></script>
- <link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-1.14.0.css" type="text/css" media="screen" />
+ <script type="text/javascript" src="build/js/lib/qunit.js" charset="utf-8"></script>
+ <link rel="stylesheet" href="build/js/lib/qunit.css" type="text/css" media="screen" />
<!-- the Test Suite-->
<script>