fixed support for core versions >= 2.64

[FIXES JENKINS-46899]
jenkinsci · Oct 28, 2017 · 9ac666d · 9ac666d
1 parent 0720d28
commit 9ac666d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## 0.24.0 (unreleased)
 
+  * fixed support for core versions >= 2.64
+    ([JENKINS-46899](https://issues.jenkins-ci.org/browse/JENKINS-46899))
+
 ## 0.23.1 (2017-10-10)
 
   * updated to Gradle 3.5.1

diff --git a/src/main/groovy/org/jenkinsci/gradle/plugins/jpi/JpiExtension.groovy b/src/main/groovy/org/jenkinsci/gradle/plugins/jpi/JpiExtension.groovy
@@ -169,11 +169,18 @@ class JpiExtension {
 
                 jenkinsWar(group: 'org.jenkins-ci.main', name: 'jenkins-war', version: v, ext: 'war')
 
+                if (new VersionNumber(this.coreVersion) < new VersionNumber('2.64')) {
+                    jenkinsTest("org.jenkins-ci.main:jenkins-war:${v}:war-for-test")
+                }
+
                 jenkinsTest("org.jenkins-ci.main:jenkins-test-harness:${testHarnessVersion}")
                 jenkinsTest("org.jenkins-ci.main:ui-samples-plugin:${uiSamplesVersion}",
-                        "org.jenkins-ci.main:jenkins-war:${v}:war-for-test",
                         'junit:junit-dep:4.10')
             }
+
+            if (new VersionNumber(this.coreVersion) >= new VersionNumber('2.64')) {
+                project.configurations.jenkinsTest.extendsFrom(project.configurations.jenkinsWar)
+            }
         }
     }