diff --git a/README.adoc b/README.adoc index b8114488e7..fcfbc89aff 100644 --- a/README.adoc +++ b/README.adoc @@ -229,7 +229,10 @@ Stub Runner` properties, as shown in the following example: + [source,yaml,indent=0] ---- -Unresolved directive in verifier_introduction.adoc - include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/2.1.x/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml[] +stubrunner: + ids: 'com.example:http-server-dsl:+:stubs:8080' + repositoryRoot: https://repo.spring.io/libs-snapshot +---- Now you can annotate your test class with `@AutoConfigureStubRunner`. In the annotation, provide the `group-id` and `artifact-id` values for `Spring Cloud Contract Stub Runner` to @@ -557,7 +560,10 @@ Runner` properties, as shown in the following example: + [source,yaml,indent=0] ---- -Unresolved directive in verifier_introduction.adoc - include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/2.1.x/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml[] +stubrunner: + ids: 'com.example:http-server-dsl:+:stubs:8080' + repositoryRoot: https://repo.spring.io/libs-snapshot +---- Now you can annotate your test class with `@AutoConfigureStubRunner`. In the annotation, provide the `group-id` and `artifact-id` for `Spring Cloud Contract Stub Runner` to run @@ -1504,7 +1510,10 @@ achieving the same thing by changing the properties. [source,yaml,indent=0] ---- -Unresolved directive in verifier_introduction.adoc - include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-contract/2.1.x/samples/standalone/dsl/http-client/src/test/resources/application-test-repo.yaml[] +stubrunner: + ids: 'com.example:http-server-dsl:+:stubs:8080' + repositoryRoot: https://repo.spring.io/libs-snapshot +---- That's it! @@ -1903,8 +1912,8 @@ public class ApplicationTests { mockMvc.perform(post("/resource") .content("{\"id\":\"123456\",\"message\":\"Hello World\"}")) .andExpect(status().isOk()) - .andDo(verify().jsonPath("$.id") - .stub("resource")); + .andDo(verify().jsonPath("$.id")) + .andDo(document("resource")); } } ---- @@ -1929,8 +1938,8 @@ following example: .andDo(verify() .wiremock(WireMock.post( urlPathEquals("/resource")) - .withRequestBody(matchingJsonPath("$.id")) - .stub("post-resource")); + .withRequestBody(matchingJsonPath("$.id"))) + .andDo(document("post-resource")); } ---- @@ -1998,8 +2007,7 @@ Consider the following test: // first WireMock .andDo(WireMockRestDocs.verify().jsonPath("$[?(@.foo >= 20)]") .jsonPath("$[?(@.bar in ['baz','bazz','bazzz'])]") - .contentType(MediaType.valueOf("application/json")) - .stub("shouldGrantABeerIfOldEnough")) + .contentType(MediaType.valueOf("application/json"))) // then Contract DSL documentation .andDo(document("index", SpringCloudContractRestDocs.dslContract())); ---- @@ -2051,7 +2059,186 @@ You can read more about Spring Cloud Contract Verifier by reading the == Contributing -Unresolved directive in README.adoc - include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[] +:spring-cloud-build-branch: master + +Spring Cloud is released under the non-restrictive Apache 2.0 license, +and follows a very standard Github development process, using Github +tracker for issues and merging pull requests into master. If you want +to contribute even something trivial please do not hesitate, but +follow the guidelines below. + +=== Sign the Contributor License Agreement +Before we accept a non-trivial patch or pull request we will need you to sign the +https://cla.pivotal.io/sign/spring[Contributor License Agreement]. +Signing the contributor's agreement does not grant anyone commit rights to the main +repository, but it does mean that we can accept your contributions, and you will get an +author credit if we do. Active contributors might be asked to join the core team, and +given the ability to merge pull requests. + +=== Code of Conduct +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of +conduct]. By participating, you are expected to uphold this code. Please report +unacceptable behavior to spring-code-of-conduct@pivotal.io. + +=== Code Conventions and Housekeeping +None of these is essential for a pull request, but they will all help. They can also be +added after the original pull request but before a merge. + +* Use the Spring Framework code format conventions. If you use Eclipse + you can import formatter settings using the + `eclipse-code-formatter.xml` file from the + https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring + Cloud Build] project. If using IntelliJ, you can use the + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + Plugin] to import the same file. +* Make sure all new `.java` files to have a simple Javadoc class comment with at least an + `@author` tag identifying you, and preferably at least a paragraph on what the class is + for. +* Add the ASF license header comment to all new `.java` files (copy from existing files + in the project) +* Add yourself as an `@author` to the .java files that you modify substantially (more + than cosmetic changes). +* Add some Javadocs and, if you change the namespace, some XSD doc elements. +* A few unit tests would help a lot as well -- someone has to do it. +* If no-one else is using your branch, please rebase it against the current master (or + other target branch in the main project). +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], + if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit + message (where XXXX is the issue number). + +=== Checkstyle + +Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are: + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    └── checkstyle.xml <1> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules + +==== Checkstyle configuration + +Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins. + +.pom.xml +---- + +true <1> + true + <2> + true + <3> + + + + + <4> + io.spring.javaformat + spring-javaformat-maven-plugin + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + +---- +<1> Fails the build upon Checkstyle errors +<2> Fails the build upon Checkstyle violations +<3> Checkstyle analyzes also the test sources +<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules +<5> Add checkstyle plugin to your build and reporting phases + +If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example: + +.projectRoot/src/checkstyle/checkstyle-suppresions.xml +---- + + + + + + +---- + +It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script: + +```bash +$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig +$ touch .springformat +``` + +=== IDE setup + +==== Intellij IDEA + +In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. +The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    ├── checkstyle.xml <1> +    └── intellij +       ├── Intellij_Project_Defaults.xml <4> +       └── Intellij_Spring_Boot_Java_Conventions.xml <5> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules +<4> Project defaults for Intellij that apply most of Checkstyle rules +<5> Project style conventions for Intellij that apply most of Checkstyle rules + +.Code style + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file. + +.Inspection profiles + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file. + +.Checkstyle + +To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle] + +Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables: + +- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. +- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. +- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`. + +IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. + == How to build it IMPORTANT: You need to have all the necessary Groovy plugins diff --git a/docker/pom.xml b/docker/pom.xml index f01ab072bd..e844b0c7fc 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-docker-parent pom - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE Spring Cloud Contract Docker Parent Spring Cloud Contract Docker Parent diff --git a/docker/spring-cloud-contract-docker/pom.xml b/docker/spring-cloud-contract-docker/pom.xml index 932e91fed7..1796141cb3 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-docker pom - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE Spring Cloud Contract Docker Spring Cloud Contract Docker diff --git a/docker/spring-cloud-contract-docker/project/gradle.properties b/docker/spring-cloud-contract-docker/project/gradle.properties index 8ad5f4903e..1ec8028429 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,2 +1,2 @@ org.gradle.daemon=false -verifierVersion=2.1.5.BUILD-SNAPSHOT +verifierVersion=2.1.5.RELEASE diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index fb4bf1dfb1..9d98d50a0b 100644 --- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml +++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-docker pom - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index 22013e68a4..67b4ec0c86 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-docs diff --git a/pom.xml b/pom.xml index 7fc548860c..a400f95078 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.1.10.BUILD-SNAPSHOT + 2.1.10.RELEASE spring-cloud-contract-parent pom - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE Spring Cloud Contract Spring Cloud Contract @@ -28,12 +28,12 @@ 2.17 3.5.13 0.0.9 - 2.1.10.BUILD-SNAPSHOT - 2.1.5.BUILD-SNAPSHOT + 2.1.10.RELEASE + 2.1.4.RELEASE Fishtown.SR4 - 2.1.5.BUILD-SNAPSHOT - 2.1.5.BUILD-SNAPSHOT - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE + 2.1.5.RELEASE + 2.1.5.RELEASE 5.0.3 3.2.9 1.0-groovy-2.4 diff --git a/samples/pom.xml b/samples/pom.xml index c8d05b7857..cd87eb85e8 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-samples pom - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 6a00b0d12f..3f2fe88de5 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-samples-standalone pom - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE Spring Cloud Contract Standalone Test Samples Spring Cloud Contract Standalone Test Samples used for end to end tests diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index 8dd970224b..a07e65a98e 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE jar wiremock-jetty @@ -21,7 +21,7 @@ UTF-8 1.8 - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index aed393dea4..1985847b9a 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE jar wiremock-native @@ -21,7 +21,7 @@ UTF-8 1.8 - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 5c74cff46e..81cc502d38 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE jar wiremock-tomcat @@ -21,7 +21,7 @@ UTF-8 1.8 - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index 323ceb00af..d3b7502caa 100644 --- a/samples/wiremock-undertow-ssl/pom.xml +++ b/samples/wiremock-undertow-ssl/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow-ssl - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE jar wiremock-undertow-ssl @@ -21,7 +21,7 @@ UTF-8 1.8 - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 4698d0e43f..400c61ef9f 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE jar wiremock-undertow @@ -21,7 +21,7 @@ UTF-8 1.8 - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index f78d9d5fdd..c849970b0d 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE jar wiremock @@ -21,7 +21,7 @@ UTF-8 1.8 - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 34c48aae2a..c09e3233fd 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.10.BUILD-SNAPSHOT + 2.1.10.RELEASE spring-cloud-contract-dependencies - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE pom spring-cloud-contract-dependencies Spring Cloud Contract Dependencies diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml index 4ae2ecd9b6..1ff82ea725 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-spec/pom.xml b/spring-cloud-contract-spec/pom.xml index 0c9f9533fd..18e47a5270 100644 --- a/spring-cloud-contract-spec/pom.xml +++ b/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-spec diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index f653811aa3..3df568c114 100644 --- a/spring-cloud-contract-starters/pom.xml +++ b/spring-cloud-contract-starters/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml index 563aa29030..0a0303243a 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-starters - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-starter-contract-stub-runner-jetty diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml index 219b9a520e..433aaa394e 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-contract-starters - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-starter-contract-stub-runner diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml index 743ddcbc07..ebb5764843 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-starters - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-starter-contract-verifier diff --git a/spring-cloud-contract-stub-runner-boot/pom.xml b/spring-cloud-contract-stub-runner-boot/pom.xml index c1a4d63ad4..a67fdee8ec 100644 --- a/spring-cloud-contract-stub-runner-boot/pom.xml +++ b/spring-cloud-contract-stub-runner-boot/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-boot diff --git a/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/pom.xml index a8eb5b666d..e9703e46e1 100644 --- a/spring-cloud-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-stub-runner/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 85ea2e8032..42336a0d80 100644 --- a/spring-cloud-contract-tools/pom.xml +++ b/spring-cloud-contract-tools/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml index 85086d2297..cf7f9a4b65 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-converters 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 c783bd67c2..0442f46f2c 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 @@ -15,7 +15,7 @@ # nexusUsername= nexusPassword= -verifierVersion=2.1.5.BUILD-SNAPSHOT +verifierVersion=2.1.5.RELEASE org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=2.1.10.BUILD-SNAPSHOT +springCloudBuildVersion=2.1.10.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml index a999ae394f..bc5ac9cc45 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties index 4976fc9555..e1f92a0ff7 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.5.BUILD-SNAPSHOT +verifierVersion=2.1.5.RELEASE groovyVersion=2.4.15 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties index d43cece332..199e3d3930 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.5.BUILD-SNAPSHOT +verifierVersion=2.1.5.RELEASE bootVersion=2.1.10.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties index d43cece332..199e3d3930 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.5.BUILD-SNAPSHOT +verifierVersion=2.1.5.RELEASE bootVersion=2.1.10.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties index 2dc35b3f03..c941b45dd5 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties @@ -15,6 +15,6 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.5.BUILD-SNAPSHOT +verifierVersion=2.1.5.RELEASE bootVersion=2.1.10.RELEASE groovyVersion=2.4.15 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml index 071a10da27..9ba44bb81e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index 0455b43567..2c8de2bc2a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. @@ -47,7 +47,7 @@ 1.13.7 - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE 2016 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml index fbd02bd4cc..c02c2f1d19 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index 3cbedfb378..d7ede8fee7 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index 284f2548f7..68692c0481 100644 --- a/spring-cloud-contract-wiremock/pom.xml +++ b/spring-cloud-contract-wiremock/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index ee809cd176..3120fa2428 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index edf5a7276a..156761f8f7 100644 --- a/tests/samples-messaging-amqp/pom.xml +++ b/tests/samples-messaging-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 141565749d..a5d51b0818 100644 --- a/tests/samples-messaging-camel/pom.xml +++ b/tests/samples-messaging-camel/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index 1b1d8fbf1f..7d2a77bfcc 100644 --- a/tests/samples-messaging-integration/pom.xml +++ b/tests/samples-messaging-integration/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index c285c11c04..77f6de3a17 100644 --- a/tests/samples-messaging-stream/pom.xml +++ b/tests/samples-messaging-stream/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-sample-stream diff --git a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml index 6938a0473a..40e072c183 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-amqp diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml index a64e9bb0a6..fc950f4e07 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-boot-eureka diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml index f69febc188..2796409407 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-boot-zookeeper diff --git a/tests/spring-cloud-contract-stub-runner-camel/pom.xml b/tests/spring-cloud-contract-stub-runner-camel/pom.xml index 82a7d65205..24a373d85f 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-camel/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-camel diff --git a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml index 6a4379929e..1fa1b101ad 100644 --- a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-context-path diff --git a/tests/spring-cloud-contract-stub-runner-integration/pom.xml b/tests/spring-cloud-contract-stub-runner-integration/pom.xml index 09e03ee932..fb0b427781 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-integration/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml index 2ea85e2e3f..6b6208ef55 100644 --- a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-moco-contract-jar diff --git a/tests/spring-cloud-contract-stub-runner-moco/pom.xml b/tests/spring-cloud-contract-stub-runner-moco/pom.xml index d8adb34de4..7cf598ec97 100644 --- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-moco diff --git a/tests/spring-cloud-contract-stub-runner-stream/pom.xml b/tests/spring-cloud-contract-stub-runner-stream/pom.xml index 2549ca1fc6..769acae87f 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-stream/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE .. spring-cloud-contract-stub-runner-stream