Merge pull request #1982 from jglick/refactor-test-harness-2

[FIXED JENKINS-32478] Use released version of test harness
jenkinsci · Jan 18, 2016 · 8f42600 · 8f42600
2 parents 85fed0b + f2b06a8
commit 8f42600
Show file tree

Hide file tree

Showing 123 changed files with 10 additions and 12,594 deletions.
diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
-      <type>war</type>
+      <classifier>war-for-test</classifier>
       <version>1.645-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
@@ -73,7 +73,13 @@
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.645-SNAPSHOT</version>
+      <version>2.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>test-annotations</artifactId>
+      <version>1.2</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/pom.xml b/pom.xml
@@ -50,8 +50,6 @@ THE SOFTWARE.
   <modules>
     <module>core</module>
     <module>war</module>
-    <module>test-harness</module>
-    <module>test-harness-tools</module>
     <module>test</module>
     <module>cli</module>
     <module>plugins</module>

diff --git a/test-harness-tools/pom.xml b/test-harness-tools/pom.xml
diff --git a/test-harness-tools/src/main/java/org/jvnet/hudson/test/ToolInstallations.java b/test-harness-tools/src/main/java/org/jvnet/hudson/test/ToolInstallations.java
diff --git a/test-harness-tools/src/main/resources/apache-ant-1.8.1-bin.zip b/test-harness-tools/src/main/resources/apache-ant-1.8.1-bin.zip
diff --git a/test-harness-tools/src/main/resources/apache-maven-2.2.1-bin.zip b/test-harness-tools/src/main/resources/apache-maven-2.2.1-bin.zip
diff --git a/test-harness-tools/src/main/resources/apache-maven-3.0.1-bin.zip b/test-harness-tools/src/main/resources/apache-maven-3.0.1-bin.zip
diff --git a/test-harness-tools/src/main/resources/apache-maven-3.1.0-bin.zip b/test-harness-tools/src/main/resources/apache-maven-3.1.0-bin.zip
diff --git a/test-harness-tools/src/main/resources/maven-2.0.7-bin.zip b/test-harness-tools/src/main/resources/maven-2.0.7-bin.zip