diff --git a/docker/spring-cloud-contract-docker/project/build.gradle b/docker/spring-cloud-contract-docker/project/build.gradle index e7975be1ed..7400c5b0e7 100644 --- a/docker/spring-cloud-contract-docker/project/build.gradle +++ b/docker/spring-cloud-contract-docker/project/build.gradle @@ -65,8 +65,10 @@ contracts { // tests - contracts from an artifact contractsPath = getProp("EXTERNAL_CONTRACTS_PATH") ?: "" if (Boolean.parseBoolean(getProp("EXTERNAL_CONTRACTS_WORK_OFFLINE")) == false) { - contractsRepositoryUrl = getProp('EXTERNAL_CONTRACTS_REPO_WITH_BINARIES_URL') ?: - getProp('REPO_WITH_BINARIES_URL') ?: 'http://localhost:8081/artifactory/libs-release-local' + contractRepository { + repositoryUrl = getProp('EXTERNAL_CONTRACTS_REPO_WITH_BINARIES_URL') ?: + getProp('REPO_WITH_BINARIES_URL') ?: 'http://localhost:8081/artifactory/libs-release-local' + } } contractDependency { groupId = getProp("EXTERNAL_CONTRACTS_GROUP_ID") ?: "com.example" diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy index 35d2e57b27..3cf088d9ee 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy @@ -125,7 +125,7 @@ class SpringCloudContractVerifierGradlePlugin implements Plugin { task.onlyIf { String contractRepoUrl = extension.contractRepository.repositoryUrl ?: "" if (!contractRepoUrl || !ScmStubDownloaderBuilder.isProtocolAccepted(contractRepoUrl)) { - project.logger.info("Skipping pushing stubs to scm since your [contractsRepositoryUrl] property doesn't match any of the accepted protocols") + project.logger.info("Skipping pushing stubs to scm since your contracts repository URL doesn't match any of the accepted protocols") return false } return true diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle index 0de43ecc40..3919bd5c35 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle @@ -127,10 +127,12 @@ configure(project(':fraudDetectionService')) { testFramework ='Spock' testMode = 'JaxRsClient' baseClassForTests = 'org.springframework.cloud.MvcSpec' - contractsRepositoryUrl = "file://" + file("${project.rootDir.absolutePath}/m2repo/repository").absolutePath contractDependency { stringNotation("com.example:jersey-contracts:+:") } + contractRepository { + repositoryUrl = "file://" + file("${project.rootDir.absolutePath}/m2repo/repository").absolutePath + } generatedTestSourcesDir = file("${project.buildDir}/generated-test-sources/") stubsOutputDir = stubsOutputDirRoot disableStubPublication(project.hasProperty("disablePublication"))