Bump JobDSL dependency to 1.50; fix unit tests by adding a test-only …

…ctor; fix compilation.
ghale · Nov 30, 2016 · ab117d5 · ab117d5
1 parent 203020d
commit ab117d5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -49,11 +49,13 @@ dependencies {
         'xmlunit:xmlunit:1.3'
     )
 
+    compile('org.jenkins-ci:version-number:1.1')
+
     compile('org.codehaus.groovy.modules.http-builder:http-builder:0.7.2') {
         exclude(module: 'groovy')
     }
 
-    compile('org.jenkins-ci.plugins:job-dsl-core:1.46') {
+    compile('org.jenkins-ci.plugins:job-dsl-core:1.50') {
         exclude(module: 'groovy-all')
     }
 

diff --git a/src/main/groovy/com/terrafolio/gradle/plugins/jenkins/jobdsl/MapJobManagement.groovy b/src/main/groovy/com/terrafolio/gradle/plugins/jenkins/jobdsl/MapJobManagement.groovy
@@ -68,11 +68,6 @@ class MapJobManagement extends AbstractJobManagement {
     void requireMinimumPluginVersion(String pluginShortName, String version, boolean failIfMissing) {
     }
 
-    @Override
-    VersionNumber getPluginVersion(String pluginShortName){
-        return null
-    }
-
     @Override
     Integer getVSphereCloudHash(String name){
         return null
@@ -124,11 +119,6 @@ class MapJobManagement extends AbstractJobManagement {
     @Override
     void requireMinimumCoreVersion(String version) { }
 
-    @Override
-    VersionNumber getJenkinsVersion() {
-        return null
-    }
-
     @Override
     Set<String> getPermissions(String authorizationMatrixPropertyClassName) {
         return null

diff --git a/src/main/groovy/com/terrafolio/gradle/plugins/jenkins/service/JenkinsRESTServiceImpl.groovy b/src/main/groovy/com/terrafolio/gradle/plugins/jenkins/service/JenkinsRESTServiceImpl.groovy
@@ -1,5 +1,6 @@
 package com.terrafolio.gradle.plugins.jenkins.service
 
+import com.google.common.annotations.VisibleForTesting
 import groovy.xml.StreamingMarkupBuilder
 import groovyx.net.http.HttpResponseException
 import groovyx.net.http.RESTClient
@@ -22,6 +23,10 @@ class JenkinsRESTServiceImpl implements JenkinsService {
         this.url = url
     }
 
+    @VisibleForTesting
+    public JenkinsRESTServiceImpl() {
+    }
+
     def getRestClient() {
         if (client == null) {
             client = new RESTClient(url)