Bump the version of TestNG (and dependencies) to 6.9.6.

Because we had an old version of TestNG.
SeleniumHQ · Oct 7, 2015 · db20d58 · db20d58
1 parent b7b081a
commit db20d58
Show file tree

Hide file tree

Showing 42 changed files with 119 additions and 49 deletions.
diff --git a/.idea/libraries/jcommander.xml b/.idea/libraries/jcommander.xml
diff --git a/.idea/libraries/snakeyaml.xml b/.idea/libraries/snakeyaml.xml
diff --git a/.idea/libraries/testng.xml b/.idea/libraries/testng.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -6,14 +6,13 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.8.5.jar" sourcepath="/third-party/java/testng/testng-6.8.5-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-18.0.jar" sourcepath="/third-party/java/guava-libraries/guava-18.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.18.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.18-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.17.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-4.1.0.jar" sourcepath="/third-party/java/jna/jna-4.1.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-platform-4.1.0.jar" sourcepath="/third-party/java/jna/jna-platform-4.1.0-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-exec/commons-exec-1.3.jar" sourcepath="/third-party/java/commons-exec/commons-exec-1.3-sources.jar"/>
-        <classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/cglib/cglib-nodep-2.1_3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet/javax.servlet-api-3.1.0.jar" sourcepath="/third-party/java/servlet/javax.servlet-api-3.1.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/phantomjs-driver/phantomjsdriver-1.2.1.jar" sourcepath="/third-party/java/phantomjs-driver/phantomjsdriver-1.2.1-sources.jar"/>
@@ -45,5 +44,6 @@
 	<classpathentry kind="lib" path="/third-party/java/websocket/websocket-common-9.2.13.v20150730.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-io-9.2.13.v20150730.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-util-9.2.13.v20150730.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.9.6.jar" sourcepath="/third-party/java/testng/testng-6.9.6-sources.jar"/>
 	<classpathentry kind="output" path="build/production"/>
 </classpath>
diff --git a/java/server/.classpath b/java/server/.classpath
@@ -16,12 +16,12 @@
 	<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mx4j/mx4j-tools-3.0.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jcip_annotations/jcip-annotations-1.0.jar" sourcepath="/third-party/java/jcip_annotations/jcip-annotations-1.0-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/yaml/snakeyaml-1.8.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48.jar" sourcepath="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-18.0.jar" sourcepath="/third-party/java/guava-libraries/guava-18.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-1.9.5.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/yaml/snakeyaml-1.15.jar" sourcepath="/third-party/java/yaml/snakeyaml-1.15-sources.jar"/>
 	<classpathentry kind="output" path="build/production"/>
 </classpath>
