AlexeiBarantsev: Upgrading TestNG from 6.0.1 to 6.8

r17841
vladfridman · Sep 21, 2012 · e70fa37 · e70fa37
1 parent 0b2df89
commit e70fa37
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 18 deletions.
diff --git a/.idea/libraries/testng.xml b/.idea/libraries/testng.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.1.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.0.1-nobsh-noguice.jar" sourcepath="/third-party/java/testng/testng-6.0.1-nobsh-noguice-src.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.8.jar" sourcepath="/third-party/java/testng/testng-6.8-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-13.0.1.jar" sourcepath="/third-party/java/guava-libraries/guava-13.0.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.10.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.10-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.10.jar"/>

diff --git a/java/client/client.eml b/java/client/client.eml
@@ -8,8 +8,8 @@
 	<lib name="junit-dep-4.10.jar" scope="COMPILE">
 		<srcroot url="file:///third-party/java/junit/junit-dep-4.10-src.jar"/>
 	</lib>
-	<lib name="testng-6.0.1-nobsh-noguice.jar" scope="COMPILE">
-		<srcroot url="file:///third-party/java/testng/testng-6.0.1-nobsh-noguice-src.jar"/>
+	<lib name="testng-6.8.jar" scope="COMPILE">
+		<srcroot url="file:///third-party/java/testng/testng-6.8-sources.jar"/>
 	</lib>
 	<lib name="guava-11.0.1.jar" scope="COMPILE">
 		<srcroot url="file:///third-party/java/guava-libraries/guava-11.0.1-src.jar"/>

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -12,7 +12,7 @@
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/junit/junit-dep-4.10.jar" sourcepath="/third-party/java/junit/junit-dep-4.10-src.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.0.1-nobsh-noguice.jar" sourcepath="/third-party/java/testng/testng-6.0.1-nobsh-noguice-src.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.8.jar" sourcepath="/third-party/java/testng/testng-6.8-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcprov-jdk15on-147.jar" sourcepath="/third-party/java/bouncycastle/bcprov-jdk15on-147-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked-7.6.1.jar" sourcepath="/third-party/java/jetty/jetty-repacked-7.6.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.1.1.jar"/>

diff --git a/java/server/server.eml b/java/server/server.eml
@@ -20,8 +20,8 @@
 	<lib name="junit-dep-4.10.jar" scope="COMPILE">
 		<srcroot url="file:///third-party/java/junit/junit-dep-4.10-src.jar"/>
 	</lib>
-	<lib name="testng-6.0.1-nobsh-noguice.jar" scope="COMPILE">
-		<srcroot url="file:///third-party/java/testng/testng-6.0.1-nobsh-noguice-src.jar"/>
+	<lib name="testng-6.8.jar" scope="COMPILE">
+		<srcroot url="file:///third-party/java/testng/testng-6.8-sources.jar"/>
 	</lib>
 	<lib name="bcprov-jdk15on-147.jar" scope="COMPILE">
 		<srcroot url="file:///third-party/java/bouncycastle/bcprov-jdk15on-147-src.jar"/>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -201,7 +201,7 @@
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>6.0.1</version>
+                <version>6.8</version>
             </dependency>
             <dependency>
                 <groupId>org.webbitserver</groupId>

diff --git a/rake-tasks/crazy_fun/mappings/java.rb b/rake-tasks/crazy_fun/mappings/java.rb
@@ -67,8 +67,8 @@ def self.ant
       :classpath => 'third_party/java/jarjar/jarjar-1.3.jar'
       ant.taskdef :resource  => 'testngtasks' do |t|
         t.classpath do |cp|
-          cp.pathelement :location => 'third_party/java/testng/testng-6.0.1-nobsh-noguice.jar'
-          cp.pathelement :location => 'third_party/java/jcommander/jcommander-1.13.jar'
+          cp.pathelement :location => 'third_party/java/testng/testng-6.8.jar'
+          cp.pathelement :location => 'third_party/java/jcommander/jcommander-1.29.jar'
           cp.pathelement :location => 'third_party/java/beanshell/bsh-1.3.0.jar'
         end
       end

diff --git a/selenium.eml b/selenium.eml
@@ -108,10 +108,10 @@
 	<lib name="json-20080701.jar" scope="COMPILE">
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/json/json-20080701.jar!/"/>
 	</lib>
-	<lib name="testng-6.0.1-nobsh-noguice.jar" scope="COMPILE">
-		<srcroot url="jar://$MODULE_DIR$/third_party/java/testng/testng-6.0.1-nobsh-noguice-src.jar!/"/>
-		<relative-module-src project-related="jar://$PROJECT_DIR$/third_party/java/testng/testng-6.0.1-nobsh-noguice-src.jar!/"/>
-		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/testng/testng-6.0.1-nobsh-noguice.jar!/"/>
+	<lib name="testng-6.8.jar" scope="COMPILE">
+		<srcroot url="jar://$MODULE_DIR$/third_party/java/testng/testng-6.8-sources.jar!/"/>
+		<relative-module-src project-related="jar://$PROJECT_DIR$/third_party/java/testng/testng-6.8-sources.jar!/"/>
+		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/testng/testng-6.8.jar!/"/>
 	</lib>
 	<lib name="servlet-api-2.5-6.1.9.jar" scope="COMPILE">
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/servlet-api/servlet-api-2.5-6.1.9.jar!/"/>

diff --git a/selenium/selenium.iml b/selenium/selenium.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../third_party/java/testng/testng-5.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../third_party/java/testng/testng-6.8.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

diff --git a/third_party/java/jcommander/build.desc b/third_party/java/jcommander/build.desc
@@ -1,3 +1,3 @@
 
 java_library(name = "jcommander",
-  deps = [ "jcommander-1.13.jar" ])
+  deps = [ "jcommander-1.29.jar" ])
diff --git a/third_party/java/jcommander/jcommander-1.13.jar b/third_party/java/jcommander/jcommander-1.13.jar
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/build.desc b/third_party/java/testng/build.desc
@@ -1,6 +1,6 @@
 java_library(name = "testng",
   deps = [ 
-    "testng-6.0.1-nobsh-noguice.jar",
+    "testng-6.8.jar",
     "//third_party/java/beanshell",
     "//third_party/java/jcommander",
    ])
diff --git a/third_party/java/testng/testng-6.0.1-nobsh-noguice-src.jar b/third_party/java/testng/testng-6.0.1-nobsh-noguice-src.jar
diff --git a/third_party/java/testng/testng-6.0.1-nobsh-noguice.jar b/third_party/java/testng/testng-6.0.1-nobsh-noguice.jar
diff --git a/third_party/java/testng/testng-6.8-sources.jar b/third_party/java/testng/testng-6.8-sources.jar
diff --git a/third_party/java/testng/testng-6.8.jar b/third_party/java/testng/testng-6.8.jar