From 603026012d8205bfcc3aca20d4150681c7586920 Mon Sep 17 00:00:00 2001 From: Steve Hill Date: Fri, 5 Feb 2021 12:19:08 -0800 Subject: [PATCH] jenkins-test-harness:2.60 -> 2.71 Issue #181 Changes: https://github.com/jenkinsci/jenkins-test-harness/compare/jenkins-test-harness-2.60...jenkins-test-harness-2.71 --- build.gradle.kts | 2 +- gradle/verification-metadata.xml | 8 ++++++++ .../gradle/plugins/jpi/internal/DependencyLookup.groovy | 2 +- .../jenkinsci/gradle/plugins/testing/JpiTestingPlugin.kt | 2 +- .../plugins/jpi/JenkinsVersionIntegrationSpec.groovy | 4 ++-- .../plugins/jpi/internal/DependencyLookupSpec.groovy | 4 ++-- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3fb5800f..86df0d38 100644 --- 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 index efa50895..d53cdc62 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1306,6 +1306,14 @@ + + + + + + + + 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 index 7e32e86d..b5737cdd 100644 --- 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 index 51a5339c..4d4c6b30 100644 --- 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 { 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 index 7b7cb105..46155f9a 100644 --- 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 index 5d811224..9d4337c9 100644 --- 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 } }