diff --git a/java/server/src/org/openqa/grid/BUCK b/java/server/src/org/openqa/grid/BUCK
@@ -25,7 +25,7 @@ java_library(name = 'grid',
     '//third_party/java/jetty:jetty',
     '//third_party/java/jetty:jetty-for-rc',
     '//third_party/java/servlet:servlet-api',
-    '//third_party/java/yaml:yaml',
+    '//third_party/java/yaml:snakeyaml',
   ],
   visibility = [
     '//java/server/src/org/openqa/grid/selenium:classes',

diff --git a/rake-tasks/crazy_fun/mappings/java.rb b/rake-tasks/crazy_fun/mappings/java.rb
@@ -67,9 +67,9 @@ def self.ant
       :classpath => 'third_party/java/jarjar/jarjar-1.4.jar'
       ant.taskdef :resource  => 'testngtasks' do |t|
         t.classpath do |cp|
-          cp.pathelement :location => 'third_party/java/testng/testng-6.8.5.jar'
+          cp.pathelement :location => 'third_party/java/testng/testng-6.9.6.jar'
           cp.pathelement :location => 'third_party/java/jcommander/jcommander-1.29.jar'
-          cp.pathelement :location => 'third_party/java/beanshell/bsh-1.3.0.jar'
+          cp.pathelement :location => 'third_party/java/beanshell/bsh-2.0b4.jar'
         end
       end
 

diff --git a/third_party/java/ant/BUCK b/third_party/java/ant/BUCK
@@ -0,0 +1,20 @@
+prebuilt_jar(
+  name = 'ant',
+  maven_coords = 'org.apache.ant:ant:jar:1.8.2',
+  binary_jar = 'ant-1.8.2.jar',
+  source_jar = 'ant-1.8.2.jar',
+  deps = [
+    ':ant-launcher'
+  ],
+  visibility = [
+    '//third_party/java/testng:testng'
+  ],
+)
+
+prebuilt_jar(
+  name = 'ant-launcher',
+  maven_coords = 'org.apache.ant:ant-launcher:jar:1.8.2',
+  binary_jar = 'ant-launcher-1.8.2.jar',
+  source_jar = 'ant-launcher-1.8.2.jar',
+)
+
diff --git a/third_party/java/aopalliance/BUCK b/third_party/java/aopalliance/BUCK
@@ -0,0 +1,10 @@
+prebuilt_jar(
+  name = 'aopalliance',
+  maven_coords = 'aopalliance:aopalliance:jar:1.0',
+  binary_jar = 'aopalliance-1.0.jar',
+  source_jar = 'aopalliance-1.0-sources.jar',
+  visibility = [
+    '//third_party/java/inject:guice'
+  ],
+)
+
diff --git a/third_party/java/aopalliance/aopalliance-1.0-sources.jar b/third_party/java/aopalliance/aopalliance-1.0-sources.jar
diff --git a/third_party/java/aopalliance/aopalliance-1.0.jar b/third_party/java/aopalliance/aopalliance-1.0.jar
diff --git a/third_party/java/beanshell/BUCK b/third_party/java/beanshell/BUCK
@@ -1,7 +1,9 @@
-
-prebuilt_jar(name = 'beanshell',
-  binary_jar = 'bsh-1.3.0.jar',
+prebuilt_jar(
+  name = 'bsh',
+  maven_coords = 'org.beanshell:bsh:jar:2.0b4',
+  binary_jar = 'bsh-2.0b4.jar',
   visibility = [
-    '//third_party/java/testng:testng',
+    '//third_party/java/testng:testng'
   ],
 )
+
diff --git a/third_party/java/beanshell/bsh-1.3.0.jar b/third_party/java/beanshell/bsh-1.3.0.jar
diff --git a/third_party/java/beanshell/bsh-2.0b4.jar b/third_party/java/beanshell/bsh-2.0b4.jar
diff --git a/third_party/java/beanshell/build.desc b/third_party/java/beanshell/build.desc
@@ -1,3 +1,3 @@
 
 java_library(name = "beanshell",
-  deps = [ "bsh-1.3.0.jar" ])
+  deps = [ "bsh-2.0b4.jar" ])
diff --git a/third_party/java/beust/BUCK b/third_party/java/beust/BUCK
@@ -0,0 +1,10 @@
+prebuilt_jar(
+  name = 'jcommander',
+  maven_coords = 'com.beust:jcommander:jar:1.48',
+  binary_jar = 'jcommander-1.48.jar',
+  source_jar = 'jcommander-1.48-sources.jar',
+  visibility = [
+    '//third_party/java/testng:testng'
+  ],
+)
+
diff --git a/third_party/java/beust/build.desc b/third_party/java/beust/build.desc
@@ -0,0 +1,5 @@
+java_library(
+  name = "jcommander",
+  deps = ["jcommander-1.48.jar"])
+
+
diff --git a/third_party/java/beust/jcommander-1.48-sources.jar b/third_party/java/beust/jcommander-1.48-sources.jar
diff --git a/third_party/java/beust/jcommander-1.48.jar b/third_party/java/beust/jcommander-1.48.jar
diff --git a/third_party/java/guice/build.desc b/third_party/java/guice/build.desc
diff --git a/third_party/java/guice/guice-3.0.jar b/third_party/java/guice/guice-3.0.jar
diff --git a/third_party/java/guice/guice-multibindings-3.0.jar b/third_party/java/guice/guice-multibindings-3.0.jar
diff --git a/third_party/java/guice/guice-servlet-3.0.jar b/third_party/java/guice/guice-servlet-3.0.jar
diff --git a/third_party/java/inject/BUCK b/third_party/java/inject/BUCK
@@ -0,0 +1,22 @@
+prebuilt_jar(
+  name = 'guice',
+  maven_coords = 'com.google.inject:guice:jar:4.0',
+  binary_jar = 'guice-4.0.jar',
+  source_jar = 'guice-4.0-sources.jar',
+  deps = [
+    ':javax.inject',
+    '//third_party/java/aopalliance:aopalliance',
+    '//third_party/java/guava-libraries:guava-libraries'
+  ],
+  visibility = [
+    '//third_party/java/testng:testng'
+  ],
+)
+
+prebuilt_jar(
+  name = 'javax.inject',
+  maven_coords = 'javax.inject:javax.inject:jar:1',
+  binary_jar = 'javax.inject-1.jar',
+  source_jar = 'javax.inject-1-sources.jar',
+)
+
diff --git a/third_party/java/inject/guice-4.0-sources.jar b/third_party/java/inject/guice-4.0-sources.jar
diff --git a/third_party/java/inject/guice-4.0.jar b/third_party/java/inject/guice-4.0.jar
diff --git a/third_party/java/inject/javax.inject-1-sources.jar b/third_party/java/inject/javax.inject-1-sources.jar
diff --git a/third_party/java/jsr_330/javax.inject-1.jar → third_party/java/inject/javax.inject-1.jar b/third_party/java/jsr_330/javax.inject-1.jar → third_party/java/inject/javax.inject-1.jar
diff --git a/third_party/java/jcommander/BUCK b/third_party/java/jcommander/BUCK
diff --git a/third_party/java/jcommander/build.desc b/third_party/java/jcommander/build.desc
diff --git a/third_party/java/jcommander/jcommander-1.29.jar b/third_party/java/jcommander/jcommander-1.29.jar
diff --git a/third_party/java/testng/BUCK b/third_party/java/testng/BUCK
@@ -1,8 +1,15 @@
-prebuilt_jar(name = 'testng',
-  binary_jar = 'testng-6.8.5.jar',
-  deps = [ 
-    '//third_party/java/beanshell:beanshell',
-    '//third_party/java/jcommander:jcommander',
+prebuilt_jar(
+  name = 'testng',
+  maven_coords = 'org.testng:testng:jar:6.9.6',
+  binary_jar = 'testng-6.9.6.jar',
+  source_jar = 'testng-6.9.6-sources.jar',
+  deps = [
+    '//third_party/java/ant:ant',
+    '//third_party/java/beanshell:bsh',
+    '//third_party/java/beust:jcommander',
+    '//third_party/java/inject:guice',
+    '//third_party/java/junit:junit',
+    '//third_party/java/yaml:snakeyaml'
   ],
   visibility = [
     '//java/client/src/com/thoughtworks/selenium:selenium',

diff --git a/third_party/java/testng/build.desc b/third_party/java/testng/build.desc
@@ -1,6 +1,6 @@
 java_library(name = "testng",
   deps = [ 
-    "testng-6.8.5.jar",
+    "testng-6.9.6.jar",
     "//third_party/java/beanshell",
-    "//third_party/java/jcommander",
+    "//third_party/java/beust:jcommander",
    ])
diff --git a/third_party/java/testng/testng-6.8.5-sources.jar b/third_party/java/testng/testng-6.8.5-sources.jar
diff --git a/third_party/java/testng/testng-6.8.5.jar b/third_party/java/testng/testng-6.8.5.jar
diff --git a/third_party/java/testng/testng-6.9.6-sources.jar b/third_party/java/testng/testng-6.9.6-sources.jar
diff --git a/third_party/java/testng/testng-6.9.6.jar b/third_party/java/testng/testng-6.9.6.jar
diff --git a/third_party/java/yaml/BUCK b/third_party/java/yaml/BUCK
@@ -1,7 +1,11 @@
-prebuilt_jar(name = 'yaml',
-  binary_jar = 'snakeyaml-1.8.jar',
+prebuilt_jar(
+  name = 'snakeyaml',
+  maven_coords = 'org.yaml:snakeyaml:jar:1.15',
+  binary_jar = 'snakeyaml-1.15.jar',
+  source_jar = 'snakeyaml-1.15-sources.jar',
   visibility = [
     '//java/server/src/org/openqa/grid:grid',
+    '//third_party/java/testng:testng'
   ],
 )
 
diff --git a/third_party/java/yaml/build.desc b/third_party/java/yaml/build.desc
@@ -1,4 +1,4 @@
 java_library(name = "yaml",
   deps = [
-    "snakeyaml-1.8.jar"
-  ])
+    "snakeyaml-1.15.jar"
+  ])
diff --git a/third_party/java/yaml/snakeyaml-1.15-sources.jar b/third_party/java/yaml/snakeyaml-1.15-sources.jar
diff --git a/third_party/java/yaml/snakeyaml-1.15.jar b/third_party/java/yaml/snakeyaml-1.15.jar
diff --git a/third_party/java/yaml/snakeyaml-1.8.jar b/third_party/java/yaml/snakeyaml-1.8.jar