From 61c789a3768610f0a8eea28c1fb61a399e2b1e31 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 20 Nov 2017 11:47:54 +0100 Subject: [PATCH 1/3] Preparing for releaser GA release --- config/releaser.yml | 2 +- scripts/generateDocs.sh | 4 ++-- scripts/noIntegration.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/releaser.yml b/config/releaser.yml index 3b7005f0ac..547cd9982c 100644 --- a/config/releaser.yml +++ b/config/releaser.yml @@ -1,3 +1,3 @@ -releaser.maven.buildCommand: ./scripts/noIntegration.sh +releaser.maven.buildCommand: ./scripts/noIntegration.sh {{systemProps}} releaser.gradle.gradlePropsSubstitution: verifierVersion: spring-cloud-contract \ No newline at end of file diff --git a/scripts/generateDocs.sh b/scripts/generateDocs.sh index c730dd17c3..25cb77e07d 100755 --- a/scripts/generateDocs.sh +++ b/scripts/generateDocs.sh @@ -7,10 +7,10 @@ set -e echo "Generating docs for Spring Cloud Contract" echo "Building main docs" -./mvnw clean install -P docs -DskipTests=true --pl docs +./mvnw clean install -P docs -DskipTests=true --pl docs "${@}" echo "Building maven plugin docs" -./mvnw site -DskipTests=true --pl spring-cloud-contract-tools/spring-cloud-contract-maven-plugin +./mvnw site -DskipTests=true --pl spring-cloud-contract-tools/spring-cloud-contract-maven-plugin "${@}" echo "Copying generated maven plugin docs to main docs" cp -r spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/target/site docs/target/generated-docs/spring-cloud-contract-maven-plugin \ No newline at end of file diff --git a/scripts/noIntegration.sh b/scripts/noIntegration.sh index ce46fbd90e..81f07dec68 100755 --- a/scripts/noIntegration.sh +++ b/scripts/noIntegration.sh @@ -6,5 +6,5 @@ FOLDER=`pwd` set -e -./mvnw clean install -${FOLDER}/scripts/generateDocs.sh \ No newline at end of file +./mvnw clean install "${@}" +${FOLDER}/scripts/generateDocs.sh "${@}" \ No newline at end of file From 8b69916754e5e4a2870c21784d4d140d3259e492 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 20 Nov 2017 11:48:48 +0100 Subject: [PATCH 2/3] Preparing for releaser GA release --- scripts/generateDocs.sh | 4 ++-- scripts/noIntegration.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/generateDocs.sh b/scripts/generateDocs.sh index 25cb77e07d..cf55f0fe64 100755 --- a/scripts/generateDocs.sh +++ b/scripts/generateDocs.sh @@ -7,10 +7,10 @@ set -e echo "Generating docs for Spring Cloud Contract" echo "Building main docs" -./mvnw clean install -P docs -DskipTests=true --pl docs "${@}" +./mvnw clean install -P docs -DskipTests=true --pl docs ${@} echo "Building maven plugin docs" -./mvnw site -DskipTests=true --pl spring-cloud-contract-tools/spring-cloud-contract-maven-plugin "${@}" +./mvnw site -DskipTests=true --pl spring-cloud-contract-tools/spring-cloud-contract-maven-plugin ${@} echo "Copying generated maven plugin docs to main docs" cp -r spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/target/site docs/target/generated-docs/spring-cloud-contract-maven-plugin \ No newline at end of file diff --git a/scripts/noIntegration.sh b/scripts/noIntegration.sh index 81f07dec68..e8dad9c611 100755 --- a/scripts/noIntegration.sh +++ b/scripts/noIntegration.sh @@ -6,5 +6,5 @@ FOLDER=`pwd` set -e -./mvnw clean install "${@}" -${FOLDER}/scripts/generateDocs.sh "${@}" \ No newline at end of file +./mvnw clean install ${@} +${FOLDER}/scripts/generateDocs.sh ${@} \ No newline at end of file From c354bffafbd37ad1da4d80294521445420634bf4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 21 Nov 2017 16:35:22 +0100 Subject: [PATCH 3/3] Lower the logging level where password can be printed; fixes #463 --- .../cloud/contract/stubrunner/AetherStubDownloader.java | 6 ++++-- .../cloud/contract/stubrunner/ContractDownloader.java | 4 +++- .../contract/maven/verifier/MavenContractsDownloader.java | 6 ++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java index df65bb11af..fb1743ae79 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java @@ -162,8 +162,10 @@ public class AetherStubDownloader implements StubDownloader { Artifact artifact = new DefaultArtifact(stubsGroup, stubsModule, classifier, ARTIFACT_EXTENSION, resolvedVersion); ArtifactRequest request = new ArtifactRequest(artifact, this.remoteRepos, null); - log.info("Resolving artifact [" + artifact - + "] using remote repositories " + this.remoteRepos); + if (log.isDebugEnabled()) { + log.debug("Resolving artifact [" + artifact + + "] using remote repositories " + this.remoteRepos); + } try { ArtifactResult result = this.repositorySystem.resolveArtifact(this.session, request); log.info("Resolved artifact [" + artifact + "] to " diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ContractDownloader.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ContractDownloader.java index 58ab469c77..539c7e5c6e 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ContractDownloader.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ContractDownloader.java @@ -92,7 +92,9 @@ public class ContractDownloader { } private File unpackAndDownloadContracts() { - log.info("Will download contracts for [" + this.contractsJarStubConfiguration + "]"); + if (log.isDebugEnabled()) { + log.debug("Will download contracts for [" + this.contractsJarStubConfiguration + "]"); + } Map.Entry unpackedContractStubs = this.stubDownloader .downloadAndUnpackStubJar(this.contractsJarStubConfiguration); if (unpackedContractStubs == null) { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/MavenContractsDownloader.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/MavenContractsDownloader.java index fd84ae439a..7c9b27b4ab 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/MavenContractsDownloader.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/MavenContractsDownloader.java @@ -87,8 +87,10 @@ class MavenContractsDownloader { private StubDownloader stubDownloader() { StubDownloaderBuilder builder = this.stubDownloaderBuilderProvider.get(); if (StringUtils.hasText(this.contractsRepositoryUrl) || this.contractsWorkOffline) { - this.log.info("Will download contracts from [" + this.contractsRepositoryUrl + "]. " - + "Work offline switch equals to [" + this.contractsWorkOffline + "]"); + if (this.log.isDebugEnabled()) { + this.log.debug("Will download contracts from [" + this.contractsRepositoryUrl + "]. " + + "Work offline switch equals to [" + this.contractsWorkOffline + "]"); + } if (builder != null) { logStubDownloader(builder); return builder.build(buildOptions());