SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2020-11-06 00:20:04 +00:00
parent 98597ca3eb
commit a45422c5d5
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java
View File

@@ -240,8 +240,7 @@ class GitRepo {
protected String sanitizeGitUrl(URI uri) {
String urlString = uri.toString();
return (urlString.endsWith(".git") || !this.ensureGitSuffix) ? urlString
: urlString + ".git";
return (urlString.endsWith(".git") || !this.ensureGitSuffix) ? urlString : urlString + ".git";
}
private Ref checkoutBranch(File projectDir, String branch) throws GitAPIException {

11
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java
View File

@@ -251,15 +251,12 @@ class GitStubDownloaderProperties {
this.password = StringUtils.hasText(password) ? password : options.getPassword();
String branch = StubRunnerPropertyUtils.getProperty(args, GIT_BRANCH_PROPERTY);
this.branch = StringUtils.hasText(branch) ? branch : "master";
String ensureGitSuffix = StubRunnerPropertyUtils.getProperty(args,
GIT_ENSURE_GIT_SUFFIX_PROPERTY);
this.ensureGitSuffix = StringUtils.hasText(ensureGitSuffix)
? Boolean.parseBoolean(ensureGitSuffix) : true;
String ensureGitSuffix = StubRunnerPropertyUtils.getProperty(args, GIT_ENSURE_GIT_SUFFIX_PROPERTY);
this.ensureGitSuffix = StringUtils.hasText(ensureGitSuffix) ? Boolean.parseBoolean(ensureGitSuffix) : true;
if (log.isDebugEnabled()) {
log.debug("Repo url is [" + repoUrl + "], modified url string " + "is ["
+ modifiedRepo + "] URL is [" + this.url + "] branch is ["
+ this.branch + "] and ensureGitSuffix is [" + this.ensureGitSuffix
log.debug("Repo url is [" + repoUrl + "], modified url string " + "is [" + modifiedRepo + "] URL is ["
+ this.url + "] branch is [" + this.branch + "] and ensureGitSuffix is [" + this.ensureGitSuffix
+ "]");
}
}