From a45422c5d5847fd9878e8436f7ec13adc28f98ae Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 6 Nov 2020 00:20:04 +0000 Subject: [PATCH] Bumping versions --- .../cloud/contract/stubrunner/GitRepo.java | 3 +-- .../contract/stubrunner/ScmStubDownloaderBuilder.java | 11 ++++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java index 2483de1327..85d40c6fb8 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java @@ -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 { diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java index 7893774188..c5e338ca62 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java @@ -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 + "]"); } }