Fix #143: Add full class name

Praqma · Mar 24, 2017 · 7e48026 · 7e48026
1 parent 65211f8
commit 7e48026
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 21 deletions.
diff --git a/dockerizeit/master/artifactory.groovy b/dockerizeit/master/artifactory.groovy
@@ -1,14 +1,12 @@
 import java.lang.System
 import hudson.model.*
 import jenkins.model.*
-import com.cloudbees.plugins.credentials.CredentialsProvider
-import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials
 
 def home_dir = System.getenv("JENKINS_HOME")
 def properties = new ConfigSlurper().parse(new File("$home_dir/jenkins.properties").toURI().toURL())
 
 def getPasswordCredentials(String id) {
-  def all = CredentialsProvider.lookupCredentials(StandardUsernameCredentials.class)
+  def all = com.cloudbees.plugins.credentials.CredentialsProvider.lookupCredentials(com.cloudbees.plugins.credentials.common.StandardUsernameCredentials.class)
   return all.findResult { it.id == id ? it : null }
 }
 
@@ -17,8 +15,10 @@ properties.artifactory.each() { configName, serverConfig ->
     println "--> Configure Artifactory: Server ${serverConfig.serverName}"
     def inst = Jenkins.getInstance()
     def desc = inst.getDescriptor("org.jfrog.hudson.ArtifactoryBuilder")
+
     def deployerCredentials = new org.jfrog.hudson.CredentialsConfig(getPasswordCredentials(serverConfig.deployerCredentialsId),
                                                                   serverConfig.deployerCredentialsId,
+                                                                  serverConfig.overridingCredentials)
     def resolverCredentials = new org.jfrog.hudson.CredentialsConfig(getPasswordCredentials(serverConfig.deployerCredentialsId),
                                                                   serverConfig.deployerCredentialsId,
                                                                   serverConfig.overridingCredentials)

diff --git a/dockerizeit/master/globalPipelineLibraries.groovy b/dockerizeit/master/globalPipelineLibraries.groovy
@@ -1,29 +1,26 @@
 import java.lang.System
 import hudson.model.*
-import hudson.plugins.git.GitSCM
-import org.jenkinsci.plugins.workflow.libs.*
-import hudson.plugins.git.*
 import java.util.Collections
 import java.util.List
 
 def home_dir = System.getenv("JENKINS_HOME")
 def properties = new ConfigSlurper().parse(new File("$home_dir/jenkins.properties").toURI().toURL())
 
-GlobalLibraries gl = GlobalLibraries.get()
-List<LibraryConfiguration> configs = new ArrayList<LibraryConfiguration>()
+def gl = org.jenkinsci.plugins.workflow.libs.GlobalLibraries.get()
+def configs = new ArrayList<org.jenkinsci.plugins.workflow.libs.LibraryConfiguration>()
 
 properties.libraries.each() { key, value ->
 	if(value.enabled) {
 		println "--> Configure Pipeline shared groovy library: ${value.name}"
-		List<UserRemoteConfig> userRemoteList = new ArrayList<UserRemoteConfig>()
-		userRemoteList.add(new UserRemoteConfig(value.scm_path, "", "", value.credentialsId))
-		List<BranchSpec> branches = Collections.singletonList(new BranchSpec(value.branch))
+		def userRemoteList = new ArrayList<hudson.plugins.git.UserRemoteConfig>()
+		userRemoteList.add(new hudson.plugins.git.UserRemoteConfig(value.scm_path, "", "", value.credentialsId))
+		def branches = Collections.singletonList(new hudson.plugins.git.BranchSpec(value.branch))
 		println(userRemoteList)
-		GitSCM gitSCM = new GitSCM(userRemoteList,
+		def gitSCM = new hudson.plugins.git.GitSCM(userRemoteList,
 		                           branches,
 		                           false,
 		                           null, null, null, null)
-		LibraryConfiguration globalConfig = new LibraryConfiguration(value.name, new SCMRetriever(gitSCM))
+		def globalConfig = new org.jenkinsci.plugins.workflow.libs.LibraryConfiguration(value.name, new org.jenkinsci.plugins.workflow.libs.SCMRetriever(gitSCM))
 		globalConfig.setDefaultVersion(value.version)
 		globalConfig.setImplicit(value.implicitly)
 		globalConfig.setAllowVersionOverride(value.allow_overridden)

diff --git a/dockerizeit/master/matrixbasedsecurity.groovy b/dockerizeit/master/matrixbasedsecurity.groovy
@@ -1,6 +1,5 @@
 import java.lang.System
 import jenkins.model.*
-import hudson.security.*
 import org.jenkinsci.plugins.*
 import hudson.model.*
 
@@ -9,7 +8,7 @@ def properties = new ConfigSlurper().parse(new File("${home_dir}/security.proper
 
 if(properties.matrixbasedsecurity.enabled){
   println "--> Configure Matrix-Based security"
-  def strategy = new GlobalMatrixAuthorizationStrategy()
+  def strategy = new hudson.security.GlobalMatrixAuthorizationStrategy()
 
   properties.matrixbasedsecurity.users.each() { key, value ->
     value.permissions.each() {

diff --git a/dockerizeit/master/securityAD.groovy b/dockerizeit/master/securityAD.groovy
@@ -8,7 +8,7 @@ def properties = new ConfigSlurper().parse(new File("$home_dir/security.properti
 
 if(properties.ad.enabled) {
   println "--> Configure AD"
-  ActiveDirectorySecurityRealm realm = new ActiveDirectorySecurityRealm(properties.ad.domain,
+  def realm = new hudson.plugins.active_directory.ActiveDirectorySecurityRealm(properties.ad.domain,
                                                                         Lists.newArrayList(new ActiveDirectoryDomain(properties.ad.domain, properties.ad.server)),
                                                                         properties.ad.site,
                                                                         properties.ad.bindName,

diff --git a/dockerizeit/master/securityGoogleLogin.groovy b/dockerizeit/master/securityGoogleLogin.groovy
@@ -1,15 +1,14 @@
 import java.lang.System
 import jenkins.model.*
 import hudson.security.*
-import org.jenkinsci.plugins.googlelogin.GoogleOAuth2SecurityRealm
 
 def home_dir = System.getenv("JENKINS_HOME")
 def properties = new ConfigSlurper().parse(new File("$home_dir/security.properties").toURI().toURL())
 
 if(properties.googlelogin.enabled) {
     println '--> Configure Google Login'
     def secretFile = new File(properties.googlelogin.clientSecret)
-    SecurityRealm googleLogin_realm = new GoogleOAuth2SecurityRealm(properties.googlelogin.clientId,
+    def googleLogin_realm = new org.jenkinsci.plugins.googlelogin.GoogleOAuth2SecurityRealm(properties.googlelogin.clientId,
             secretFile.text.trim(),
             properties.googlelogin.domain)
     Jenkins.instance.setSecurityRealm(googleLogin_realm)

diff --git a/dockerizeit/master/securityLDAP.groovy b/dockerizeit/master/securityLDAP.groovy
@@ -1,14 +1,13 @@
 import java.lang.System
 import jenkins.model.*
-import hudson.security.*
 import org.jenkinsci.plugins.*
 
 def home_dir = System.getenv("JENKINS_HOME")
 def properties = new ConfigSlurper().parse(new File("$home_dir/security.properties").toURI().toURL())
 
 if(properties.ldap.enabled) {
   println "--> Configure LDAP"
-  SecurityRealm ldap_realm = new LDAPSecurityRealm(properties.ldap.server,
+  def ldap_realm = new hudson.security.LDAPSecurityRealm(properties.ldap.server,
                                                    properties.ldap.rootDN,
                                                    properties.ldap.userSearchBase,
                                                    properties.ldap.userSearch,

diff --git a/dockerizeit/master/slack.groovy b/dockerizeit/master/slack.groovy
@@ -1,7 +1,6 @@
 import java.lang.System
 import jenkins.model.*
 import hudson.security.*
-import jenkins.plugins.slack.SlackNotifier.*
 
 def home_dir = System.getenv("JENKINS_HOME")
 def properties = new ConfigSlurper().parse(new File("$home_dir/jenkins.properties").toURI().toURL())