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

Fixed missing deprecation refactoring

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-11-13 12:13:46 +01:00
parent 930eb02191
commit e0e72c9c7f
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/spring-cloud-contract-docker/project/build.gradle
View File

@@ -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"

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy
View File

@@ -125,7 +125,7 @@ class SpringCloudContractVerifierGradlePlugin implements Plugin<Project> {
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

4
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle
View File

@@ -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"))