jenkins-test-harness:2.60 -> 2.71

Issue #181 Changes: jenkinsci/jenkins-test-harness@jenkins-test-harness-2.60...jenkins-test-harness-2.71
jenkinsci · Feb 5, 2021 · 6030260 · 6030260
1 parent b4a7c6a
commit 6030260
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -41,7 +41,7 @@ dependencies {
     compileOnly("com.squareup:javapoet:1.13.0") {
         because("used for GenerateTestTask")
     }
-    compileOnly("org.jenkins-ci.main:jenkins-test-harness:2.60") {
+    compileOnly("org.jenkins-ci.main:jenkins-test-harness:2.71") {
         because("used for GenerateTestTask")
         isTransitive = false
     }

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1306,6 +1306,14 @@
             <sha256 value="8c852f0bf3c9fb2fa7c9b4e150bcbb6b77f6c933902aeaccc5f6fd1c5f3bcd94" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jenkins-ci.main" name="jenkins-test-harness" version="2.71">
+         <artifact name="jenkins-test-harness-2.71.jar">
+            <sha256 value="7b8426dd794eaa43a352e6330592f37c761a308e3139564e6ed6b6ebf0bf1535" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jenkins-test-harness-2.71.pom">
+            <sha256 value="4d947e3826ca824b78df3b7ef7af28d710065535644d990629ee480b022ccc5d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jenkins-ci.main" name="remoting" version="4.5">
          <artifact name="remoting-4.5.jar">
             <sha256 value="509fdd80048747c9e2e0ba90317e0845e6a95acd0d65995e7af72d57ee924267" origin="Generated by Gradle"/>

diff --git a/src/main/groovy/org/jenkinsci/gradle/plugins/jpi/internal/DependencyLookup.groovy b/src/main/groovy/org/jenkinsci/gradle/plugins/jpi/internal/DependencyLookup.groovy
@@ -17,7 +17,7 @@ class DependencyLookup {
         if (version < GradleVersion.version('2.0')) {
             servlet = 'javax.servlet:servlet-api:2.4'
         }
-        String testHarness = 'org.jenkins-ci.main:jenkins-test-harness:2.60'
+        String testHarness = 'org.jenkins-ci.main:jenkins-test-harness:2.71'
         if (version < GradleVersion.version('2.64')) {
             testHarness = 'org.jenkins-ci.main:jenkins-test-harness:2.0'
         }

diff --git a/src/main/kotlin/org/jenkinsci/gradle/plugins/testing/JpiTestingPlugin.kt b/src/main/kotlin/org/jenkinsci/gradle/plugins/testing/JpiTestingPlugin.kt
@@ -15,7 +15,7 @@ import java.io.File
 open class JpiTestingPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         val javapoet = target.dependencies.create("com.squareup:javapoet:1.13.0")
-        val jenkinsTestHarness = target.dependencies.create("org.jenkins-ci.main:jenkins-test-harness:2.60")
+        val jenkinsTestHarness = target.dependencies.create("org.jenkins-ci.main:jenkins-test-harness:2.71")
         val jenkinsTestGeneration = target.configurations.create("jenkinsTestGeneration") {
             attributes {
                 attribute(Usage.USAGE_ATTRIBUTE, target.objects.named(Usage.JAVA_RUNTIME))

diff --git a/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/JenkinsVersionIntegrationSpec.groovy b/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/JenkinsVersionIntegrationSpec.groovy
@@ -127,7 +127,7 @@ class JenkinsVersionIntegrationSpec extends IntegrationSpec {
                 'findbugs:annotations:1.0.0'                   : NOWHERE,
                 'javax.servlet:servlet-api:2.4'                : NOWHERE,
                 'javax.servlet:javax.servlet-api:3.1.0'        : COMPILE_ONLY,
-                'org.jenkins-ci.main:jenkins-test-harness:2.60': TEST_IMPLEMENTATION_ONLY,
+                'org.jenkins-ci.main:jenkins-test-harness:2.71': TEST_IMPLEMENTATION_ONLY,
                 'org.jenkins-ci.main:ui-samples-plugin:2.0'    : TEST_IMPLEMENTATION_ONLY,
                 'junit:junit-dep:4.10'                         : NOWHERE,
         ]
@@ -137,7 +137,7 @@ class JenkinsVersionIntegrationSpec extends IntegrationSpec {
                 'findbugs:annotations:1.0.0'                   : NOWHERE,
                 'javax.servlet:servlet-api:2.4'                : NOWHERE,
                 'javax.servlet:javax.servlet-api:3.1.0'        : COMPILE_ONLY,
-                'org.jenkins-ci.main:jenkins-test-harness:2.60': TEST_IMPLEMENTATION_ONLY,
+                'org.jenkins-ci.main:jenkins-test-harness:2.71': TEST_IMPLEMENTATION_ONLY,
                 'org.jenkins-ci.main:ui-samples-plugin:2.0'    : TEST_IMPLEMENTATION_ONLY,
                 'junit:junit-dep:4.10'                         : NOWHERE,
         ]

diff --git a/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/internal/DependencyLookupSpec.groovy b/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/internal/DependencyLookupSpec.groovy
@@ -56,7 +56,7 @@ class DependencyLookupSpec extends Specification {
         '1.532' | ['org.jenkins-ci.main:jenkins-core:1.532', 'org.jenkins-ci.main:jenkins-test-harness:1.532', 'org.jenkins-ci.main:ui-samples-plugin:1.532'] as Set
         '1.644' | ['org.jenkins-ci.main:jenkins-core:1.644', 'org.jenkins-ci.main:jenkins-test-harness:1.644', 'org.jenkins-ci.main:ui-samples-plugin:2.0'] as Set
         '1.645' | ['org.jenkins-ci.main:jenkins-core:1.645', 'org.jenkins-ci.main:jenkins-test-harness:2.0', 'org.jenkins-ci.main:ui-samples-plugin:2.0'] as Set
-        '2.64'  | ['org.jenkins-ci.main:jenkins-core:2.64', 'org.jenkins-ci.main:jenkins-test-harness:2.60', 'org.jenkins-ci.main:ui-samples-plugin:2.0'] as Set
+        '2.64'  | ['org.jenkins-ci.main:jenkins-core:2.64', 'org.jenkins-ci.main:jenkins-test-harness:2.71', 'org.jenkins-ci.main:ui-samples-plugin:2.0'] as Set
     }
 
     @Unroll
@@ -90,7 +90,7 @@ class DependencyLookupSpec extends Specification {
         then:
         actual == [
                 'org.jenkins-ci.main:jenkins-war:2.222.3',
-                'org.jenkins-ci.main:jenkins-test-harness:2.60',
+                'org.jenkins-ci.main:jenkins-test-harness:2.71',
         ] as Set<String>
     }
 }