From 930eb02191f1534db4d52566154568368dbe0d44 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 13 Nov 2018 11:44:29 +0100 Subject: [PATCH] Removed deprecated contractRepositoryUrl prop; fixes gh-795 --- .../gradle.properties | 2 +- .../plugin/ContractVerifierExtension.groovy | 18 ------------ .../plugin/GradleContractsDownloader.groovy | 4 +-- ...ngCloudContractVerifierGradlePlugin.groovy | 3 +- .../GradleContractsDownloaderSpec.groovy | 28 ------------------- 5 files changed, 4 insertions(+), 51 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties index 93f13bf3c9..68f1e4f19d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties @@ -18,5 +18,5 @@ nexusUsername = nexusPassword = verifierVersion=2.1.0.BUILD-SNAPSHOT org.gradle.daemon=false -aetherVersion=1.0.2.v20150114 +aetherVersion=1.1.0 springCloudBuildVersion=2.1.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierExtension.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierExtension.groovy index 210d47c6ad..a0782551b2 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierExtension.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierExtension.groovy @@ -127,24 +127,6 @@ class ContractVerifierExtension { */ Boolean assertJsonSize = false - /** - * The URL from which a JAR containing the contracts should get downloaded. If not provided - * but artifactid / coordinates notation was provided then the current Maven's build repositories will be - * taken into consideration - * - * @deprecated - use {@link ContractVerifierExtension#contractRepository(groovy.lang.Closure)} - */ - @Deprecated - String contractsRepositoryUrl - - /* - * @deprecated - use {@link ContractVerifierExtension#contractRepository(groovy.lang.Closure)} - */ - @Deprecated - void setContractsRepositoryUrl(String contractsRepositoryUrl) { - this.contractRepository.repositoryUrl(contractsRepositoryUrl) - } - ContractRepository contractRepository = new ContractRepository() /** diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloader.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloader.groovy index a8b7f61bbd..40339b9820 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloader.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloader.groovy @@ -62,8 +62,8 @@ class GradleContractsDownloader { } private boolean shouldDownloadContracts(ContractVerifierExtension extension) { - return extension.contractDependency != null && - StringUtils.hasText(extension.contractDependency.getArtifactId()) || + return StringUtils.hasText(extension.contractDependency.getArtifactId()) || + StringUtils.hasText(extension.contractDependency.getStringNotation()) || StringUtils.hasText(extension.contractRepository.repositoryUrl) } 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 7e56e2e1dd..35d2e57b27 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 @@ -123,8 +123,7 @@ class SpringCloudContractVerifierGradlePlugin implements Plugin { stubsOutputDir = { extension.stubsOutputDir } } task.onlyIf { - String contractRepoUrl = extension.contractsRepositoryUrl ?: - extension.contractRepository.repositoryUrl ?: "" + 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") return false diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloaderSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloaderSpec.groovy index 24a83b1ebe..1d6c22dd8f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloaderSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/GradleContractsDownloaderSpec.groovy @@ -77,34 +77,6 @@ class GradleContractsDownloaderSpec extends Specification { stubConfig.classifier == "stubs" } - def "should pick dependency from cache for a non snapshot contract dependency with old property"() { - given: - ContractVerifierExtension ext = new ContractVerifierExtension() - ext.with { - contractsMode = StubRunnerProperties.StubsMode.REMOTE - contractDependency { - groupId("com.example") - artifactId("foo") - version("1.0.0") - classifier("stubs") - } - contractsRepositoryUrl = "foo" - } - and: - final AetherStubDownloader downloader = Mock(AetherStubDownloader) - final ContractDownloader contractDownloader = Mock(ContractDownloader) - and: - def gradleDownloader = stubbedContractDownloader(downloader, contractDownloader) - and: - StubConfiguration expectedStubConfig = new StubConfiguration("com.example:foo:1.0.0:stubs") - File expectedFileFromCache = new File("foo/bar") - GradleContractsDownloader.downloadedContract.put(expectedStubConfig, expectedFileFromCache) - when: - File file = gradleDownloader.downloadAndUnpackContractsIfRequired(ext, new ContractVerifierConfigProperties()) - then: - file == expectedFileFromCache - } - def "should pick dependency from cache for a non snapshot contract dependency with new property"() { given: ContractVerifierExtension ext = new ContractVerifierExtension()