From b736cd9cf69b3d0a4ed07e9eed0d04a91dae2869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tommy=20B=C3=B8?= <TommyAndre.Bo@skatteetaten.no>
Date: Thu, 22 Jan 2015 15:11:42 +0100
Subject: [PATCH] Use client factory-method from the GitSCM-class

---
 .../gitparameter/GitParameterDefinition.java  | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinition.java b/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinition.java
index 60cf4d9..51f6040 100644
--- a/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinition.java
+++ b/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinition.java
@@ -8,12 +8,9 @@
 import hudson.plugins.git.GitException;
 import hudson.plugins.git.Revision;
 import hudson.plugins.git.GitSCM;
-import hudson.plugins.git.GitTool;
 import hudson.scm.SCM;
-import hudson.security.ACL;
 import hudson.util.ListBoxModel;
 
-import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -38,17 +35,12 @@
 import org.eclipse.jgit.transport.RemoteConfig;
 import org.eclipse.jgit.transport.URIish;
 import org.jenkinsci.plugins.gitclient.FetchCommand;
-import org.jenkinsci.plugins.gitclient.Git;
 import org.jenkinsci.plugins.gitclient.GitClient;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
 
-import com.cloudbees.plugins.credentials.CredentialsProvider;
-import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
-import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
-
 public class GitParameterDefinition extends ParameterDefinition implements
 		Comparable<GitParameterDefinition> {
 	private static final long serialVersionUID = 9157832967140868122L;
@@ -258,17 +250,6 @@ public Map<String, String> generateContents(AbstractProject<?, ?> project,
 			this.errorMessage = "noWorkspace";
 		}
 
-		String defaultGitExe = File.separatorChar != '/' ? "git.exe" : "git";
-		hudson.plugins.git.GitTool.DescriptorImpl descriptor = (hudson.plugins.git.GitTool.DescriptorImpl) Hudson
-				.getInstance().getDescriptor(GitTool.class);
-		GitTool[] installations = descriptor.getInstallations();
-		for (GitTool gt : installations) {
-			if (gt.getGitExe() != null) {
-				defaultGitExe = gt.getGitExe();
-				break;
-			}
-		}
-
 		EnvVars environment = null;
 
 		try {
@@ -281,13 +262,7 @@ public Map<String, String> generateContents(AbstractProject<?, ?> project,
 			LOGGER.log(Level.INFO, "generateContents contenttype " + type
 					+ " RemoteConfig " + repository.getURIs());
 			for (URIish remoteURL : repository.getURIs()) {
-				GitClient newgit = new Git(TaskListener.NULL, environment)
-						.using(defaultGitExe).in(project.getSomeWorkspace())
-						.getClient();
-				List<StandardUsernameCredentials> credentials = CredentialsProvider
-						.lookupCredentials(StandardUsernameCredentials.class,
-								project, ACL.SYSTEM, URIRequirementBuilder
-										.fromUri(remoteURL.toString()).build());
+				GitClient newgit = git.createClient(TaskListener.NULL, environment, new Run(project) {}, project.getSomeWorkspace());
 				FilePath wsDir = null;
 				if (project.getSomeBuildWithWorkspace() != null) {
 					wsDir = project.getSomeBuildWithWorkspace().getWorkspace();
@@ -314,10 +289,6 @@ public Map<String, String> generateContents(AbstractProject<?, ?> project,
 					String errMsg = "!No workspace. Please build the project at least once";
 					return Collections.singletonMap(errMsg, errMsg);
 				}
-				for (StandardUsernameCredentials aCredential : credentials) {
-					newgit.setCredentials(aCredential);
-					LOGGER.log(Level.INFO, "getSomeBuildWithWorkspace setCredentials "+ aCredential.getDescription());
-				}
 
 				FetchCommand fetch = newgit.fetch_().from(remoteURL,
 						repository.getFetchRefSpecs());