From 6d44c54c8010b8bbb68d819359bafe3146eba878 Mon Sep 17 00:00:00 2001 From: Dominik Meister Date: Fri, 30 Oct 2020 09:32:25 +0100 Subject: [PATCH 1/6] Don't delete additional files before generating stubs on the fly (#1544) This behaviour did break contracts which include request or response bodies from separate files (via the `body(file(...))` directives). --- .../stubrunner/StubRunnerFactory.java | 44 +------------------ .../contract/stubrunner/StubRunnerSpec.groovy | 35 +++++++++++++-- .../wiremock/TestWireMockExtensions.groovy | 8 ++-- .../WireMockHttpServerStubSpec.groovy | 6 ++- .../contracts/goodbye_from_file.groovy | 28 ++++++++++++ .../contracts/goodbye_response.txt | 1 + .../generateStubs/contracts/hello.groovy | 28 ++++++++++++ .../{mappings => contracts}/hello.json | 0 8 files changed, 100 insertions(+), 50 deletions(-) create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/goodbye_from_file.groovy create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/goodbye_response.txt create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/hello.groovy rename spring-cloud-contract-stub-runner/src/test/resources/generateStubs/{mappings => contracts}/hello.json (100%) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java index f0e1cf9f81..32ec7c0244 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java @@ -18,12 +18,8 @@ package org.springframework.cloud.contract.stubrunner; import java.io.File; import java.io.IOException; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.Collection; import java.util.Map; @@ -32,8 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.cloud.contract.verifier.converter.RecursiveFilesConverter; -import org.springframework.cloud.contract.verifier.converter.StubGenerator; -import org.springframework.cloud.contract.verifier.converter.StubGeneratorProvider; import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; import org.springframework.core.io.Resource; @@ -94,12 +88,12 @@ class StubRunnerFactory { } private void generateMappingsAtRuntime(Path path) { - removeCurrentMappings(path); generateNewMappings(path); } private Path resolvePath(File unpackedLocation) { - Resource resource = ResourceResolver.resource(unpackedLocation.toURI().toString()); + Resource resource = ResourceResolver + .resource(unpackedLocation.toURI().toString()); Path path = unpackedLocation.toPath(); if (resource != null) { try { @@ -112,40 +106,6 @@ class StubRunnerFactory { return path; } - private void removeCurrentMappings(Path path) { - try { - Files.walkFileTree(path, new SimpleFileVisitor() { - - private final Log log = LogFactory.getLog(StubRunnerFactory.class); - - private final StubGeneratorProvider provider = new StubGeneratorProvider(); - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { - Collection stubGenerators = this.provider - .converterForName(file.toString()); - if (!stubGenerators.isEmpty()) { - if (log.isDebugEnabled()) { - log.debug("Deleting file [" + file.toString() - + "] since at least one stub generator would run it"); - } - try { - Files.delete(file); - } - catch (IOException ex) { - log.warn("Failed to delete file [" + file.toString() + "]", - ex); - } - } - return FileVisitResult.CONTINUE; - } - }); - } - catch (IOException ex) { - log.warn("Exception occurred while trying to delete mappings", ex); - } - } - private void generateNewMappings(Path path) { File unpackedLocation = path.toFile(); RecursiveFilesConverter converter = new RecursiveFilesConverter( diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerSpec.groovy index d583f78907..b2fa019598 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerSpec.groovy @@ -61,18 +61,45 @@ class StubRunnerSpec extends Specification { def 'should generate stubs at runtime'() { given: Arguments args = argumentsWithGenerateStubs() - StubDownloader downloader = new FileStubDownloader().build(args.stubRunnerOptions); + StubDownloader downloader = new FileStubDownloader().build(args.stubRunnerOptions) StubRunner runner = new StubRunnerFactory(args.stubRunnerOptions, downloader, new NoOpStubMessages()).createStubsFromServiceConfiguration().first() when: runner.runStubs() then: URL url = runner.findStubUrl("groupId2", "artifactId2") - new URL(url.toString() + "/goodbye").text + "Goodbye World!" == new URL(url.toString() + "/goodbye").text + cleanup: + runner.close() + } + + def 'should override existing mappings when generating stubs at runtime'() { + given: + Arguments args = argumentsWithGenerateStubs() + StubDownloader downloader = new FileStubDownloader().build(args.stubRunnerOptions) + StubRunner runner = new StubRunnerFactory(args.stubRunnerOptions, + downloader, new NoOpStubMessages()).createStubsFromServiceConfiguration().first() when: - new URL(url.toString() + "/hello").text + runner.runStubs() then: - thrown(FileNotFoundException) + URL url = runner.findStubUrl("groupId2", "artifactId2") + // don't return the response defined in hello.json, but the one defined in the contract + "Hello New World!" == new URL(url.toString() + "/hello").text + cleanup: + runner.close() + } + + def 'should handle contracts with body contents loaded from external file when generating stubs at runtime'() { + given: + Arguments args = argumentsWithGenerateStubs() + StubDownloader downloader = new FileStubDownloader().build(args.stubRunnerOptions) + StubRunner runner = new StubRunnerFactory(args.stubRunnerOptions, + downloader, new NoOpStubMessages()).createStubsFromServiceConfiguration().first() + when: + runner.runStubs() + then: + URL url = runner.findStubUrl("groupId2", "artifactId2") + "Goodbye from file!" == new URL(url.toString() + "/goodbye_from_file").text cleanup: runner.close() } diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/TestWireMockExtensions.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/TestWireMockExtensions.groovy index 91b1a5293e..bb69a4b1fc 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/TestWireMockExtensions.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/TestWireMockExtensions.groovy @@ -21,8 +21,10 @@ import com.github.tomakehurst.wiremock.extension.Extension import com.github.tomakehurst.wiremock.extension.Parameters import com.github.tomakehurst.wiremock.extension.ResponseTransformer import com.github.tomakehurst.wiremock.http.ChunkedDribbleDelay +import com.github.tomakehurst.wiremock.http.HttpHeader import com.github.tomakehurst.wiremock.http.Request import com.github.tomakehurst.wiremock.http.Response +import wiremock.org.apache.http.HttpHeaders import org.springframework.cloud.contract.verifier.dsl.wiremock.DefaultResponseTransformer import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockExtensions @@ -52,13 +54,13 @@ class CustomExtension extends ResponseTransformer { } /** - * Transformer returns the "surprise!" body regardless of what you - * the stub mapping returns + * Transformer adds a X-My-Header with value "surprise!" to the response */ @Override Response transform(Request request, Response response, FileSource files, Parameters parameters) { + def headers = response.headers + new HttpHeader("X-My-Header", "surprise!") return new Response(response.status, response.statusMessage, - "surprise!", response.headers, response.wasConfigured(), response.fault, + response.body, headers, response.wasConfigured(), response.fault, response.initialDelay, new ChunkedDribbleDelay(0, 0), response.fromProxy) } diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy index e73b68ca8d..3a75c3cc32 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy @@ -23,6 +23,8 @@ import spock.lang.Specification import org.springframework.boot.test.system.OutputCaptureRule import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.http.HttpEntity +import org.springframework.http.HttpMethod import org.springframework.web.client.RestTemplate class WireMockHttpServerStubSpec extends Specification { @@ -50,7 +52,9 @@ class WireMockHttpServerStubSpec extends Specification { then: noExceptionThrown() expect: - "surprise!" == new RestTemplate().getForObject("http://localhost:" + mappingDescriptor.port() + "/ping", String.class) + URI uri = new URI("http://localhost:" + mappingDescriptor.port() + "/ping") + "surprise!" == new RestTemplate().exchange(uri, HttpMethod.GET, (HttpEntity)null, String.class) + .getHeaders().getFirst("X-My-Header") cleanup: mappingDescriptor?.stop() } diff --git a/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/goodbye_from_file.groovy b/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/goodbye_from_file.groovy new file mode 100644 index 0000000000..67c5325eed --- /dev/null +++ b/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/goodbye_from_file.groovy @@ -0,0 +1,28 @@ +/* + * Copyright 2013-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.springframework.cloud.contract.spec.Contract + +Contract.make { + request { + url("/goodbye_from_file") + method(GET()) + } + response { + status(OK()) + body(file("goodbye_response.txt")) + } +} diff --git a/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/goodbye_response.txt b/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/goodbye_response.txt new file mode 100644 index 0000000000..02e35ff340 --- /dev/null +++ b/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/goodbye_response.txt @@ -0,0 +1 @@ +Goodbye from file! \ No newline at end of file diff --git a/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/hello.groovy b/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/hello.groovy new file mode 100644 index 0000000000..cb971a69ee --- /dev/null +++ b/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/hello.groovy @@ -0,0 +1,28 @@ +/* + * Copyright 2013-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.springframework.cloud.contract.spec.Contract + +Contract.make { + request { + url("/hello") + method(GET()) + } + response { + status(OK()) + body("Hello New World!") + } +} diff --git a/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/mappings/hello.json b/spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/hello.json similarity index 100% rename from spring-cloud-contract-stub-runner/src/test/resources/generateStubs/mappings/hello.json rename to spring-cloud-contract-stub-runner/src/test/resources/generateStubs/contracts/hello.json From 5eab04c9706a4a7416e6f2bfc47558dfc2093619 Mon Sep 17 00:00:00 2001 From: Dominik Meister Date: Sat, 31 Oct 2020 09:13:33 +0100 Subject: [PATCH 2/6] Delete only valid mappings before generating stubs at runtime (#1547) * Delete only valid mappings before generating stubs at runtime Improvements over the changes in 6d44c54c. We now only delete files which contain valid mappings before generating stubs at runtime. This way we ensure that we actually use the newly generated stubs, but still are able to keep additional files around to be included via `body(file(...))`. * Incorporated PR feedback - Removed HttpServerStubFactory - Use SpringFactorieLoader to load HttpServerStub implementations - Added tests for WireMockHttpServerStub#isAccepted(File) --- .../stubrunner/StubRunnerFactory.java | 48 +++++++++++++++++++ .../wiremock/WireMockHttpServerStub.java | 15 +++++- .../contract/stubrunner/StubRunnerSpec.groovy | 1 - .../WireMockHttpServerStubSpec.groovy | 39 +++++++++++++++ .../src/test/resources/arbitrary.json | 12 +++++ .../src/test/resources/broken.json | 7 +++ 6 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/arbitrary.json create mode 100644 spring-cloud-contract-stub-runner/src/test/resources/broken.json diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java index 32ec7c0244..eaeb3d39c6 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java @@ -18,18 +18,25 @@ package org.springframework.cloud.contract.stubrunner; import java.io.File; import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.cloud.contract.stubrunner.provider.wiremock.WireMockHttpServerStub; import org.springframework.cloud.contract.verifier.converter.RecursiveFilesConverter; import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; import org.springframework.core.io.Resource; +import org.springframework.core.io.support.SpringFactoriesLoader; /** * Factory of StubRunners. Basing on the options and passed collaborators downloads the @@ -88,6 +95,7 @@ class StubRunnerFactory { } private void generateMappingsAtRuntime(Path path) { + removeCurrentMappings(path); generateNewMappings(path); } @@ -106,6 +114,46 @@ class StubRunnerFactory { return path; } + private void removeCurrentMappings(Path path) { + + List httpServerStubs = SpringFactoriesLoader + .loadFactories(HttpServerStub.class, null); + if (httpServerStubs.isEmpty()) { + httpServerStubs.add(new WireMockHttpServerStub()); + } + + try { + Files.walkFileTree(path, new SimpleFileVisitor() { + + private final Log log = LogFactory.getLog(StubRunnerFactory.class); + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { + + if (httpServerStubs.stream() + .anyMatch(h -> h.isAccepted(file.toFile()))) { + if (log.isDebugEnabled()) { + log.debug("Deleting file [" + file.toString() + + "] since it contains a valid mapping."); + } + + try { + Files.delete(file); + } + catch (IOException ex) { + log.warn("Failed to delete file [" + file.toString() + "]", + ex); + } + } + return FileVisitResult.CONTINUE; + } + }); + } + catch (IOException ex) { + log.warn("Exception occurred while trying to delete mappings", ex); + } + } + private void generateNewMappings(Path path) { File unpackedLocation = path.toFile(); RecursiveFilesConverter converter = new RecursiveFilesConverter( diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java index 9e142d1f5b..62a4d9b233 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStub.java @@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap; import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.client.WireMock; +import com.github.tomakehurst.wiremock.common.JsonException; import com.github.tomakehurst.wiremock.common.Slf4jNotifier; import com.github.tomakehurst.wiremock.core.WireMockConfiguration; import com.github.tomakehurst.wiremock.extension.Extension; @@ -237,7 +238,17 @@ public class WireMockHttpServerStub implements HttpServerStub { @Override public boolean isAccepted(File file) { - return file.getName().endsWith(".json"); + return file.getName().endsWith(".json") && validMapping(file); + } + + private boolean validMapping(File file) { + try { + getMapping(file); + return true; + } + catch (IllegalStateException e) { + return false; + } } StubMapping getMapping(File file) { @@ -245,7 +256,7 @@ public class WireMockHttpServerStub implements HttpServerStub { return StubMapping.buildFrom( StreamUtils.copyToString(stream, Charset.forName("UTF-8"))); } - catch (IOException e) { + catch (IOException | JsonException e) { throw new IllegalStateException("Cannot read file", e); } } diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerSpec.groovy index b2fa019598..d6913e2a17 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerSpec.groovy @@ -57,7 +57,6 @@ class StubRunnerSpec extends Specification { runner.close() } - def 'should generate stubs at runtime'() { given: Arguments args = argumentsWithGenerateStubs() diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy index 3a75c3cc32..e937068f24 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy @@ -30,6 +30,9 @@ import org.springframework.web.client.RestTemplate class WireMockHttpServerStubSpec extends Specification { public static final File MAPPING_DESCRIPTOR = new File('src/test/resources/transformers.json') + public static final File ARBITRARY_JSON = new File('src/test/resources/sample_response.json') + public static final File PDF = new File('src/test/resources/request.pdf') + public static final File BROKEN_MAPPING = new File('src/test/resources/broken.json') @Rule OutputCaptureRule capture = new OutputCaptureRule() @@ -76,4 +79,40 @@ class WireMockHttpServerStubSpec extends Specification { cleanup: mappingDescriptor?.stop() } + + def 'should accept a valid mapping'() { + given: + WireMockHttpServerStub httpServerStub = new WireMockHttpServerStub() + when: + boolean accepted = httpServerStub.isAccepted(MAPPING_DESCRIPTOR) + then: + accepted + } + + def 'should not accept an arbitrary JSON file'() { + given: + WireMockHttpServerStub httpServerStub = new WireMockHttpServerStub() + when: + boolean accepted = httpServerStub.isAccepted(ARBITRARY_JSON) + then: + !accepted + } + + def 'should not accept a broken mapping file'() { + given: + WireMockHttpServerStub httpServerStub = new WireMockHttpServerStub() + when: + boolean accepted = httpServerStub.isAccepted(BROKEN_MAPPING) + then: + !accepted + } + + def 'should not accept a non-JSON file'() { + given: + WireMockHttpServerStub httpServerStub = new WireMockHttpServerStub() + when: + boolean accepted = httpServerStub.isAccepted(PDF) + then: + !accepted + } } diff --git a/spring-cloud-contract-stub-runner/src/test/resources/arbitrary.json b/spring-cloud-contract-stub-runner/src/test/resources/arbitrary.json new file mode 100644 index 0000000000..35ecab0f56 --- /dev/null +++ b/spring-cloud-contract-stub-runner/src/test/resources/arbitrary.json @@ -0,0 +1,12 @@ +[ + { + "id": "1", + "firstname": "John", + "name": "Doe" + }, + { + "id": "2", + "firstname": "Lisa", + "name": "Smith" + } +] \ No newline at end of file diff --git a/spring-cloud-contract-stub-runner/src/test/resources/broken.json b/spring-cloud-contract-stub-runner/src/test/resources/broken.json new file mode 100644 index 0000000000..3ac85b61ad --- /dev/null +++ b/spring-cloud-contract-stub-runner/src/test/resources/broken.json @@ -0,0 +1,7 @@ +{ + "request": { + "method": "GET", + "url": "/ping" + }, + "response": { + "status": 200, From 1ea1ea711310023b1e0d77c985bd2755734b4b93 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 11:28:29 +0000 Subject: [PATCH 3/6] Update SNAPSHOT to 2.2.5.RELEASE --- README.adoc | 2 +- docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 2 +- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- .../complete/contract-rest-client/pom.xml | 4 ++-- .../complete/contract-rest-service/pom.xml | 6 +++--- .../initial/contract-rest-client/pom.xml | 2 +- .../initial/contract-rest-service/pom.xml | 6 +++--- guides/pom.xml | 2 +- pom.xml | 16 ++++++++-------- samples/pom.xml | 4 ++-- samples/standalone/pom.xml | 4 ++-- samples/wiremock-jetty/pom.xml | 6 +++--- samples/wiremock-native/pom.xml | 6 +++--- samples/wiremock-tomcat/pom.xml | 6 +++--- samples/wiremock-undertow-ssl/pom.xml | 6 +++--- samples/wiremock-undertow/pom.xml | 6 +++--- samples/wiremock/pom.xml | 6 +++--- specs/pom.xml | 4 ++-- specs/spring-cloud-contract-spec-groovy/pom.xml | 2 +- specs/spring-cloud-contract-spec-java/pom.xml | 2 +- specs/spring-cloud-contract-spec-kotlin/pom.xml | 2 +- specs/spring-cloud-contract-spec/pom.xml | 2 +- spring-cloud-contract-dependencies/pom.xml | 4 ++-- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-contract-stub-runner-boot/pom.xml | 2 +- spring-cloud-contract-stub-runner/pom.xml | 2 +- .../stubrunner/junit/StubRunnerExtension.java | 11 ++++++----- spring-cloud-contract-tools/pom.xml | 2 +- .../spring-cloud-contract-converters/pom.xml | 2 +- .../gradle.properties | 2 +- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 +- .../functionalTest/bootSimple/gradle.properties | 2 +- .../scenarioProject/gradle.properties | 4 ++-- .../scenarioProjectKotlin/gradle.properties | 4 ++-- .../pom.xml | 2 +- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- .../builder/XmlBodyVerificationBuilderTest.java | 9 ++++++--- spring-cloud-contract-wiremock/pom.xml | 2 +- tests/pom.xml | 2 +- tests/samples-messaging-amqp/pom.xml | 2 +- tests/samples-messaging-camel/pom.xml | 2 +- tests/samples-messaging-integration/pom.xml | 2 +- tests/samples-messaging-jms/pom.xml | 2 +- tests/samples-messaging-stream/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 64 files changed, 107 insertions(+), 103 deletions(-) diff --git a/README.adoc b/README.adoc index 4412bca9da..ff772e6a54 100644 --- a/README.adoc +++ b/README.adoc @@ -287,7 +287,7 @@ run the following command: ./scripts/parallelBuild.sh ``` -To use eight 8 cores, run the following command: +To use eight 8 cores, run thke following command: ``` CORES=8 ./scripts/parallelBuild.sh diff --git a/docker/pom.xml b/docker/pom.xml index 1803cec23b..ef86e086cb 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-docker-parent pom - 2.2.5.BUILD-SNAPSHOT + 2.2.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 f4e1462d5e..017bd83328 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -11,13 +11,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-docker pom - 2.2.5.BUILD-SNAPSHOT + 2.2.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 57dd56e986..1a2bcfdc80 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.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.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 9909ff720c..615eeabe2e 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-stub-runner-docker pom - 2.2.5.BUILD-SNAPSHOT + 2.2.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 cf1f3292e0..b2bd09de6b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-docs diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index ff5fdd6f67..3d6feaecb7 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,14 +11,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT + Hoxton.SR9 diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index c67a466739..12251810f6 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + Hoxton.SR9 + 2.2.5.RELEASE diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index e1ec1d1b11..a2053a97b9 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 9506eb4a35..8e67cbd7cf 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + Hoxton.SR9 + 2.2.5.RELEASE diff --git a/guides/pom.xml b/guides/pom.xml index b4cbf87a70..ab6420a029 100644 --- a/guides/pom.xml +++ b/guides/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-guides diff --git a/pom.xml b/pom.xml index c6f0973e2d..e63dd78f56 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-contract-parent pom - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE Spring Cloud Contract Spring Cloud Contract @@ -29,14 +29,14 @@ 3.6.14 0.0.9 2.3.1.RELEASE - 2.2.4.BUILD-SNAPSHOT - Horsham.SR7 + 2.2.4.RELEASE + Horsham.SR9 3.0.4.RELEASE - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 3.0.9.RELEASE + 2.2.6.RELEASE + 2.2.5.RELEASE + 2.2.6.RELEASE + 3.0.11.RELEASE 5.0.4 3.2.9 1.3-groovy-2.5 diff --git a/samples/pom.xml b/samples/pom.xml index 49278fd540..7e2f54c4b4 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-samples pom - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index afb607b66d..d9b1c10ade 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-samples-standalone pom - 2.2.5.BUILD-SNAPSHOT + 2.2.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 f2652909c0..c1e592b9ab 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index b80632ec33..043fc5ed5a 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 53e13d16b7..439b586e8a 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index 8381355378..2b735ab02f 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 877f278965..57ba878cc8 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index bae3412daa..f74f4ae25a 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE diff --git a/specs/pom.xml b/specs/pom.xml index 9d55aedee9..3c3bb75e0e 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-specs pom - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE Spring Cloud Contract Specs Spring Cloud Contract Specs diff --git a/specs/spring-cloud-contract-spec-groovy/pom.xml b/specs/spring-cloud-contract-spec-groovy/pom.xml index 6d756a89d7..6aaa526ab6 100644 --- a/specs/spring-cloud-contract-spec-groovy/pom.xml +++ b/specs/spring-cloud-contract-spec-groovy/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE ../.. spring-cloud-contract-spec-groovy diff --git a/specs/spring-cloud-contract-spec-java/pom.xml b/specs/spring-cloud-contract-spec-java/pom.xml index df41c90b97..a42b41da44 100644 --- a/specs/spring-cloud-contract-spec-java/pom.xml +++ b/specs/spring-cloud-contract-spec-java/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE ../.. spring-cloud-contract-spec-java diff --git a/specs/spring-cloud-contract-spec-kotlin/pom.xml b/specs/spring-cloud-contract-spec-kotlin/pom.xml index bc17ffd295..74b668485a 100644 --- a/specs/spring-cloud-contract-spec-kotlin/pom.xml +++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE ../.. spring-cloud-contract-spec-kotlin diff --git a/specs/spring-cloud-contract-spec/pom.xml b/specs/spring-cloud-contract-spec/pom.xml index 94586b8035..4f7f8bf5e1 100644 --- a/specs/spring-cloud-contract-spec/pom.xml +++ b/specs/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE ../.. spring-cloud-contract-spec diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 2c464faa28..f25eff60b4 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.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-contract-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.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 cb83546099..f1e24685d1 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 44fbb7d80e..a235676607 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.2.5.BUILD-SNAPSHOT + 2.2.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 7dce1c1da6..656fab39bf 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.2.5.BUILD-SNAPSHOT + 2.2.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 4af0a97e9d..c20ace8584 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.2.5.BUILD-SNAPSHOT + 2.2.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 c1ccccae93..975412a2fe 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.2.5.BUILD-SNAPSHOT + 2.2.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 5d7c5eb7af..9b904ad65f 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.2.5.BUILD-SNAPSHOT + 2.2.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 4903ee325f..3da00de8e9 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java index 5489cb56a0..d38b923d83 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java @@ -51,8 +51,8 @@ import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; * @author Olga Maciaszek-Sharma * @since 2.1.0 */ -public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback, - StubFinder, StubRunnerExtensionOptions { +public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, + BeforeEachCallback, AfterEachCallback, StubFinder, StubRunnerExtensionOptions { private static final String DELIMITER = ":"; @@ -84,7 +84,8 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void afterAll(ExtensionContext extensionContext) { try { after(); - } finally { + } + finally { this.afterAllCalled.set(true); } } @@ -105,7 +106,8 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void beforeAll(ExtensionContext extensionContext) { try { before(); - } finally { + } + finally { this.beforeAllCalled.set(true); } } @@ -133,7 +135,6 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, } } - @Override public URL findStubUrl(String groupId, String artifactId) throws StubNotFoundException { diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index d1a3cca658..2c1d70e0a8 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.2.5.BUILD-SNAPSHOT + 2.2.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 8a59d9c7c6..483d80428e 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.2.5.BUILD-SNAPSHOT + 2.2.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 783047b428..82a43070ae 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.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.5.RELEASE org.gradle.daemon=false aetherVersion=1.1.0 springCloudBuildVersion=2.3.1.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 8111297b45..43215ee3e1 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.2.5.BUILD-SNAPSHOT + 2.2.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 7148ea935e..64fd02b1aa 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.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.5.RELEASE groovyVersion=2.5.10 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 d1c925d1fa..7ca2700835 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.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.5.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE +verifierVersion=2.2.5.RELEASE +bootVersion=2.3.5.RELEASE groovyVersion=2.5.10 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index 9597ec93f2..a734f965ef 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -15,6 +15,6 @@ # wiremockVersion=2.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.5.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE +verifierVersion=2.2.5.RELEASE +bootVersion=2.3.5.RELEASE groovyVersion=2.5.10 \ No newline at end of file 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 6e5ae06985..d42ba6fda3 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.2.5.BUILD-SNAPSHOT + 2.2.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 9eb737432f..2db134c803 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. 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 a59c489c07..42cb6563f9 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index b922521d39..3e9b150570 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java index 80f030da8d..0d054355f5 100644 --- a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java +++ b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java @@ -24,10 +24,13 @@ public class XmlBodyVerificationBuilderTest { builder.addXmlResponseBodyCheck(blockBuilder, xml, matchers, xml, true); // Then String test = blockBuilder.toString(); - assertThat(test).contains("DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();") + assertThat(test).contains( + "DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();") .contains("builderFactory.setNamespaceAware(true);") - .contains("DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();") - .contains("Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(") + .contains( + "DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();") + .contains( + "Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(") .contains(xml); } diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index 669258c3b1..fb5008f699 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 7f83a92960..21d68b3ce6 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index a78471ac84..f6cd027be2 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index fc1df4aea6..2b62dae9fc 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index bd49e3bcbb..68e8a293c3 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-jms/pom.xml b/tests/samples-messaging-jms/pom.xml index 2f6e7a7faf..397c21630b 100644 --- a/tests/samples-messaging-jms/pom.xml +++ b/tests/samples-messaging-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-sample-jms diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index f5a1e449e2..c8b4a3f15e 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.2.5.BUILD-SNAPSHOT + 2.2.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 2a30673db2..a9c53f18ff 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.2.5.BUILD-SNAPSHOT + 2.2.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 c06892bc68..82fedbfd94 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.2.5.BUILD-SNAPSHOT + 2.2.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 d9a2deea33..239ee71751 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.2.5.BUILD-SNAPSHOT + 2.2.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 ff7875efbf..3b20b45c5f 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.2.5.BUILD-SNAPSHOT + 2.2.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 c70a9c9bd5..205103b427 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.2.5.BUILD-SNAPSHOT + 2.2.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 073e5b8e74..a2b728433f 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-jms/pom.xml b/tests/spring-cloud-contract-stub-runner-jms/pom.xml index ea34d5ea6b..e6160d3d57 100644 --- a/tests/spring-cloud-contract-stub-runner-jms/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-stub-runner-jms diff --git a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml index 3849e12385..edc70d7779 100644 --- a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-stub-runner-kafka 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 6abd7eb6c5..3982c0908b 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.2.5.BUILD-SNAPSHOT + 2.2.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 97c4f2bc6b..8c7a5ddd77 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.2.5.BUILD-SNAPSHOT + 2.2.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 82d21532b9..f7aa2b9751 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-contract-stub-runner-stream From 81d2e7b3e92a36442d3c44dadfdbd615ce3480f5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 11:40:10 +0000 Subject: [PATCH 4/6] Going back to snapshots --- README.adoc | 2 +- docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 2 +- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- .../complete/contract-rest-client/pom.xml | 4 ++-- .../complete/contract-rest-service/pom.xml | 6 +++--- .../initial/contract-rest-client/pom.xml | 2 +- .../initial/contract-rest-service/pom.xml | 6 +++--- guides/pom.xml | 2 +- pom.xml | 16 ++++++++-------- samples/pom.xml | 4 ++-- samples/standalone/pom.xml | 4 ++-- samples/wiremock-jetty/pom.xml | 6 +++--- samples/wiremock-native/pom.xml | 6 +++--- samples/wiremock-tomcat/pom.xml | 6 +++--- samples/wiremock-undertow-ssl/pom.xml | 6 +++--- samples/wiremock-undertow/pom.xml | 6 +++--- samples/wiremock/pom.xml | 6 +++--- specs/pom.xml | 4 ++-- specs/spring-cloud-contract-spec-groovy/pom.xml | 2 +- specs/spring-cloud-contract-spec-java/pom.xml | 2 +- specs/spring-cloud-contract-spec-kotlin/pom.xml | 2 +- specs/spring-cloud-contract-spec/pom.xml | 2 +- spring-cloud-contract-dependencies/pom.xml | 4 ++-- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-contract-stub-runner-boot/pom.xml | 2 +- spring-cloud-contract-stub-runner/pom.xml | 2 +- .../stubrunner/junit/StubRunnerExtension.java | 11 +++++------ spring-cloud-contract-tools/pom.xml | 2 +- .../spring-cloud-contract-converters/pom.xml | 2 +- .../gradle.properties | 2 +- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 +- .../functionalTest/bootSimple/gradle.properties | 2 +- .../scenarioProject/gradle.properties | 4 ++-- .../scenarioProjectKotlin/gradle.properties | 4 ++-- .../pom.xml | 2 +- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- .../builder/XmlBodyVerificationBuilderTest.java | 9 +++------ spring-cloud-contract-wiremock/pom.xml | 2 +- tests/pom.xml | 2 +- tests/samples-messaging-amqp/pom.xml | 2 +- tests/samples-messaging-camel/pom.xml | 2 +- tests/samples-messaging-integration/pom.xml | 2 +- tests/samples-messaging-jms/pom.xml | 2 +- tests/samples-messaging-stream/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 64 files changed, 103 insertions(+), 107 deletions(-) diff --git a/README.adoc b/README.adoc index ff772e6a54..4412bca9da 100644 --- a/README.adoc +++ b/README.adoc @@ -287,7 +287,7 @@ run the following command: ./scripts/parallelBuild.sh ``` -To use eight 8 cores, run thke following command: +To use eight 8 cores, run the following command: ``` CORES=8 ./scripts/parallelBuild.sh diff --git a/docker/pom.xml b/docker/pom.xml index ef86e086cb..1803cec23b 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-docker-parent pom - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT 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 017bd83328..f4e1462d5e 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -11,13 +11,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-docker pom - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT 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 1a2bcfdc80..57dd56e986 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.2.5.RELEASE +verifierVersion=2.2.5.BUILD-SNAPSHOT diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 615eeabe2e..9909ff720c 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-docker pom - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index b2bd09de6b..cf1f3292e0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-docs diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index 3d6feaecb7..ff5fdd6f67 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,14 +11,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - Hoxton.SR9 + Hoxton.BUILD-SNAPSHOT diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index 12251810f6..c67a466739 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - Hoxton.SR9 - 2.2.5.RELEASE + Hoxton.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index a2053a97b9..e1ec1d1b11 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 8e67cbd7cf..9506eb4a35 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,15 +11,15 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - Hoxton.SR9 - 2.2.5.RELEASE + Hoxton.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT diff --git a/guides/pom.xml b/guides/pom.xml index ab6420a029..b4cbf87a70 100644 --- a/guides/pom.xml +++ b/guides/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-guides diff --git a/pom.xml b/pom.xml index e63dd78f56..c6f0973e2d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-contract-parent pom - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT Spring Cloud Contract Spring Cloud Contract @@ -29,14 +29,14 @@ 3.6.14 0.0.9 2.3.1.RELEASE - 2.2.4.RELEASE - Horsham.SR9 + 2.2.4.BUILD-SNAPSHOT + Horsham.SR7 3.0.4.RELEASE - 2.2.6.RELEASE - 2.2.5.RELEASE - 2.2.6.RELEASE - 3.0.11.RELEASE + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 3.0.9.RELEASE 5.0.4 3.2.9 1.3-groovy-2.5 diff --git a/samples/pom.xml b/samples/pom.xml index 7e2f54c4b4..49278fd540 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-samples pom - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index d9b1c10ade..afb607b66d 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-samples-standalone pom - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT 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 c1e592b9ab..f2652909c0 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index 043fc5ed5a..b80632ec33 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 439b586e8a..53e13d16b7 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index 2b735ab02f..8381355378 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 57ba878cc8..877f278965 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index f74f4ae25a..bae3412daa 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.5.RELEASE + 2.3.2.RELEASE UTF-8 1.8 - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT diff --git a/specs/pom.xml b/specs/pom.xml index 3c3bb75e0e..9d55aedee9 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-specs pom - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT Spring Cloud Contract Specs Spring Cloud Contract Specs diff --git a/specs/spring-cloud-contract-spec-groovy/pom.xml b/specs/spring-cloud-contract-spec-groovy/pom.xml index 6aaa526ab6..6d756a89d7 100644 --- a/specs/spring-cloud-contract-spec-groovy/pom.xml +++ b/specs/spring-cloud-contract-spec-groovy/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec-groovy diff --git a/specs/spring-cloud-contract-spec-java/pom.xml b/specs/spring-cloud-contract-spec-java/pom.xml index a42b41da44..df41c90b97 100644 --- a/specs/spring-cloud-contract-spec-java/pom.xml +++ b/specs/spring-cloud-contract-spec-java/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec-java diff --git a/specs/spring-cloud-contract-spec-kotlin/pom.xml b/specs/spring-cloud-contract-spec-kotlin/pom.xml index 74b668485a..bc17ffd295 100644 --- a/specs/spring-cloud-contract-spec-kotlin/pom.xml +++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec-kotlin diff --git a/specs/spring-cloud-contract-spec/pom.xml b/specs/spring-cloud-contract-spec/pom.xml index 4f7f8bf5e1..94586b8035 100644 --- a/specs/spring-cloud-contract-spec/pom.xml +++ b/specs/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index f25eff60b4..2c464faa28 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.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-contract-dependencies - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT 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 f1e24685d1..cb83546099 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index a235676607..44fbb7d80e 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 656fab39bf..7dce1c1da6 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 c20ace8584..4af0a97e9d 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 975412a2fe..c1ccccae93 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 9b904ad65f..5d7c5eb7af 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 3da00de8e9..4903ee325f 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java index d38b923d83..5489cb56a0 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java @@ -51,8 +51,8 @@ import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; * @author Olga Maciaszek-Sharma * @since 2.1.0 */ -public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, - BeforeEachCallback, AfterEachCallback, StubFinder, StubRunnerExtensionOptions { +public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback, + StubFinder, StubRunnerExtensionOptions { private static final String DELIMITER = ":"; @@ -84,8 +84,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void afterAll(ExtensionContext extensionContext) { try { after(); - } - finally { + } finally { this.afterAllCalled.set(true); } } @@ -106,8 +105,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void beforeAll(ExtensionContext extensionContext) { try { before(); - } - finally { + } finally { this.beforeAllCalled.set(true); } } @@ -135,6 +133,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, } } + @Override public URL findStubUrl(String groupId, String artifactId) throws StubNotFoundException { diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 2c1d70e0a8..d1a3cca658 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 483d80428e..8a59d9c7c6 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 82a43070ae..783047b428 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.2.5.RELEASE +verifierVersion=2.2.5.BUILD-SNAPSHOT org.gradle.daemon=false aetherVersion=1.1.0 springCloudBuildVersion=2.3.1.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 43215ee3e1..8111297b45 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 64fd02b1aa..7148ea935e 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.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.5.RELEASE +verifierVersion=2.2.5.BUILD-SNAPSHOT groovyVersion=2.5.10 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 7ca2700835..d1c925d1fa 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.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.5.RELEASE -bootVersion=2.3.5.RELEASE +verifierVersion=2.2.5.BUILD-SNAPSHOT +bootVersion=2.3.2.RELEASE groovyVersion=2.5.10 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index a734f965ef..9597ec93f2 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -15,6 +15,6 @@ # wiremockVersion=2.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.5.RELEASE -bootVersion=2.3.5.RELEASE +verifierVersion=2.2.5.BUILD-SNAPSHOT +bootVersion=2.3.2.RELEASE groovyVersion=2.5.10 \ No newline at end of file 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 d42ba6fda3..6e5ae06985 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 2db134c803..9eb737432f 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 42cb6563f9..a59c489c07 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index 3e9b150570..b922521d39 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java index 0d054355f5..80f030da8d 100644 --- a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java +++ b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java @@ -24,13 +24,10 @@ public class XmlBodyVerificationBuilderTest { builder.addXmlResponseBodyCheck(blockBuilder, xml, matchers, xml, true); // Then String test = blockBuilder.toString(); - assertThat(test).contains( - "DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();") + assertThat(test).contains("DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();") .contains("builderFactory.setNamespaceAware(true);") - .contains( - "DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();") - .contains( - "Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(") + .contains("DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();") + .contains("Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(") .contains(xml); } diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index fb5008f699..669258c3b1 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 21d68b3ce6..7f83a92960 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index f6cd027be2..a78471ac84 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index 2b62dae9fc..fc1df4aea6 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index 68e8a293c3..bd49e3bcbb 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-jms/pom.xml b/tests/samples-messaging-jms/pom.xml index 397c21630b..2f6e7a7faf 100644 --- a/tests/samples-messaging-jms/pom.xml +++ b/tests/samples-messaging-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-sample-jms diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index c8b4a3f15e..f5a1e449e2 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 a9c53f18ff..2a30673db2 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 82fedbfd94..c06892bc68 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 239ee71751..d9a2deea33 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 3b20b45c5f..ff7875efbf 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 205103b427..c70a9c9bd5 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 a2b728433f..073e5b8e74 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-jms/pom.xml b/tests/spring-cloud-contract-stub-runner-jms/pom.xml index e6160d3d57..ea34d5ea6b 100644 --- a/tests/spring-cloud-contract-stub-runner-jms/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-jms diff --git a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml index edc70d7779..3849e12385 100644 --- a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-kafka 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 3982c0908b..6abd7eb6c5 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 8c7a5ddd77..97c4f2bc6b 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 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 f7aa2b9751..82d21532b9 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-stream From 8871838e6910e61cc051013458229da5dcf83065 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 11:40:11 +0000 Subject: [PATCH 5/6] Bumping versions to 2.2.6.BUILD-SNAPSHOT after release --- docker/pom.xml | 4 ++-- docker/spring-cloud-contract-docker/pom.xml | 4 ++-- .../project/gradle.properties | 2 +- .../pom.xml | 4 ++-- docs/pom.xml | 2 +- .../complete/contract-rest-client/pom.xml | 2 +- .../complete/contract-rest-service/pom.xml | 4 ++-- .../initial/contract-rest-client/pom.xml | 2 +- .../initial/contract-rest-service/pom.xml | 4 ++-- guides/pom.xml | 2 +- pom.xml | 16 ++++++++-------- samples/pom.xml | 4 ++-- .../contracts/com/example/server/pom.xml | 4 ++-- .../standalone/dsl/http-client/gradle.properties | 2 +- samples/standalone/dsl/http-client/pom.xml | 2 +- .../standalone/dsl/http-server/gradle.properties | 4 ++-- samples/standalone/dsl/http-server/pom.xml | 4 ++-- samples/standalone/dsl/pom.xml | 4 ++-- samples/standalone/pom.xml | 4 ++-- .../restdocs/http-client/gradle.properties | 4 ++-- samples/standalone/restdocs/http-client/pom.xml | 4 ++-- .../restdocs/http-server/gradle.properties | 4 ++-- samples/standalone/restdocs/http-server/pom.xml | 4 ++-- samples/standalone/restdocs/pom.xml | 4 ++-- .../webclient/http-client/gradle.properties | 4 ++-- samples/standalone/webclient/http-client/pom.xml | 4 ++-- .../webclient/http-server/gradle.properties | 4 ++-- samples/standalone/webclient/http-server/pom.xml | 4 ++-- samples/standalone/webclient/pom.xml | 4 ++-- samples/wiremock-jetty/pom.xml | 6 +++--- samples/wiremock-native/pom.xml | 6 +++--- samples/wiremock-tomcat/pom.xml | 6 +++--- samples/wiremock-undertow-ssl/pom.xml | 6 +++--- samples/wiremock-undertow/pom.xml | 6 +++--- samples/wiremock/pom.xml | 6 +++--- specs/pom.xml | 4 ++-- specs/spring-cloud-contract-spec-groovy/pom.xml | 2 +- specs/spring-cloud-contract-spec-java/pom.xml | 2 +- specs/spring-cloud-contract-spec-kotlin/pom.xml | 2 +- specs/spring-cloud-contract-spec/pom.xml | 2 +- spring-cloud-contract-dependencies/pom.xml | 2 +- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-contract-stub-runner-boot/pom.xml | 2 +- spring-cloud-contract-stub-runner/pom.xml | 2 +- spring-cloud-contract-tools/pom.xml | 2 +- .../spring-cloud-contract-converters/pom.xml | 2 +- .../gradle.properties | 2 +- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 +- .../functionalTest/bootSimple/gradle.properties | 2 +- .../scenarioProject/gradle.properties | 4 ++-- .../scenarioProjectKotlin/gradle.properties | 4 ++-- .../pom.xml | 2 +- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- .../test/projects/complex-configuration/pom.xml | 2 +- .../module/pom.xml | 2 +- .../src/test/projects/plugin-extension/pom.xml | 2 +- .../src/test/projects/spring-boot-groovy/pom.xml | 2 +- .../src/test/projects/spring-boot-java/pom.xml | 2 +- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- spring-cloud-contract-wiremock/pom.xml | 2 +- tests/pom.xml | 2 +- tests/samples-messaging-amqp/pom.xml | 2 +- tests/samples-messaging-camel/pom.xml | 2 +- tests/samples-messaging-integration/pom.xml | 2 +- tests/samples-messaging-jms/pom.xml | 2 +- tests/samples-messaging-stream/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 82 files changed, 125 insertions(+), 125 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index 1803cec23b..f2019e0600 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-docker-parent pom - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT 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 f4e1462d5e..9b3047df96 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -11,13 +11,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-docker pom - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT 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 57dd56e986..d1e9d2eabe 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.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.6.BUILD-SNAPSHOT diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 9909ff720c..15430519a5 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-docker pom - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index cf1f3292e0..2d103851f6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-docs diff --git a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml index ff5fdd6f67..40ad652b24 100644 --- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE diff --git a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml index c67a466739..1596efd18c 100644 --- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE @@ -19,7 +19,7 @@ UTF-8 1.8 Hoxton.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml index e1ec1d1b11..a2053a97b9 100644 --- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE diff --git a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml index 9506eb4a35..d999c116a5 100644 --- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml +++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE @@ -19,7 +19,7 @@ UTF-8 1.8 Hoxton.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/guides/pom.xml b/guides/pom.xml index b4cbf87a70..0b1bc4aee4 100644 --- a/guides/pom.xml +++ b/guides/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-guides diff --git a/pom.xml b/pom.xml index c6f0973e2d..c1312b595d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-contract-parent pom - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT Spring Cloud Contract Spring Cloud Contract @@ -29,14 +29,14 @@ 3.6.14 0.0.9 2.3.1.RELEASE - 2.2.4.BUILD-SNAPSHOT - Horsham.SR7 + 2.2.5.BUILD-SNAPSHOT + Horsham.SR9 3.0.4.RELEASE - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 3.0.9.RELEASE + 2.2.7.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT + 3.0.11.RELEASE 5.0.4 3.2.9 1.3-groovy-2.5 diff --git a/samples/pom.xml b/samples/pom.xml index 49278fd540..7742684035 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-samples pom - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml index aa7869e9f7..7655e7bec4 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT Hoxton.BUILD-SNAPSHOT true diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties index 663c2043a3..591e062b26 100644 --- a/samples/standalone/dsl/http-client/gradle.properties +++ b/samples/standalone/dsl/http-client/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false BOM_VERSION=Hoxton.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE \ No newline at end of file +bootVersion=2.3.5.RELEASE \ 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 c06553987d..be5ac07840 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index e96fef72ab..ca15f5e797 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=2.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.6.BUILD-SNAPSHOT BOM_VERSION=Hoxton.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE \ No newline at end of file +bootVersion=2.3.5.RELEASE \ 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 846287a31c..1a7f529fd5 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT Hoxton.BUILD-SNAPSHOT diff --git a/samples/standalone/dsl/pom.xml b/samples/standalone/dsl/pom.xml index f427118604..56cb24ba80 100644 --- a/samples/standalone/dsl/pom.xml +++ b/samples/standalone/dsl/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index afb607b66d..b4831a4e2e 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-samples-standalone pom - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT Spring Cloud Contract Standalone Test Samples Spring Cloud Contract Standalone Test Samples used for end to end tests diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties index e96fef72ab..ca15f5e797 100644 --- a/samples/standalone/restdocs/http-client/gradle.properties +++ b/samples/standalone/restdocs/http-client/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=2.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.6.BUILD-SNAPSHOT BOM_VERSION=Hoxton.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE \ No newline at end of file +bootVersion=2.3.5.RELEASE \ No newline at end of file diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index 04dd942e0f..37e2e206c5 100644 --- a/samples/standalone/restdocs/http-client/pom.xml +++ b/samples/standalone/restdocs/http-client/pom.xml @@ -31,14 +31,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index e96fef72ab..ca15f5e797 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=2.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.6.BUILD-SNAPSHOT BOM_VERSION=Hoxton.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE \ No newline at end of file +bootVersion=2.3.5.RELEASE \ No newline at end of file diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index 032d7b7764..4f371bc7e4 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT true diff --git a/samples/standalone/restdocs/pom.xml b/samples/standalone/restdocs/pom.xml index ef4e7c9e9c..da2878b836 100644 --- a/samples/standalone/restdocs/pom.xml +++ b/samples/standalone/restdocs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/standalone/webclient/http-client/gradle.properties b/samples/standalone/webclient/http-client/gradle.properties index e96fef72ab..ca15f5e797 100644 --- a/samples/standalone/webclient/http-client/gradle.properties +++ b/samples/standalone/webclient/http-client/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=2.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.6.BUILD-SNAPSHOT BOM_VERSION=Hoxton.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE \ No newline at end of file +bootVersion=2.3.5.RELEASE \ No newline at end of file diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml index 23ae24cf5a..50db6ffe1d 100644 --- a/samples/standalone/webclient/http-client/pom.xml +++ b/samples/standalone/webclient/http-client/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/standalone/webclient/http-server/gradle.properties b/samples/standalone/webclient/http-server/gradle.properties index e96fef72ab..ca15f5e797 100644 --- a/samples/standalone/webclient/http-server/gradle.properties +++ b/samples/standalone/webclient/http-server/gradle.properties @@ -1,4 +1,4 @@ org.gradle.daemon=false -verifierVersion=2.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.6.BUILD-SNAPSHOT BOM_VERSION=Hoxton.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE \ No newline at end of file +bootVersion=2.3.5.RELEASE \ No newline at end of file diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml index b452408f2c..a45c6c5d17 100644 --- a/samples/standalone/webclient/http-server/pom.xml +++ b/samples/standalone/webclient/http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/standalone/webclient/pom.xml b/samples/standalone/webclient/pom.xml index 4ff56543a5..8cadfa28cf 100644 --- a/samples/standalone/webclient/pom.xml +++ b/samples/standalone/webclient/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index f2652909c0..cff9c4eb98 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index b80632ec33..434f994d24 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 53e13d16b7..37d146a8f1 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index 8381355378..1bab5a461e 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 877f278965..78f2542b58 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index bae3412daa..b011f8ad82 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE UTF-8 1.8 - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT diff --git a/specs/pom.xml b/specs/pom.xml index 9d55aedee9..1a87c9cb61 100644 --- a/specs/pom.xml +++ b/specs/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-specs pom - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT Spring Cloud Contract Specs Spring Cloud Contract Specs diff --git a/specs/spring-cloud-contract-spec-groovy/pom.xml b/specs/spring-cloud-contract-spec-groovy/pom.xml index 6d756a89d7..81ab77c3a8 100644 --- a/specs/spring-cloud-contract-spec-groovy/pom.xml +++ b/specs/spring-cloud-contract-spec-groovy/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec-groovy diff --git a/specs/spring-cloud-contract-spec-java/pom.xml b/specs/spring-cloud-contract-spec-java/pom.xml index df41c90b97..ba5df52c50 100644 --- a/specs/spring-cloud-contract-spec-java/pom.xml +++ b/specs/spring-cloud-contract-spec-java/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec-java diff --git a/specs/spring-cloud-contract-spec-kotlin/pom.xml b/specs/spring-cloud-contract-spec-kotlin/pom.xml index bc17ffd295..e345022924 100644 --- a/specs/spring-cloud-contract-spec-kotlin/pom.xml +++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec-kotlin diff --git a/specs/spring-cloud-contract-spec/pom.xml b/specs/spring-cloud-contract-spec/pom.xml index 94586b8035..9d3160d6df 100644 --- a/specs/spring-cloud-contract-spec/pom.xml +++ b/specs/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT ../.. spring-cloud-contract-spec diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 2c464faa28..ac32409657 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-contract-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT 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 cb83546099..225fa0b747 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 44fbb7d80e..971e3de538 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 7dce1c1da6..e7295d3708 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 4af0a97e9d..1d05afb4d6 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 c1ccccae93..92f0cb5f28 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 5d7c5eb7af..1662527ede 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 4903ee325f..16cd79981f 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index d1a3cca658..82a7ea4ce1 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 8a59d9c7c6..7f2a731fb7 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 783047b428..1a7a16337a 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.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.6.BUILD-SNAPSHOT org.gradle.daemon=false aetherVersion=1.1.0 springCloudBuildVersion=2.3.1.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 8111297b45..9165bb1c72 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 7148ea935e..7ae9189547 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.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.5.BUILD-SNAPSHOT +verifierVersion=2.2.6.BUILD-SNAPSHOT groovyVersion=2.5.10 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 d1c925d1fa..2b6f1589c4 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.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.5.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE +verifierVersion=2.2.6.BUILD-SNAPSHOT +bootVersion=2.3.5.RELEASE groovyVersion=2.5.10 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties index 9597ec93f2..b92d0f43fa 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties @@ -15,6 +15,6 @@ # wiremockVersion=2.26.2 jsonAssertVersion=0.4.13 -verifierVersion=2.2.5.BUILD-SNAPSHOT -bootVersion=2.3.2.RELEASE +verifierVersion=2.2.6.BUILD-SNAPSHOT +bootVersion=2.3.5.RELEASE groovyVersion=2.5.10 \ No newline at end of file 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 6e5ae06985..998a8f791e 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 9eb737432f..a8120e416f 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml index 94bf75acfe..6445688722 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml index 42055a5868..665bb00f8f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml index 86e784ae7a..16602f58ab 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml index 85f57361cc..c80c0f79f3 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml index 86e784ae7a..16602f58ab 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE + 2.3.5.RELEASE 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 a59c489c07..0e6803043a 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index b922521d39..486532b0aa 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index 669258c3b1..b35333e0a1 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 7f83a92960..27ad713a73 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index a78471ac84..a747985e2b 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index fc1df4aea6..27f76e26e6 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index bd49e3bcbb..948a72319d 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-jms/pom.xml b/tests/samples-messaging-jms/pom.xml index 2f6e7a7faf..1be6734d7e 100644 --- a/tests/samples-messaging-jms/pom.xml +++ b/tests/samples-messaging-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-sample-jms diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index f5a1e449e2..1eecad531b 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 2a30673db2..404ff4b775 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 c06892bc68..0cfa5dfe81 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 d9a2deea33..0e1fc52d98 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 ff7875efbf..2bb5655152 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 c70a9c9bd5..41c2f9604b 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 073e5b8e74..b70589de3d 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-jms/pom.xml b/tests/spring-cloud-contract-stub-runner-jms/pom.xml index ea34d5ea6b..bec1125864 100644 --- a/tests/spring-cloud-contract-stub-runner-jms/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-jms/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-jms diff --git a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml index 3849e12385..d0147cd2d1 100644 --- a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-kafka 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 6abd7eb6c5..560bc7ddd6 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 97c4f2bc6b..631f65dee3 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 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 82d21532b9..b60c13801d 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-stream From 0cbf8e9ca773a3afe18b2fd928957d75e6729740 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Nov 2020 14:50:26 +0100 Subject: [PATCH 6/6] Introduced File for verifying if a stubgenerator should be used --- .../contract/stubrunner/MappingGenerator.java | 2 +- .../stubrunner/junit/StubRunnerExtension.java | 11 +++---- .../camel/StubRunnerCamelConfiguration.java | 4 +-- .../converter/RecursiveFilesConverter.java | 2 +- .../verifier/converter/StubGenerator.java | 15 +++++++++- .../converter/StubGeneratorProvider.java | 9 +++--- .../wiremock/DslToWireMockConverter.java | 29 +++++++++++++++++++ .../RecursiveFilesConverterSpec.groovy | 5 ++++ .../XmlBodyVerificationBuilderTest.java | 9 ++++-- 9 files changed, 69 insertions(+), 17 deletions(-) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MappingGenerator.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MappingGenerator.java index e0d4ed1dea..c4bfb6fcd6 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MappingGenerator.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MappingGenerator.java @@ -45,7 +45,7 @@ final class MappingGenerator { File mappingsFolder) { StubGeneratorProvider provider = new StubGeneratorProvider(); Collection stubGenerators = provider - .converterForName(contractFile.getName()); + .converterForName(contractFile); if (log.isDebugEnabled()) { log.debug("Found following matching stub generators " + stubGenerators); } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java index 5489cb56a0..d38b923d83 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java @@ -51,8 +51,8 @@ import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; * @author Olga Maciaszek-Sharma * @since 2.1.0 */ -public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback, - StubFinder, StubRunnerExtensionOptions { +public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, + BeforeEachCallback, AfterEachCallback, StubFinder, StubRunnerExtensionOptions { private static final String DELIMITER = ":"; @@ -84,7 +84,8 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void afterAll(ExtensionContext extensionContext) { try { after(); - } finally { + } + finally { this.afterAllCalled.set(true); } } @@ -105,7 +106,8 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, public void beforeAll(ExtensionContext extensionContext) { try { before(); - } finally { + } + finally { this.beforeAllCalled.set(true); } } @@ -133,7 +135,6 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, } } - @Override public URL findStubUrl(String groupId, String artifactId) throws StubNotFoundException { diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java index a7f546f53c..e3b18f34cd 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/messaging/camel/StubRunnerCamelConfiguration.java @@ -99,8 +99,8 @@ public class StubRunnerCamelConfiguration { @Override public void process(Exchange exchange) { - if (log.isDebugEnabled()) { - log.debug("Got exchange [" + exchange + "]"); + if (log.isTraceEnabled()) { + log.trace("Got exchange [" + exchange + "]"); } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverter.java b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverter.java index ebf9b739cd..e3ea52bd7d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverter.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverter.java @@ -131,7 +131,7 @@ public class RecursiveFilesConverter { Collection stubGenerators = contract .getConvertedContract() != null ? holder.allOrDefault(new DslToWireMockClientConverter()) - : holder.converterForName(sourceFile.getName()); + : holder.converterForName(sourceFile); try { String path = sourceFile.getPath(); if (excludeBuildFolders && (matchesPath(path, "target") diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/StubGenerator.java b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/StubGenerator.java index 7602743943..bf2560a646 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/StubGenerator.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/StubGenerator.java @@ -16,6 +16,7 @@ package org.springframework.cloud.contract.verifier.converter; +import java.io.File; import java.util.Map; import org.springframework.cloud.contract.spec.Contract; @@ -32,11 +33,22 @@ public interface StubGenerator { * @param fileName - file name * @return {@code true} if the converter can handle the file to convert it into a * stub. + * @deprecated use {@link StubGenerator#canHandleFileName(File)} */ + @Deprecated default boolean canHandleFileName(String fileName) { return fileName.endsWith(fileExtension()); } + /** + * @param file - file + * @return {@code true} if the converter can handle the file to convert it into a + * stub. + */ + default boolean canHandleFileName(File file) { + return file.getName().endsWith(fileExtension()); + } + /** * @param rootName - root name of the contract * @param content - metadata of the contract @@ -49,7 +61,8 @@ public interface StubGenerator { * @param inputFileName - name of the input file * @return the name of the converted stub file. If you have multiple contracts in a * single file then a prefix will be added to the generated file. If you provide the - * {@link Contract#name} field then that field will override the generated file name. + * {@link Contract#getName} field then that field will override the generated file + * name. * * Example: name of file with 2 contracts is {@code foo.groovy}, it will be converted * by the implementation to {@code foo.json}. The recursive file converter will create diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/StubGeneratorProvider.java b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/StubGeneratorProvider.java index 51adc560e0..44173ee131 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/StubGeneratorProvider.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/converter/StubGeneratorProvider.java @@ -16,6 +16,7 @@ package org.springframework.cloud.contract.verifier.converter; +import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -32,6 +33,8 @@ import org.springframework.core.io.support.SpringFactoriesLoader; */ public class StubGeneratorProvider { + private final List converters = new ArrayList<>(); + public StubGeneratorProvider() { this.converters .addAll(SpringFactoriesLoader.loadFactories(StubGenerator.class, null)); @@ -41,9 +44,9 @@ public class StubGeneratorProvider { this.converters.addAll(converters); } - public Collection converterForName(final String fileName) { + public Collection converterForName(final File file) { return this.converters.stream() - .filter(stubGenerator -> stubGenerator.canHandleFileName(fileName)) + .filter(stubGenerator -> stubGenerator.canHandleFileName(file)) .collect(Collectors.toList()); } @@ -52,6 +55,4 @@ public class StubGeneratorProvider { : this.converters; } - private final List converters = new ArrayList(); - } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockConverter.java b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockConverter.java index 1fc0b9ea26..d50d956ab6 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockConverter.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/main/java/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockConverter.java @@ -16,7 +16,19 @@ package org.springframework.cloud.contract.verifier.wiremock; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.nio.file.Files; + +import com.github.tomakehurst.wiremock.common.JsonException; +import com.github.tomakehurst.wiremock.stubbing.StubMapping; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.springframework.cloud.contract.verifier.converter.StubGenerator; +import org.springframework.util.StreamUtils; /** * WireMock implementation of the {@link StubGenerator}. @@ -25,6 +37,8 @@ import org.springframework.cloud.contract.verifier.converter.StubGenerator; */ public abstract class DslToWireMockConverter implements StubGenerator { + private static final Log log = LogFactory.getLog(DslToWireMockConverter.class); + @Override public String generateOutputFileNameForInput(String inputFileName) { return inputFileName.replaceAll(extension(inputFileName), "json"); @@ -38,4 +52,19 @@ public abstract class DslToWireMockConverter implements StubGenerator { return ""; } + @Override + public boolean canHandleFileName(File file) { + try (InputStream stream = Files.newInputStream(file.toPath())) { + StubMapping.buildFrom( + StreamUtils.copyToString(stream, Charset.forName("UTF-8"))); + return true; + } + catch (IOException | JsonException e) { + if (log.isDebugEnabled()) { + log.debug("Cannot read file", e); + } + return false; + } + } + } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverterSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverterSpec.groovy index e699b0e566..766c46200a 100755 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverterSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/converter/RecursiveFilesConverterSpec.groovy @@ -198,6 +198,11 @@ org.springframework.cloud.contract.spec.Contract.make { return true } + @Override + boolean canHandleFileName(File fileName) { + return true + } + @Override Map convertContents(String rootName, ContractMetadata content) { return [ diff --git a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java index 80f030da8d..0d054355f5 100644 --- a/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java +++ b/spring-cloud-contract-verifier/src/test/java/org/springframework/cloud/contract/verifier/builder/XmlBodyVerificationBuilderTest.java @@ -24,10 +24,13 @@ public class XmlBodyVerificationBuilderTest { builder.addXmlResponseBodyCheck(blockBuilder, xml, matchers, xml, true); // Then String test = blockBuilder.toString(); - assertThat(test).contains("DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();") + assertThat(test).contains( + "DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();") .contains("builderFactory.setNamespaceAware(true);") - .contains("DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();") - .contains("Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(") + .contains( + "DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();") + .contains( + "Document parsedXml = documentBuilder.parse(new InputSource(new StringReader(") .contains(xml); }