diff --git a/README.adoc b/README.adoc index 0bbc88ed63..0a2c426aea 100644 --- a/README.adoc +++ b/README.adoc @@ -410,6 +410,74 @@ going through the process. CDC is all about communication. The https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/dsl/http-server[server side code is available here] and https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/dsl/http-client[the client side code here]. +===== Technical note + +If using the *SNAPSHOT* / *Milestone* / *Release Candidate* versions please add the following section to your + +Maven POM + +[source,xml,indent=0] +---- + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + https://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + https://repo.spring.io/release + + false + + + +---- + +Gradle build + +[source,groovy,indent=0] +---- +---- + ===== Consumer side (Loan Issuance) As a developer of the Loan Issuance service (a consumer of the Fraud Detection server): diff --git a/docs/src/main/asciidoc/verifier/introduction.adoc b/docs/src/main/asciidoc/verifier/introduction.adoc index 5451a8b16f..d5341a0cba 100644 --- a/docs/src/main/asciidoc/verifier/introduction.adoc +++ b/docs/src/main/asciidoc/verifier/introduction.adoc @@ -116,6 +116,24 @@ going through the process. CDC is all about communication. The https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/dsl/http-server[server side code is available here] and https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/dsl/http-client[the client side code here]. +===== Technical note + +If using the *SNAPSHOT* / *Milestone* / *Release Candidate* versions please add the following section to your + +Maven POM + +[source,xml,indent=0] +---- +include::{introduction_url}/samples/standalone/dsl/http-server/pom.xml[tags=repos,indent=0] +---- + +Gradle build + +[source,groovy,indent=0] +---- +include::{introduction_url}/samples/standalone/dsl/http-server/build.gradle[tags=deps_repos,indent=0] +---- + ===== Consumer side (Loan Issuance) As a developer of the Loan Issuance service (a consumer of the Fraud Detection server): diff --git a/samples/standalone/dsl/http-client/build.gradle b/samples/standalone/dsl/http-client/build.gradle index 383f8e79bb..b33e04329a 100644 --- a/samples/standalone/dsl/http-client/build.gradle +++ b/samples/standalone/dsl/http-client/build.gradle @@ -29,7 +29,6 @@ apply plugin: 'maven-publish' dependencyManagement { imports { mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION" - mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${project.findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties index 16ecbd2984..11810bdb9b 100644 --- a/samples/standalone/dsl/http-client/gradle.properties +++ b/samples/standalone/dsl/http-client/gradle.properties @@ -1,3 +1,2 @@ org.gradle.daemon=false -verifierVersion=1.0.0.BUILD-SNAPSHOT -BOM_VERSION=Brixton.SR5 \ No newline at end of file +BOM_VERSION=Camden.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index 535e5684fc..dd6e5965e2 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -20,7 +20,7 @@ UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT + Camden.BUILD-SNAPSHOT @@ -34,11 +34,6 @@ - - org.springframework.cloud - spring-cloud-contract-wiremock - test - org.springframework.cloud spring-cloud-starter-contract-stub-runner @@ -52,8 +47,8 @@ org.springframework.cloud - spring-cloud-contract-dependencies - ${spring-cloud-contract.version} + spring-cloud-dependencies + ${spring-cloud-dependencies.version} pom import diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle index 8d6a2ce3de..166444ac52 100644 --- a/samples/standalone/dsl/http-server/build.gradle +++ b/samples/standalone/dsl/http-server/build.gradle @@ -17,6 +17,7 @@ buildscript { group = 'com.example' version = '0.0.1-SNAPSHOT' +// tag::deps_repos[] repositories { mavenCentral() mavenLocal() @@ -24,6 +25,7 @@ repositories { maven { url "http://repo.spring.io/milestone" } maven { url "http://repo.spring.io/release" } } +// end::deps_repos[] apply plugin: 'groovy' apply plugin: 'spring-boot' @@ -33,7 +35,6 @@ apply plugin: 'maven-publish' dependencyManagement { imports { mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION" - mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${project.findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index 16ecbd2984..f05fafae14 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT -BOM_VERSION=Brixton.SR5 \ No newline at end of file +BOM_VERSION=Camden.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index 9565266463..c72d34c82a 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -21,6 +21,7 @@ UTF-8 1.8 1.0.0.BUILD-SNAPSHOT + Camden.BUILD-SNAPSHOT @@ -53,8 +54,8 @@ org.springframework.cloud - spring-cloud-contract-dependencies - ${spring-cloud-contract.version} + spring-cloud-dependencies + ${spring-cloud-dependencies.version} pom import diff --git a/samples/standalone/messaging/stream-sink/gradle.properties b/samples/standalone/messaging/stream-sink/gradle.properties index 16ecbd2984..f05fafae14 100644 --- a/samples/standalone/messaging/stream-sink/gradle.properties +++ b/samples/standalone/messaging/stream-sink/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT -BOM_VERSION=Brixton.SR5 \ No newline at end of file +BOM_VERSION=Camden.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/messaging/stream-sink/pom.xml b/samples/standalone/messaging/stream-sink/pom.xml index 2cd7750ae9..93707551f1 100644 --- a/samples/standalone/messaging/stream-sink/pom.xml +++ b/samples/standalone/messaging/stream-sink/pom.xml @@ -35,11 +35,6 @@ spring-cloud-starter-contract-stub-runner test - - org.springframework.cloud - spring-cloud-contract-wiremock - test - org.springframework.cloud spring-cloud-stream-test-support @@ -49,17 +44,10 @@ - - org.springframework.cloud - spring-cloud-contract-dependencies - ${spring-cloud-contract.version} - pom - import - org.springframework.cloud spring-cloud-dependencies - Brixton.SR5 + Camden.BUILD-SNAPSHOT pom import diff --git a/samples/standalone/messaging/stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle index 413afaa979..16add1a93e 100644 --- a/samples/standalone/messaging/stream-source/build.gradle +++ b/samples/standalone/messaging/stream-source/build.gradle @@ -31,7 +31,6 @@ apply plugin: 'maven-publish' dependencyManagement { imports { mavenBom "org.springframework.cloud:spring-cloud-dependencies:$BOM_VERSION" - mavenBom "org.springframework.cloud:spring-cloud-contract-dependencies:${project.findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/messaging/stream-source/gradle.properties b/samples/standalone/messaging/stream-source/gradle.properties index 16ecbd2984..f05fafae14 100644 --- a/samples/standalone/messaging/stream-source/gradle.properties +++ b/samples/standalone/messaging/stream-source/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT -BOM_VERSION=Brixton.SR5 \ No newline at end of file +BOM_VERSION=Camden.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml index 3e80bcedcf..ec91aa6785 100644 --- a/samples/standalone/messaging/stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -48,17 +48,10 @@ - - org.springframework.cloud - spring-cloud-contract-dependencies - ${spring-cloud-contract.version} - pom - import - org.springframework.cloud spring-cloud-dependencies - Brixton.SR5 + Camden.BUILD-SNAPSHOT pom import diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties index 16ecbd2984..f05fafae14 100644 --- a/samples/standalone/restdocs/http-client/gradle.properties +++ b/samples/standalone/restdocs/http-client/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT -BOM_VERSION=Brixton.SR5 \ No newline at end of file +BOM_VERSION=Camden.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index 16ecbd2984..f05fafae14 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT -BOM_VERSION=Brixton.SR5 \ No newline at end of file +BOM_VERSION=Camden.BUILD-SNAPSHOT \ No newline at end of file