From 0ba491b8b030831e57264fc6ee0ec68b398e4c79 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Fri, 22 Mar 2019 06:26:37 -0700 Subject: [PATCH 1/5] URL Cleanup (#967) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://www.apache.org/licenses/ with 3 occurrences migrated to: https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200). * [ ] http://www.apache.org/licenses/LICENSE-2.0 with 970 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200). --- LICENSE | 2 +- .../src/test/resources/git_samples/contract-git/LICENSE.txt | 2 +- .../git_samples/contract-predefined-names-git/LICENSE.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 27ff85aa18..8d50b18f32 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/LICENSE.txt b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/LICENSE.txt index ff9ad4530f..62589edd12 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/LICENSE.txt +++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/LICENSE.txt @@ -1,7 +1,7 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-predefined-names-git/LICENSE.txt b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-predefined-names-git/LICENSE.txt index ff9ad4530f..62589edd12 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-predefined-names-git/LICENSE.txt +++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-predefined-names-git/LICENSE.txt @@ -1,7 +1,7 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION From 3fe15ac3ff7ccd094872c884ed3bd679da733217 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 27 Mar 2019 09:00:03 -0700 Subject: [PATCH 2/5] URL Cleanup (#1010) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # HTTP URLs that Could Not Be Fixed These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * [ ] http://1337.net (200) with 1 occurrences could not be migrated: ([https](https://1337.net) result SSLHandshakeException). * [ ] http://codearte.io (200) with 2 occurrences could not be migrated: ([https](https://codearte.io) result SSLHandshakeException). * [ ] http://groovy-lang.org/json.html (200) with 5 occurrences could not be migrated: ([https](https://groovy-lang.org/json.html) result SSLProtocolException). * [ ] http://partners.com (200) with 15 occurrences could not be migrated: ([https](https://partners.com) result SSLHandshakeException). * [ ] http://rest-assured.io/ (200) with 2 occurrences could not be migrated: ([https](https://rest-assured.io/) result SSLHandshakeException). * [ ] http://spockframework.org/ (200) with 1 occurrences could not be migrated: ([https](https://spockframework.org/) result SSLHandshakeException). * [ ] http://toomuchcoding.com/blog/categories/accurest/ (200) with 2 occurrences could not be migrated: ([https](https://toomuchcoding.com/blog/categories/accurest/) result SSLHandshakeException). * [ ] http://toomuchcoding.com/blog/categories/spring-cloud-contract/ (200) with 2 occurrences could not be migrated: ([https](https://toomuchcoding.com/blog/categories/spring-cloud-contract/) result SSLHandshakeException). * [ ] http://wiremock.org (200) with 3 occurrences could not be migrated: ([https](https://wiremock.org) result SSLHandshakeException). * [ ] http://wiremock.org/docs/running-standalone/ (200) with 2 occurrences could not be migrated: ([https](https://wiremock.org/docs/running-standalone/) result SSLHandshakeException). * [ ] http://wiremock.org/docs/stateful-behaviour/ (200) with 2 occurrences could not be migrated: ([https](https://wiremock.org/docs/stateful-behaviour/) result SSLHandshakeException). * [ ] http://wiremock.org/docs/stubbing/ (200) with 2 occurrences could not be migrated: ([https](https://wiremock.org/docs/stubbing/) result SSLHandshakeException). * [ ] http://wiremock.org/stubbing.html (200) with 1 occurrences could not be migrated: ([https](https://wiremock.org/stubbing.html) result SSLHandshakeException). * [ ] http://foo.com/ (301) with 1 occurrences could not be migrated: ([https](https://foo.com/) result SSLHandshakeException). * [ ] http://foo.com (301) with 1 occurrences could not be migrated: ([https](https://foo.com) result SSLHandshakeException). * [ ] http://foo.com/blah_ (301) with 2 occurrences could not be migrated: ([https](https://foo.com/blah_) result SSLHandshakeException). * [ ] http://foo.com/blah_blah (301) with 2 occurrences could not be migrated: ([https](https://foo.com/blah_blah) result SSLHandshakeException). * [ ] http://foo.com/blah_blah/ (301) with 2 occurrences could not be migrated: ([https](https://foo.com/blah_blah/) result SSLHandshakeException). * [ ] http://foo.com/blah_blah_ (301) with 2 occurrences could not be migrated: ([https](https://foo.com/blah_blah_) result SSLHandshakeException). * [ ] http://foo.com/unicode_ (301) with 1 occurrences could not be migrated: ([https](https://foo.com/unicode_) result SSLHandshakeException). * [ ] http://192.168.0.100:8081/artifactory/libs-release-local (403) with 1 occurrences could not be migrated: ([https](https://192.168.0.100:8081/artifactory/libs-release-local) result ConnectTimeoutException). * [ ] http://nexus.net/content/repositories/repository (404) with 1 occurrences could not be migrated: ([https](https://nexus.net/content/repositories/repository) result SSLProtocolException). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://142.42.1.1/ (AnnotatedNoRouteToHostException) with 1 occurrences migrated to: https://142.42.1.1/ ([https](https://142.42.1.1/) result AnnotatedNoRouteToHostException). * [ ] http://142.42.1.1:8080/ (AnnotatedNoRouteToHostException) with 1 occurrences migrated to: https://142.42.1.1:8080/ ([https](https://142.42.1.1:8080/) result AnnotatedNoRouteToHostException). * [ ] http://223.255.255.254 (AnnotatedNoRouteToHostException) with 1 occurrences migrated to: https://223.255.255.254 ([https](https://223.255.255.254) result AnnotatedNoRouteToHostException). * [ ] http://123.123.123 (ConnectTimeoutException) with 1 occurrences migrated to: https://123.123.123 ([https](https://123.123.123) result ConnectTimeoutException). * [ ] http://-a.b.co (UnknownHostException) with 1 occurrences migrated to: https://-a.b.co ([https](https://-a.b.co) result UnknownHostException). * [ ] http://-error-.invalid/ (UnknownHostException) with 1 occurrences migrated to: https://-error-.invalid/ ([https](https://-error-.invalid/) result UnknownHostException). * [ ] http://../ (UnknownHostException) with 1 occurrences migrated to: https://../ ([https](https://../) result UnknownHostException). * [ ] http://.www.foo.bar./ (UnknownHostException) with 1 occurrences migrated to: https://.www.foo.bar./ ([https](https://.www.foo.bar./) result UnknownHostException). * [ ] http://.www.foo.bar/ (UnknownHostException) with 1 occurrences migrated to: https://.www.foo.bar/ ([https](https://.www.foo.bar/) result UnknownHostException). * [ ] http://1.1.1.1.1 (UnknownHostException) with 1 occurrences migrated to: https://1.1.1.1.1 ([https](https://1.1.1.1.1) result UnknownHostException). * [ ] http://a.b-.co (UnknownHostException) with 1 occurrences migrated to: https://a.b-.co ([https](https://a.b-.co) result UnknownHostException). * [ ] http://a.b-c.de (UnknownHostException) with 1 occurrences migrated to: https://a.b-c.de ([https](https://a.b-c.de) result UnknownHostException). * [ ] http://foo-597104692.com (UnknownHostException) with 3 occurrences migrated to: https://foo-597104692.com ([https](https://foo-597104692.com) result UnknownHostException). * [ ] http://foo.bar (UnknownHostException) with 2 occurrences migrated to: https://foo.bar ([https](https://foo.bar) result UnknownHostException). * [ ] http://foo.bar/?q=Test%20URL-encoded%20stuff (UnknownHostException) with 1 occurrences migrated to: https://foo.bar/?q=Test%20URL-encoded%20stuff ([https](https://foo.bar/?q=Test%20URL-encoded%20stuff) result UnknownHostException). * [ ] http://foo.bar/foo (UnknownHostException) with 1 occurrences migrated to: https://foo.bar/foo ([https](https://foo.bar/foo) result UnknownHostException). * [ ] http://foo.bar?q=Spaces (UnknownHostException) with 1 occurrences migrated to: https://foo.bar?q=Spaces ([https](https://foo.bar?q=Spaces) result UnknownHostException). * [ ] http://foo389886219.com (UnknownHostException) with 3 occurrences migrated to: https://foo389886219.com ([https](https://foo389886219.com) result UnknownHostException). * [ ] http://userid:password@example.com (UnknownHostException) with 1 occurrences migrated to: https://userid:password@example.com ([https](https://userid:password@example.com) result UnknownHostException). * [ ] http://userid:password@example.com/ (UnknownHostException) with 1 occurrences migrated to: https://userid:password@example.com/ ([https](https://userid:password@example.com/) result UnknownHostException). * [ ] http://userid:password@example.com:8080 (UnknownHostException) with 1 occurrences migrated to: https://userid:password@example.com:8080 ([https](https://userid:password@example.com:8080) result UnknownHostException). * [ ] http://userid:password@example.com:8080/ (UnknownHostException) with 1 occurrences migrated to: https://userid:password@example.com:8080/ ([https](https://userid:password@example.com:8080/) result UnknownHostException). * [ ] http://userid@example.com (UnknownHostException) with 1 occurrences migrated to: https://userid@example.com ([https](https://userid@example.com) result UnknownHostException). * [ ] http://userid@example.com/ (UnknownHostException) with 1 occurrences migrated to: https://userid@example.com/ ([https](https://userid@example.com/) result UnknownHostException). * [ ] http://userid@example.com:8080 (UnknownHostException) with 1 occurrences migrated to: https://userid@example.com:8080 ([https](https://userid@example.com:8080) result UnknownHostException). * [ ] http://userid@example.com:8080/ (UnknownHostException) with 1 occurrences migrated to: https://userid@example.com:8080/ ([https](https://userid@example.com:8080/) result UnknownHostException). * [ ] http://www.foo.bar./ (UnknownHostException) with 1 occurrences migrated to: https://www.foo.bar./ ([https](https://www.foo.bar./) result UnknownHostException). * [ ] http://example.org/123/hello-url-matcher/ (404) with 1 occurrences migrated to: https://example.org/123/hello-url-matcher/ ([https](https://example.org/123/hello-url-matcher/) result 404). * [ ] http://example.org/123/url-path-pattern/ (404) with 1 occurrences migrated to: https://example.org/123/url-path-pattern/ ([https](https://example.org/123/url-path-pattern/) result 404). * [ ] http://example.org/body (404) with 10 occurrences migrated to: https://example.org/body ([https](https://example.org/body) result 404). * [ ] http://example.org/poster (404) with 6 occurrences migrated to: https://example.org/poster ([https](https://example.org/poster) result 404). * [ ] http://example.org/resource (404) with 10 occurrences migrated to: https://example.org/resource ([https](https://example.org/resource) result 404). * [ ] http://www.example.com/wpstyle/?p=364 (404) with 1 occurrences migrated to: https://www.example.com/wpstyle/?p=364 ([https](https://www.example.com/wpstyle/?p=364) result 404). * [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404). * [ ] http://api.twitter.com/1/geo/id/01fbe706f872cb32.json (403) with 4 occurrences migrated to: https://api.twitter.com/1/geo/id/01fbe706f872cb32.json ([https](https://api.twitter.com/1/geo/id/01fbe706f872cb32.json) result 410). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://asciidoctor.org with 1 occurrences migrated to: https://asciidoctor.org ([https](https://asciidoctor.org) result 200). * [ ] http://www.citrusframework.org/ (301) with 1 occurrences migrated to: https://citrusframework.org/ ([https](https://www.citrusframework.org/) result 200). * [ ] http://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html with 2 occurrences migrated to: https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html ([https](https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html) result 200). * [ ] http://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html with 1 occurrences migrated to: https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html ([https](https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html) result 200). * [ ] http://example.org with 41 occurrences migrated to: https://example.org ([https](https://example.org) result 200). * [ ] http://example.org/ with 3 occurrences migrated to: https://example.org/ ([https](https://example.org/) result 200). * [ ] http://handlebarsjs.com/ with 1 occurrences migrated to: https://handlebarsjs.com/ ([https](https://handlebarsjs.com/) result 200). * [ ] http://martinfowler.com/articles/consumerDrivenContracts.html with 1 occurrences migrated to: https://martinfowler.com/articles/consumerDrivenContracts.html ([https](https://martinfowler.com/articles/consumerDrivenContracts.html) result 200). * [ ] http://maven.apache.org/download.cgi with 1 occurrences migrated to: https://maven.apache.org/download.cgi ([https](https://maven.apache.org/download.cgi) result 200). * [ ] http://maven.apache.org/xsd/assembly-1.1.3.xsd with 1 occurrences migrated to: https://maven.apache.org/xsd/assembly-1.1.3.xsd ([https](https://maven.apache.org/xsd/assembly-1.1.3.xsd) result 200). * [ ] http://maven.apache.org/xsd/maven-4.0.0.xsd with 19 occurrences migrated to: https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200). * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 occurrences migrated to: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200). * [ ] http://tools.ietf.org/html/rfc1945 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc1945 ([https](https://tools.ietf.org/html/rfc1945) result 200). * [ ] http://tools.ietf.org/html/rfc2109 with 2 occurrences migrated to: https://tools.ietf.org/html/rfc2109 ([https](https://tools.ietf.org/html/rfc2109) result 200). * [ ] http://tools.ietf.org/html/rfc2295 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2295 ([https](https://tools.ietf.org/html/rfc2295) result 200). * [ ] http://tools.ietf.org/html/rfc2324 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2324 ([https](https://tools.ietf.org/html/rfc2324) result 200). * [ ] http://tools.ietf.org/html/rfc2518 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2518 ([https](https://tools.ietf.org/html/rfc2518) result 200). * [ ] http://tools.ietf.org/html/rfc2616 with 2 occurrences migrated to: https://tools.ietf.org/html/rfc2616 ([https](https://tools.ietf.org/html/rfc2616) result 200). * [ ] http://tools.ietf.org/html/rfc2774 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2774 ([https](https://tools.ietf.org/html/rfc2774) result 200). * [ ] http://tools.ietf.org/html/rfc2817 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2817 ([https](https://tools.ietf.org/html/rfc2817) result 200). * [ ] http://tools.ietf.org/html/rfc2965 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc2965 ([https](https://tools.ietf.org/html/rfc2965) result 200). * [ ] http://tools.ietf.org/html/rfc3229 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc3229 ([https](https://tools.ietf.org/html/rfc3229) result 200). * [ ] http://tools.ietf.org/html/rfc4918 with 5 occurrences migrated to: https://tools.ietf.org/html/rfc4918 ([https](https://tools.ietf.org/html/rfc4918) result 200). * [ ] http://tools.ietf.org/html/rfc5842 with 2 occurrences migrated to: https://tools.ietf.org/html/rfc5842 ([https](https://tools.ietf.org/html/rfc5842) result 200). * [ ] http://tools.ietf.org/html/rfc5988 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc5988 ([https](https://tools.ietf.org/html/rfc5988) result 200). * [ ] http://tools.ietf.org/html/rfc6266 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc6266 ([https](https://tools.ietf.org/html/rfc6266) result 200). * [ ] http://tools.ietf.org/html/rfc6454 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc6454 ([https](https://tools.ietf.org/html/rfc6454) result 200). * [ ] http://tools.ietf.org/html/rfc6585 with 4 occurrences migrated to: https://tools.ietf.org/html/rfc6585 ([https](https://tools.ietf.org/html/rfc6585) result 200). * [ ] http://tools.ietf.org/html/rfc7230 with 8 occurrences migrated to: https://tools.ietf.org/html/rfc7230 ([https](https://tools.ietf.org/html/rfc7230) result 200). * [ ] http://tools.ietf.org/html/rfc7231 with 53 occurrences migrated to: https://tools.ietf.org/html/rfc7231 ([https](https://tools.ietf.org/html/rfc7231) result 200). * [ ] http://tools.ietf.org/html/rfc7232 with 8 occurrences migrated to: https://tools.ietf.org/html/rfc7232 ([https](https://tools.ietf.org/html/rfc7232) result 200). * [ ] http://tools.ietf.org/html/rfc7233 with 6 occurrences migrated to: https://tools.ietf.org/html/rfc7233 ([https](https://tools.ietf.org/html/rfc7233) result 200). * [ ] http://tools.ietf.org/html/rfc7234 with 5 occurrences migrated to: https://tools.ietf.org/html/rfc7234 ([https](https://tools.ietf.org/html/rfc7234) result 200). * [ ] http://tools.ietf.org/html/rfc7235 with 6 occurrences migrated to: https://tools.ietf.org/html/rfc7235 ([https](https://tools.ietf.org/html/rfc7235) result 200). * [ ] http://tools.ietf.org/html/rfc7238 with 1 occurrences migrated to: https://tools.ietf.org/html/rfc7238 ([https](https://tools.ietf.org/html/rfc7238) result 200). * [ ] http://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt with 3 occurrences migrated to: https://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt ([https](https://tools.ietf.org/rfcdiff?difftype=--hwdiff&url2=draft-ietf-webdav-protocol-06.txt) result 200). * [ ] http://www.java.com/en/download/help/error_hotspot.xml with 1 occurrences migrated to: https://www.java.com/en/download/help/error_hotspot.xml ([https](https://www.java.com/en/download/help/error_hotspot.xml) result 200). * [ ] http://www.regular-expressions.info/examples.html with 1 occurrences migrated to: https://www.regular-expressions.info/examples.html ([https](https://www.regular-expressions.info/examples.html) result 200). * [ ] http://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura with 2 occurrences migrated to: https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura ([https](https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura) result 200). * [ ] http://www.w3.org/TR/cors/ with 8 occurrences migrated to: https://www.w3.org/TR/cors/ ([https](https://www.w3.org/TR/cors/) result 200). * [ ] http://cloud.spring.io/spring-cloud-cli with 1 occurrences migrated to: https://cloud.spring.io/spring-cloud-cli ([https](https://cloud.spring.io/spring-cloud-cli) result 301). * [ ] http://code.google.com/events/ with 1 occurrences migrated to: https://code.google.com/events/ ([https](https://code.google.com/events/) result 301). * [ ] http://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal with 1 occurrences migrated to: https://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal ([https](https://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal) result 301). * [ ] http://j.mp with 1 occurrences migrated to: https://j.mp ([https](https://j.mp) result 301). * [ ] http://pact.io/ with 1 occurrences migrated to: https://pact.io/ ([https](https://pact.io/) result 301). * [ ] http://plugins.jetbrains.com/plugin/6546 with 2 occurrences migrated to: https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301). * [ ] http://spockframework.github.io/ with 1 occurrences migrated to: https://spockframework.github.io/ ([https](https://spockframework.github.io/) result 301). * [ ] http://www.sonatype.org/nexus/ with 1 occurrences migrated to: https://www.sonatype.org/nexus/ ([https](https://www.sonatype.org/nexus/) result 301). * [ ] http://formvalidation.io/validators/uri/ with 1 occurrences migrated to: https://formvalidation.io/validators/uri/ ([https](https://formvalidation.io/validators/uri/) result 302). # Ignored These URLs were intentionally ignored. * http:///a with 1 occurrences * http://3628126748 with 1 occurrences * http://??/ with 1 occurrences * http://foo with 2 occurrences * http://foo/bar with 4 occurrences * http://foo/bar?myParam= with 1 occurrences * http://link/to/your/nexus/or/artifactory/or/sth with 2 occurrences * http://loanIssuance/name with 3 occurrences * http://localhost with 58 occurrences * http://localhost/partners/ with 8 occurrences * http://localhost/partners/1000/users/1001 with 3 occurrences * http://localhost:12345 with 2 occurrences * http://localhost:12346 with 2 occurrences * http://localhost:5435 with 1 occurrences * http://localhost:6060 with 1 occurrences * http://localhost:6061 with 1 occurrences * http://localhost:6063 with 1 occurrences * http://localhost:6065 with 1 occurrences * http://localhost:6066 with 1 occurrences * http://localhost:6067 with 1 occurrences * http://localhost:6565/ with 1 occurrences * http://localhost:6565/1 with 1 occurrences * http://localhost:7070 with 1 occurrences * http://localhost:7071 with 1 occurrences * http://localhost:8080 with 3 occurrences * http://localhost:8080/api with 1 occurrences * http://localhost:8081/artifactory/libs-release-local with 2 occurrences * http://localhost:8081/artifactory/libs-release-local/com/example/bookstore/0.0.1.RELEASE/ with 1 occurrences * http://localhost:8081/artifactory/libs-release-local/com/example/bookstore/0.0.1.RELEASE/bookstore-0.0.1.RELEASE-stubs.jar with 1 occurrences * http://localhost:8085 with 4 occurrences * http://localhost:8888/users with 1 occurrences * http://localhost:9090 with 1 occurrences * http://localhost:9876/api/books with 2 occurrences * http://maven.apache.org/POM/4.0.0 with 38 occurrences * http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 with 2 occurrences * http://someNameThatShouldMapFraudDetectionServer/name with 3 occurrences * http://some_url with 1 occurrences * http://www.w3.org/2001/XMLSchema-instance with 20 occurrences --- .github/CONTRIBUTING.md | 4 +- .gitignore | 2 +- README.adoc | 14 +- asciidoctor.css | 2 +- docs/src/main/asciidoc/README.adoc | 2 +- docs/src/main/asciidoc/migrations.adoc | 2 +- .../main/asciidoc/spring-cloud-wiremock.adoc | 2 +- docs/src/main/asciidoc/verifier_contract.adoc | 2 +- docs/src/main/asciidoc/verifier_faq.adoc | 4 +- .../main/asciidoc/verifier_introduction.adoc | 2 +- docs/src/main/asciidoc/verifier_setup.adoc | 4 +- ideas.md | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- ...mockForDocsMockServerApplicationTests.java | 2 +- .../WiremockMockServerApplicationTests.java | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- .../WiremockMockServerApplicationTests.java | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- .../WiremockMockServerApplicationTests.java | 2 +- .../com/example/WiremockTestsApplication.java | 2 +- .../contract/spec/internal/HttpHeaders.groovy | 120 ++++++++-------- .../contract/spec/internal/HttpStatus.groovy | 130 +++++++++--------- .../spec/internal/RegexPatterns.groovy | 2 +- .../spec/internal/RegexPatternsSpec.groovy | 76 +++++----- spring-cloud-contract-stub-runner/README.adoc | 6 +- .../stubrunner/GitStubDownloaderTests.java | 2 +- .../bootService-0.0.1-SNAPSHOT.pom | 2 +- .../fraudDetectionServer-0.0.1-SNAPSHOT.pom | 2 +- .../loanIssuance-0.0.1-SNAPSHOT.pom | 2 +- ...erWithMultipleConsumers-0.0.1-SNAPSHOT.pom | 2 +- .../DslToWireMockClientConverterSpec.groovy | 6 +- .../jersey-contracts-0.0.1-SNAPSHOT.pom | 2 +- .../contracts-0.0.1-SNAPSHOT.pom | 2 +- .../contracts-0.0.1-SNAPSHOT.pom | 2 +- .../services-contracts-1.0.4-SNAPSHOT.pom | 2 +- .../TestSideRequestTemplateModel.groovy | 2 +- .../JaxRsClientMethodBuilderSpec.groovy | 2 +- .../MessagingMethodBodyBuilderSpec.groovy | 2 +- .../SpringTestMethodBodyBuildersSpec.groovy | 4 +- .../WiremockMockServerApplicationTests.java | 116 ++++++++-------- .../wiremock/WiremockTestsApplication.java | 2 +- .../AmqpMessagingApplicationSpec.groovy | 2 +- ...loud-contract-amqp-test-0.4.0-SNAPSHOT.pom | 2 +- .../bootService-0.0.1-SNAPSHOT.pom | 2 +- .../fraudDetectionServer-0.0.1-SNAPSHOT.pom | 2 +- .../loanIssuance-0.0.1-SNAPSHOT.pom | 2 +- .../bootService-0.0.1-SNAPSHOT.pom | 2 +- .../fraudDetectionServer-0.0.1-SNAPSHOT.pom | 2 +- .../loanIssuance-0.0.1-SNAPSHOT.pom | 2 +- .../camelService-0.0.1-SNAPSHOT.pom | 2 +- ...athFraudDetectionServer-0.0.1-SNAPSHOT.pom | 2 +- .../integrationService-0.0.1-SNAPSHOT.pom | 2 +- .../streamService-0.0.1-SNAPSHOT.pom | 2 +- 55 files changed, 286 insertions(+), 286 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8560ad2a71..eb9a16ae63 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -28,7 +28,7 @@ added after the original pull request but before a merge. you can import formatter settings using the `eclipse-code-formatter.xml` file from the [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the - [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file. + [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is for. @@ -40,6 +40,6 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow [these conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), +* When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html), if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). diff --git a/.gitignore b/.gitignore index d4b2d0efed..798a979058 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ bin/ *.ear *.versionsBackup -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +# virtual machine crash logs, see https://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* *.class diff --git a/README.adoc b/README.adoc index 721595db18..6eeeb5daa1 100644 --- a/README.adoc +++ b/README.adoc @@ -23,7 +23,7 @@ producers and consumers -- for both HTTP and message-based interactions. If you prefer to learn about the project by doing some tutorials, you can check out the workshops under -http://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. +https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. === Spring Cloud Contract Verifier @@ -1538,7 +1538,7 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480] ==== Readings -- http://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] +- https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] - http://toomuchcoding.com/blog/categories/accurest/[Accurest related articles from Marcin Grzejszczak's blog] - http://toomuchcoding.com/blog/categories/spring-cloud-contract/[Spring Cloud Contract related articles from Marcin Grzejszczak's blog] - http://groovy-lang.org/json.html[Groovy docs regarding JSON] @@ -1784,7 +1784,7 @@ public class WiremockForDocsMockServerApplicationTests { public void contextLoads() throws Exception { // will read stubs classpath MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) - .baseUrl("http://example.org").stubs("classpath:/stubs/resource.json") + .baseUrl("https://example.org").stubs("classpath:/stubs/resource.json") .build(); // We're asserting if WireMock responded properly assertThat(this.service.go()).isEqualTo("Hello World"); @@ -1797,7 +1797,7 @@ public class WiremockForDocsMockServerApplicationTests { The `baseUrl` value is prepended to all mock calls, and the `stubs()` method takes a stub path resource pattern as an argument. In the preceding example, the stub defined at `/stubs/resource.json` is loaded into the mock server. If the `RestTemplate` is asked to -visit `http://example.org/`, it gets the responses as being declared at that URL. More +visit `https://example.org/`, it gets the responses as being declared at that URL. More than one stub pattern can be specified, and each one can be a directory (for a recursive list of all ".json"), a fixed filename (as in the example above), or an Ant-style pattern. The JSON format is the normal WireMock format, which you can read about in the @@ -2090,7 +2090,7 @@ added after the original pull request but before a merge. `eclipse-code-formatter.xml` file from the https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring Cloud Build] project. If using IntelliJ, you can use the - http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin] to import the same file. * Make sure all new `.java` files to have a simple Javadoc class comment with at least an `@author` tag identifying you, and preferably at least a paragraph on what the class is @@ -2103,7 +2103,7 @@ added after the original pull request but before a merge. * A few unit tests would help a lot as well -- someone has to do it. * If no-one else is using your branch, please rebase it against the current master (or other target branch in the main project). -* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit message (where XXXX is the issue number). @@ -2174,7 +2174,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i + "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> diff --git a/asciidoctor.css b/asciidoctor.css index 022f01b166..dd1495848b 100644 --- a/asciidoctor.css +++ b/asciidoctor.css @@ -1,4 +1,4 @@ -/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */ +/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */ /* Remove the comments around the @import statement below when using this as a custom stylesheet */ /*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";*/ article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary { diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index a5d8c0e181..cf91eb0f74 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -17,7 +17,7 @@ producers and consumers -- for both HTTP and message-based interactions. If you prefer to learn about the project by doing some tutorials, you can check out the workshops under -http://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. +https://cloud-samples.spring.io/spring-cloud-contract-samples/workshops.html[this link]. === Spring Cloud Contract Verifier diff --git a/docs/src/main/asciidoc/migrations.adoc b/docs/src/main/asciidoc/migrations.adoc index a4ef065a02..b4c8954058 100644 --- a/docs/src/main/asciidoc/migrations.adoc +++ b/docs/src/main/asciidoc/migrations.adoc @@ -82,7 +82,7 @@ structure presented in the previous snippet. + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 https://maven.apache.org/xsd/assembly-1.1.3.xsd"> stubs jar diff --git a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc index 311191ed29..f3addf4f27 100644 --- a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc +++ b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc @@ -160,7 +160,7 @@ include::{doc_samples}/src/test/java/com/example/WiremockForDocsMockServerApplic The `baseUrl` value is prepended to all mock calls, and the `stubs()` method takes a stub path resource pattern as an argument. In the preceding example, the stub defined at `/stubs/resource.json` is loaded into the mock server. If the `RestTemplate` is asked to -visit `http://example.org/`, it gets the responses as being declared at that URL. More +visit `https://example.org/`, it gets the responses as being declared at that URL. More than one stub pattern can be specified, and each one can be a directory (for a recursive list of all ".json"), a fixed filename (as in the example above), or an Ant-style pattern. The JSON format is the normal WireMock format, which you can read about in the diff --git a/docs/src/main/asciidoc/verifier_contract.adoc b/docs/src/main/asciidoc/verifier_contract.adoc index a9f4901505..fcc0b9fd28 100644 --- a/docs/src/main/asciidoc/verifier_contract.adoc +++ b/docs/src/main/asciidoc/verifier_contract.adoc @@ -624,7 +624,7 @@ given name. matches the JSON Path. If you're using the YAML contract definition you have to use the -http://handlebarsjs.com/[Handlebars] `{{{ }}}` notation with custom, Spring Cloud Contract +https://handlebarsjs.com/[Handlebars] `{{{ }}}` notation with custom, Spring Cloud Contract functions to achieve this. * `{{{ request.url }}}`: Returns the request URL and query parameters. diff --git a/docs/src/main/asciidoc/verifier_faq.adoc b/docs/src/main/asciidoc/verifier_faq.adoc index 0e0fff5c8b..148116b72d 100644 --- a/docs/src/main/asciidoc/verifier_faq.adoc +++ b/docs/src/main/asciidoc/verifier_faq.adoc @@ -316,7 +316,7 @@ When the *consumer* wants to work on the contracts offline, instead of cloning t consumer team clones the common repository, goes to the required producer's folder (e.g. `com/example/server`) and runs `mvn clean install -DskipTests` to install locally the stubs converted from the contracts. -TIP: You need to have http://maven.apache.org/download.cgi[Maven installed locally] +TIP: You need to have https://maven.apache.org/download.cgi[Maven installed locally] ==== Producer @@ -690,7 +690,7 @@ to find stub definitions and contracts. E.g. for `com.example:foo:1.0.0` the pat === Can I use the Pact Broker? -When using http://pact.io/[Pact] you can use the https://github.com/pact-foundation/pact_broker[Pact Broker] +When using https://pact.io/[Pact] you can use the https://github.com/pact-foundation/pact_broker[Pact Broker] to store and share Pact definitions. Starting from Spring Cloud Contract 2.0.0 one can fetch Pact files from the Pact Broker to generate tests and stubs. diff --git a/docs/src/main/asciidoc/verifier_introduction.adoc b/docs/src/main/asciidoc/verifier_introduction.adoc index 69f97a0f2a..d8dd72ee30 100644 --- a/docs/src/main/asciidoc/verifier_introduction.adoc +++ b/docs/src/main/asciidoc/verifier_introduction.adoc @@ -1045,7 +1045,7 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480] ==== Readings -- http://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] +- https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] - http://toomuchcoding.com/blog/categories/accurest/[Accurest related articles from Marcin Grzejszczak's blog] - http://toomuchcoding.com/blog/categories/spring-cloud-contract/[Spring Cloud Contract related articles from Marcin Grzejszczak's blog] - http://groovy-lang.org/json.html[Groovy docs regarding JSON] diff --git a/docs/src/main/asciidoc/verifier_setup.adoc b/docs/src/main/asciidoc/verifier_setup.adoc index 4dd28c918c..e435ffb2d5 100644 --- a/docs/src/main/asciidoc/verifier_setup.adoc +++ b/docs/src/main/asciidoc/verifier_setup.adoc @@ -33,7 +33,7 @@ In order to use Spring Cloud Contract Verifier with WireMock, you muse use eithe Gradle or a Maven plugin. WARNING: If you want to use Spock in your projects, you must add separately the -`spock-core` and `spock-spring` modules. Check http://spockframework.github.io/[Spock +`spock-core` and `spock-spring` modules. Check https://spockframework.github.io/[Spock docs for more information] [[gradle-add-gradle-plugin]] @@ -1059,7 +1059,7 @@ like them to be available for others to download / reference or reuse. In case of the JVM world those artifacts would be JARs, for Ruby these are gems and for Docker those would be Docker images. You can store those artifacts in a manager. Examples of such managers can be https://jfrog.com/artifactory/[Artifactory] -or http://www.sonatype.org/nexus/[Nexus]. +or https://www.sonatype.org/nexus/[Nexus]. ==== How it works diff --git a/ideas.md b/ideas.md index c68c4a5cae..9d3aa2b7f5 100644 --- a/ideas.md +++ b/ideas.md @@ -13,5 +13,5 @@ Feature ideas: - [x] `DiscoveryClient` support so backends can be stubbed or mocked transparently (declaratively) - [ ] Actuator endpoints that verify the state of contracts supported by the host service - [x] Something to make PACT easier to use in Spring Boot apps? -- [ ] Support [Citrus](http://www.citrusframework.org/) users (somehow?) +- [ ] Support [Citrus](https://citrusframework.org/) users (somehow?) - [x] Schema registries for binary formats like protobuf, thrift, avro - Stream does it diff --git a/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java index 5ff6b355e3..a7638e9f6d 100644 --- a/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-jetty/src/main/java/com/example/WiremockTestsApplication.java @@ -61,7 +61,7 @@ class Service { private final RestTemplate restTemplate; - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; Service(RestTemplate restTemplate) { diff --git a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java index 867da66a89..059c426c56 100644 --- a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java +++ b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java @@ -44,7 +44,7 @@ public class WiremockForDocsMockServerApplicationTests { public void contextLoads() throws Exception { // will read stubs classpath MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) - .baseUrl("http://example.org").stubs("classpath:/stubs/resource.json") + .baseUrl("https://example.org").stubs("classpath:/stubs/resource.json") .build(); // We're asserting if WireMock responded properly assertThat(this.service.go()).isEqualTo("Hello World"); diff --git a/samples/wiremock-jetty/src/test/java/com/example/WiremockMockServerApplicationTests.java b/samples/wiremock-jetty/src/test/java/com/example/WiremockMockServerApplicationTests.java index 6c46a35893..8cfacbc77e 100644 --- a/samples/wiremock-jetty/src/test/java/com/example/WiremockMockServerApplicationTests.java +++ b/samples/wiremock-jetty/src/test/java/com/example/WiremockMockServerApplicationTests.java @@ -42,7 +42,7 @@ public class WiremockMockServerApplicationTests { @Test public void contextLoads() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/stubs/resource.json").build(); assertThat(this.service.go()).isEqualTo("Hello World"); server.verify(); diff --git a/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java index 276516bd5a..29b34d9e2e 100644 --- a/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-native/src/main/java/com/example/WiremockTestsApplication.java @@ -60,7 +60,7 @@ class Service { private final RestTemplate restTemplate; - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; Service(RestTemplate restTemplate) { diff --git a/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java index cde0761053..18e5ed7ac0 100644 --- a/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-tomcat/src/main/java/com/example/WiremockTestsApplication.java @@ -61,7 +61,7 @@ class Service { private final RestTemplate restTemplate; - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; Service(RestTemplate restTemplate) { diff --git a/samples/wiremock-tomcat/src/test/java/com/example/WiremockMockServerApplicationTests.java b/samples/wiremock-tomcat/src/test/java/com/example/WiremockMockServerApplicationTests.java index 53d7a09b9c..e56e9ab391 100644 --- a/samples/wiremock-tomcat/src/test/java/com/example/WiremockMockServerApplicationTests.java +++ b/samples/wiremock-tomcat/src/test/java/com/example/WiremockMockServerApplicationTests.java @@ -42,7 +42,7 @@ public class WiremockMockServerApplicationTests { @Test public void contextLoads() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/stubs/**/*.json").build(); assertThat(this.service.go()).isEqualTo("Hello World"); server.verify(); diff --git a/samples/wiremock-undertow-ssl/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-undertow-ssl/src/main/java/com/example/WiremockTestsApplication.java index 276516bd5a..29b34d9e2e 100644 --- a/samples/wiremock-undertow-ssl/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-undertow-ssl/src/main/java/com/example/WiremockTestsApplication.java @@ -60,7 +60,7 @@ class Service { private final RestTemplate restTemplate; - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; Service(RestTemplate restTemplate) { diff --git a/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java index 276516bd5a..29b34d9e2e 100644 --- a/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock-undertow/src/main/java/com/example/WiremockTestsApplication.java @@ -60,7 +60,7 @@ class Service { private final RestTemplate restTemplate; - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") private String base; Service(RestTemplate restTemplate) { diff --git a/samples/wiremock-undertow/src/test/java/com/example/WiremockMockServerApplicationTests.java b/samples/wiremock-undertow/src/test/java/com/example/WiremockMockServerApplicationTests.java index 691cecaa0e..e957f1387e 100644 --- a/samples/wiremock-undertow/src/test/java/com/example/WiremockMockServerApplicationTests.java +++ b/samples/wiremock-undertow/src/test/java/com/example/WiremockMockServerApplicationTests.java @@ -42,7 +42,7 @@ public class WiremockMockServerApplicationTests { @Test public void contextLoads() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/stubs").build(); assertThat(this.service.go()).isEqualTo("Hello World"); server.verify(); diff --git a/samples/wiremock/src/main/java/com/example/WiremockTestsApplication.java b/samples/wiremock/src/main/java/com/example/WiremockTestsApplication.java index dab036873a..83f5ddd4f2 100644 --- a/samples/wiremock/src/main/java/com/example/WiremockTestsApplication.java +++ b/samples/wiremock/src/main/java/com/example/WiremockTestsApplication.java @@ -67,7 +67,7 @@ class Controller { @Component class Service { - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") String base; private RestTemplate restTemplate; diff --git a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpHeaders.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpHeaders.groovy index ccf58484bd..6845486a8e 100644 --- a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpHeaders.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpHeaders.groovy @@ -33,119 +33,119 @@ class HttpHeaders { /** * The HTTP {@code Accept} header field name. - * @see Section 5.3.2 of RFC 7231 + * @see Section 5.3.2 of RFC 7231 */ String accept() { return "Accept" } /** * The HTTP {@code Accept-Charset} header field name. - * @see Section 5.3.3 of RFC 7231 + * @see Section 5.3.3 of RFC 7231 */ String acceptCharset() { return "Accept-Charset" } /** * The HTTP {@code Accept-Encoding} header field name. - * @see Section 5.3.4 of RFC 7231 + * @see Section 5.3.4 of RFC 7231 */ String acceptEncoding() { return "Accept-Encoding" } /** * The HTTP {@code Accept-Language} header field name. - * @see Section 5.3.5 of RFC 7231 + * @see Section 5.3.5 of RFC 7231 */ String acceptLanguage() { return "Accept-Language" } /** * The HTTP {@code Accept-Ranges} header field name. - * @see Section 5.3.5 of RFC 7233 + * @see Section 5.3.5 of RFC 7233 */ String acceptRanges() { return "Accept-Ranges" } /** * The CORS {@code Access-Control-Allow-Credentials} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlAllowCredentials() { return "Access-Control-Allow-Credentials" } /** * The CORS {@code Access-Control-Allow-Headers} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlAllowHeaders() { return "Access-Control-Allow-Headers" } /** * The CORS {@code Access-Control-Allow-Methods} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlAllowMethods() { return "Access-Control-Allow-Methods" } /** * The CORS {@code Access-Control-Allow-Origin} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlAllowOrigin() { return "Access-Control-Allow-Origin" } /** * The CORS {@code Access-Control-Expose-Headers} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlExposeHeaders() { return "Access-Control-Expose-Headers" } /** * The CORS {@code Access-Control-Max-Age} response header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlMaxAge() { return "Access-Control-Max-Age" } /** * The CORS {@code Access-Control-Request-Headers} request header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlRequestHeaders() { return "Access-Control-Request-Headers" } /** * The CORS {@code Access-Control-Request-Method} request header field name. - * @see CORS W3C recommendation + * @see CORS W3C recommendation */ String accessControlRequestMethod() { return "Access-Control-Request-Method" } /** * The HTTP {@code Age} header field name. - * @see Section 5.1 of RFC 7234 + * @see Section 5.1 of RFC 7234 */ String age() { return "Age" } /** * The HTTP {@code Allow} header field name. - * @see Section 7.4.1 of RFC 7231 + * @see Section 7.4.1 of RFC 7231 */ String allow() { return "Allow" } /** * The HTTP {@code Authorization} header field name. - * @see Section 4.2 of RFC 7235 + * @see Section 4.2 of RFC 7235 */ String authorization() { return "Authorization" } /** * The HTTP {@code Cache-Control} header field name. - * @see Section 5.2 of RFC 7234 + * @see Section 5.2 of RFC 7234 */ String cacheControl() { return "Cache-Control" @@ -153,7 +153,7 @@ class HttpHeaders { /** * The HTTP {@code Connection} header field name. - * @see Section 6.1 of RFC 7230 + * @see Section 6.1 of RFC 7230 */ String connection() { return "Connection" @@ -161,7 +161,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Encoding} header field name. - * @see Section 3.1.2.2 of RFC 7231 + * @see Section 3.1.2.2 of RFC 7231 */ String contentEncoding() { return "Content-Encoding" @@ -169,7 +169,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Disposition} header field name - * @see RFC 6266 + * @see RFC 6266 */ String contentDisposition() { return "Content-Disposition" @@ -177,7 +177,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Language} header field name. - * @see Section 3.1.3.2 of RFC 7231 + * @see Section 3.1.3.2 of RFC 7231 */ String contentLanguage() { return "Content-Language" @@ -185,7 +185,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Length} header field name. - * @see Section 3.3.2 of RFC 7230 + * @see Section 3.3.2 of RFC 7230 */ String contentLength() { return "Content-Length" @@ -193,7 +193,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Location} header field name. - * @see Section 3.1.4.2 of RFC 7231 + * @see Section 3.1.4.2 of RFC 7231 */ String contentLocation() { return "Content-Location" @@ -201,7 +201,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Range} header field name. - * @see Section 4.2 of RFC 7233 + * @see Section 4.2 of RFC 7233 */ String contentRange() { return "Content-Range" @@ -209,7 +209,7 @@ class HttpHeaders { /** * The HTTP {@code Content-Type} header field name. - * @see Section 3.1.1.5 of RFC 7231 + * @see Section 3.1.1.5 of RFC 7231 */ String contentType() { return "Content-Type" @@ -217,7 +217,7 @@ class HttpHeaders { /** * The HTTP {@code Cookie} header field name. - * @see Section 4.3.4 of RFC 2109 + * @see Section 4.3.4 of RFC 2109 */ String cookie() { return "Cookie" @@ -225,7 +225,7 @@ class HttpHeaders { /** * The HTTP {@code Date} header field name. - * @see Section 7.1.1.2 of RFC 7231 + * @see Section 7.1.1.2 of RFC 7231 */ String date() { return "Date" @@ -233,7 +233,7 @@ class HttpHeaders { /** * The HTTP {@code ETag} header field name. - * @see Section 2.3 of RFC 7232 + * @see Section 2.3 of RFC 7232 */ String etag() { return "ETag" @@ -241,7 +241,7 @@ class HttpHeaders { /** * The HTTP {@code Expect} header field name. - * @see Section 5.1.1 of RFC 7231 + * @see Section 5.1.1 of RFC 7231 */ String expect() { return "Expect" @@ -249,7 +249,7 @@ class HttpHeaders { /** * The HTTP {@code Expires} header field name. - * @see Section 5.3 of RFC 7234 + * @see Section 5.3 of RFC 7234 */ String expires() { return "Expires" @@ -257,7 +257,7 @@ class HttpHeaders { /** * The HTTP {@code From} header field name. - * @see Section 5.5.1 of RFC 7231 + * @see Section 5.5.1 of RFC 7231 */ String from() { return "From" @@ -265,7 +265,7 @@ class HttpHeaders { /** * The HTTP {@code Host} header field name. - * @see Section 5.4 of RFC 7230 + * @see Section 5.4 of RFC 7230 */ String host() { return "Host" @@ -273,7 +273,7 @@ class HttpHeaders { /** * The HTTP {@code If-Match} header field name. - * @see Section 3.1 of RFC 7232 + * @see Section 3.1 of RFC 7232 */ String ifMatch() { return "If-Match" @@ -281,7 +281,7 @@ class HttpHeaders { /** * The HTTP {@code If-Modified-Since} header field name. - * @see Section 3.3 of RFC 7232 + * @see Section 3.3 of RFC 7232 */ String ifModifiedSince() { return "If-Modified-Since" @@ -289,7 +289,7 @@ class HttpHeaders { /** * The HTTP {@code If-None-Match} header field name. - * @see Section 3.2 of RFC 7232 + * @see Section 3.2 of RFC 7232 */ String ifNoneMatch() { return "If-None-Match" @@ -297,7 +297,7 @@ class HttpHeaders { /** * The HTTP {@code If-Range} header field name. - * @see Section 3.2 of RFC 7233 + * @see Section 3.2 of RFC 7233 */ String ifRange() { return "If-Range" @@ -305,7 +305,7 @@ class HttpHeaders { /** * The HTTP {@code If-Unmodified-Since} header field name. - * @see Section 3.4 of RFC 7232 + * @see Section 3.4 of RFC 7232 */ String ifUnmodifiedSince() { return "If-Unmodified-Since" @@ -313,7 +313,7 @@ class HttpHeaders { /** * The HTTP {@code Last-Modified} header field name. - * @see Section 2.2 of RFC 7232 + * @see Section 2.2 of RFC 7232 */ String lastModified() { return "Last-Modified" @@ -321,7 +321,7 @@ class HttpHeaders { /** * The HTTP {@code Link} header field name. - * @see RFC 5988 + * @see RFC 5988 */ String link() { return "Link" @@ -329,7 +329,7 @@ class HttpHeaders { /** * The HTTP {@code Location} header field name. - * @see Section 7.1.2 of RFC 7231 + * @see Section 7.1.2 of RFC 7231 */ String location() { return "Location" @@ -337,14 +337,14 @@ class HttpHeaders { /** * The HTTP {@code Max-Forwards} header field name. - * @see Section 5.1.2 of RFC 7231 + * @see Section 5.1.2 of RFC 7231 */ String max_forwards() { return "Max-Forwards" } /** * The HTTP {@code Origin} header field name. - * @see RFC 6454 + * @see RFC 6454 */ String origin() { return "Origin" @@ -352,7 +352,7 @@ class HttpHeaders { /** * The HTTP {@code Pragma} header field name. - * @see Section 5.4 of RFC 7234 + * @see Section 5.4 of RFC 7234 */ String pragma() { return "Pragma" @@ -360,7 +360,7 @@ class HttpHeaders { /** * The HTTP {@code Proxy-Authenticate} header field name. - * @see Section 4.3 of RFC 7235 + * @see Section 4.3 of RFC 7235 */ String proxyAuthenticate() { return "Proxy-Authenticate" @@ -368,7 +368,7 @@ class HttpHeaders { /** * The HTTP {@code Proxy-Authorization} header field name. - * @see Section 4.4 of RFC 7235 + * @see Section 4.4 of RFC 7235 */ String proxyAuthorization() { return "Proxy-Authorization" @@ -376,7 +376,7 @@ class HttpHeaders { /** * The HTTP {@code Range} header field name. - * @see Section 3.1 of RFC 7233 + * @see Section 3.1 of RFC 7233 */ String range() { return "Range" @@ -384,7 +384,7 @@ class HttpHeaders { /** * The HTTP {@code Referer} header field name. - * @see Section 5.5.2 of RFC 7231 + * @see Section 5.5.2 of RFC 7231 */ String referer() { return "Referer" @@ -392,7 +392,7 @@ class HttpHeaders { /** * The HTTP {@code Retry-After} header field name. - * @see Section 7.1.3 of RFC 7231 + * @see Section 7.1.3 of RFC 7231 */ String retryAfter() { return "Retry-After" @@ -400,7 +400,7 @@ class HttpHeaders { /** * The HTTP {@code Server} header field name. - * @see Section 7.4.2 of RFC 7231 + * @see Section 7.4.2 of RFC 7231 */ String server() { return "Server" @@ -408,7 +408,7 @@ class HttpHeaders { /** * The HTTP {@code Set-Cookie} header field name. - * @see Section 4.2.2 of RFC 2109 + * @see Section 4.2.2 of RFC 2109 */ String setCookie() { return "Set-Cookie" @@ -416,7 +416,7 @@ class HttpHeaders { /** * The HTTP {@code Set-Cookie2} header field name. - * @see RFC 2965 + * @see RFC 2965 */ String setCookie2() { return "Set-Cookie2" @@ -424,7 +424,7 @@ class HttpHeaders { /** * The HTTP {@code TE} header field name. - * @see Section 4.3 of RFC 7230 + * @see Section 4.3 of RFC 7230 */ String te() { return "TE" @@ -432,7 +432,7 @@ class HttpHeaders { /** * The HTTP {@code Trailer} header field name. - * @see Section 4.4 of RFC 7230 + * @see Section 4.4 of RFC 7230 */ String trailer() { return "Trailer" @@ -440,7 +440,7 @@ class HttpHeaders { /** * The HTTP {@code Transfer-Encoding} header field name. - * @see Section 3.3.1 of RFC 7230 + * @see Section 3.3.1 of RFC 7230 */ String transferEncoding() { return "Transfer-Encoding" @@ -448,7 +448,7 @@ class HttpHeaders { /** * The HTTP {@code Upgrade} header field name. - * @see Section 6.7 of RFC 7230 + * @see Section 6.7 of RFC 7230 */ String upgrade() { return "Upgrade" @@ -456,7 +456,7 @@ class HttpHeaders { /** * The HTTP {@code User-Agent} header field name. - * @see Section 5.5.3 of RFC 7231 + * @see Section 5.5.3 of RFC 7231 */ String user_agent() { return "User-Agent" @@ -464,7 +464,7 @@ class HttpHeaders { /** * The HTTP {@code Vary} header field name. - * @see Section 7.1.4 of RFC 7231 + * @see Section 7.1.4 of RFC 7231 */ String vary() { return "Vary" @@ -472,7 +472,7 @@ class HttpHeaders { /** * The HTTP {@code Via} header field name. - * @see Section 5.7.1 of RFC 7230 + * @see Section 5.7.1 of RFC 7230 */ String via() { return "Via" @@ -480,7 +480,7 @@ class HttpHeaders { /** * The HTTP {@code Warning} header field name. - * @see Section 5.5 of RFC 7234 + * @see Section 5.5 of RFC 7234 */ String warning() { return "Warning" @@ -488,7 +488,7 @@ class HttpHeaders { /** * The HTTP {@code WWW-Authenticate} header field name. - * @see Section 4.1 of RFC 7235 + * @see Section 4.1 of RFC 7235 */ String wwwAuthenticate() { return "WWW-Authenticate" diff --git a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpStatus.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpStatus.groovy index 12aefffcbb..80144c777b 100644 --- a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpStatus.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/HttpStatus.groovy @@ -33,7 +33,7 @@ class HttpStatus { /** * {@code 100 Continue}. - * @see HTTP/1.1: Semantics and Content, section 6.2.1 + * @see HTTP/1.1: Semantics and Content, section 6.2.1 */ int CONTINUE() { return 100 @@ -41,19 +41,19 @@ class HttpStatus { /** * {@code 101 Switching Protocols}. - * @see HTTP/1.1: Semantics and Content, section 6.2.2 + * @see HTTP/1.1: Semantics and Content, section 6.2.2 */ int SWITCHING_PROTOCOLS() { return 101 } /** * {@code 102 Processing}. - * @see WebDAV + * @see WebDAV */ int PROCESSING() { return 102 } /** * {@code 103 Checkpoint}. - * @see A proposal for supporting + * @see A proposal for supporting * resumable POST/PUT HTTP requests in HTTP/1.0 */ int CHECKPOINT() { return 103 } @@ -62,52 +62,52 @@ class HttpStatus { /** * {@code 200 OK}. - * @see HTTP/1.1: Semantics and Content, section 6.3.1 + * @see HTTP/1.1: Semantics and Content, section 6.3.1 */ int OK() { return 200 } /** * {@code 201 Created}. - * @see HTTP/1.1: Semantics and Content, section 6.3.2 + * @see HTTP/1.1: Semantics and Content, section 6.3.2 */ int CREATED() { return 201 } /** * {@code 202 Accepted}. - * @see HTTP/1.1: Semantics and Content, section 6.3.3 + * @see HTTP/1.1: Semantics and Content, section 6.3.3 */ int ACCEPTED() { return 202 } /** * {@code 203 Non-Authoritative Information}. - * @see HTTP/1.1: Semantics and Content, section 6.3.4 + * @see HTTP/1.1: Semantics and Content, section 6.3.4 */ int NON_AUTHORITATIVE_INFORMATION() { return 203 } /** * {@code 204 No Content}. - * @see HTTP/1.1: Semantics and Content, section 6.3.5 + * @see HTTP/1.1: Semantics and Content, section 6.3.5 */ int NO_CONTENT() { return 204 } /** * {@code 205 Reset Content}. - * @see HTTP/1.1: Semantics and Content, section 6.3.6 + * @see HTTP/1.1: Semantics and Content, section 6.3.6 */ int RESET_CONTENT() { return 205 } /** * {@code 206 Partial Content}. - * @see HTTP/1.1: Range Requests, section 4.1 + * @see HTTP/1.1: Range Requests, section 4.1 */ int PARTIAL_CONTENT() { return 206 } /** * {@code 207 Multi-Status}. - * @see WebDAV + * @see WebDAV */ int MULTI_STATUS() { return 207 } /** * {@code 208 Already Reported}. - * @see WebDAV Binding Extensions + * @see WebDAV Binding Extensions */ int ALREADY_REPORTED() { return 208 } /** * {@code 226 IM Used}. - * @see Delta encoding in HTTP + * @see Delta encoding in HTTP */ int IM_USED() { return 226 } @@ -115,51 +115,51 @@ class HttpStatus { /** * {@code 300 Multiple Choices}. - * @see HTTP/1.1: Semantics and Content, section 6.4.1 + * @see HTTP/1.1: Semantics and Content, section 6.4.1 */ int MULTIPLE_CHOICES() { return 300 } /** * {@code 301 Moved Permanently}. - * @see HTTP/1.1: Semantics and Content, section 6.4.2 + * @see HTTP/1.1: Semantics and Content, section 6.4.2 */ int MOVED_PERMANENTLY() { return 301 } /** * {@code 302 Found}. - * @see HTTP/1.1: Semantics and Content, section 6.4.3 + * @see HTTP/1.1: Semantics and Content, section 6.4.3 */ int FOUND() { return 302 } /** * {@code 302 Moved Temporarily}. - * @see HTTP/1.0, section 9.3 + * @see HTTP/1.0, section 9.3 * @deprecated in favor of {@link #FOUND} which will be returned from {@code HttpStatus.valueOf(302)} */ @Deprecated int MOVED_TEMPORARILY() { return 302 } /** * {@code 303 See Other}. - * @see HTTP/1.1: Semantics and Content, section 6.4.4 + * @see HTTP/1.1: Semantics and Content, section 6.4.4 */ int SEE_OTHER() { return 303 } /** * {@code 304 Not Modified}. - * @see HTTP/1.1: Conditional Requests, section 4.1 + * @see HTTP/1.1: Conditional Requests, section 4.1 */ int NOT_MODIFIED() { return 304 } /** * {@code 305 Use Proxy}. - * @see HTTP/1.1: Semantics and Content, section 6.4.5 + * @see HTTP/1.1: Semantics and Content, section 6.4.5 * @deprecated due to security concerns regarding in-band configuration of a proxy */ @Deprecated int USE_PROXY() { return 305 } /** * {@code 307 Temporary Redirect}. - * @see HTTP/1.1: Semantics and Content, section 6.4.7 + * @see HTTP/1.1: Semantics and Content, section 6.4.7 */ int TEMPORARY_REDIRECT() { return 307 } /** * {@code 308 Permanent Redirect}. - * @see RFC 7238 + * @see RFC 7238 */ int PERMANENT_REDIRECT() { return 308 } @@ -167,161 +167,161 @@ class HttpStatus { /** * {@code 400 Bad Request}. - * @see HTTP/1.1: Semantics and Content, section 6.5.1 + * @see HTTP/1.1: Semantics and Content, section 6.5.1 */ int BAD_REQUEST() { return 400 } /** * {@code 401 Unauthorized}. - * @see HTTP/1.1: Authentication, section 3.1 + * @see HTTP/1.1: Authentication, section 3.1 */ int UNAUTHORIZED() { return 401 } /** * {@code 402 Payment Required}. - * @see HTTP/1.1: Semantics and Content, section 6.5.2 + * @see HTTP/1.1: Semantics and Content, section 6.5.2 */ int PAYMENT_REQUIRED() { return 402 } /** * {@code 403 Forbidden}. - * @see HTTP/1.1: Semantics and Content, section 6.5.3 + * @see HTTP/1.1: Semantics and Content, section 6.5.3 */ int FORBIDDEN() { return 403 } /** * {@code 404 Not Found}. - * @see HTTP/1.1: Semantics and Content, section 6.5.4 + * @see HTTP/1.1: Semantics and Content, section 6.5.4 */ int NOT_FOUND() { return 404 } /** * {@code 405 Method Not Allowed}. - * @see HTTP/1.1: Semantics and Content, section 6.5.5 + * @see HTTP/1.1: Semantics and Content, section 6.5.5 */ int METHOD_NOT_ALLOWED() { return 405 } /** * {@code 406 Not Acceptable}. - * @see HTTP/1.1: Semantics and Content, section 6.5.6 + * @see HTTP/1.1: Semantics and Content, section 6.5.6 */ int NOT_ACCEPTABLE() { return 406 } /** * {@code 407 Proxy Authentication Required}. - * @see HTTP/1.1: Authentication, section 3.2 + * @see HTTP/1.1: Authentication, section 3.2 */ int PROXY_AUTHENTICATION_REQUIRED() { return 407 } /** * {@code 408 Request Timeout}. - * @see HTTP/1.1: Semantics and Content, section 6.5.7 + * @see HTTP/1.1: Semantics and Content, section 6.5.7 */ int REQUEST_TIMEOUT() { return 408 } /** * {@code 409 Conflict}. - * @see HTTP/1.1: Semantics and Content, section 6.5.8 + * @see HTTP/1.1: Semantics and Content, section 6.5.8 */ int CONFLICT() { return 409 } /** * {@code 410 Gone}. - * @see HTTP/1.1: Semantics and Content, section 6.5.9 + * @see HTTP/1.1: Semantics and Content, section 6.5.9 */ int GONE() { return 410 } /** * {@code 411 Length Required}. - * @see HTTP/1.1: Semantics and Content, section 6.5.10 + * @see HTTP/1.1: Semantics and Content, section 6.5.10 */ int LENGTH_REQUIRED() { return 411 } /** * {@code 412 Precondition failed}. - * @see HTTP/1.1: Conditional Requests, section 4.2 + * @see HTTP/1.1: Conditional Requests, section 4.2 */ int PRECONDITION_FAILED() { return 412 } /** * {@code 413 Payload Too Large}. - * @since 4.1* @see HTTP/1.1: Semantics and Content, section 6.5.11 + * @since 4.1* @see HTTP/1.1: Semantics and Content, section 6.5.11 */ int PAYLOAD_TOO_LARGE() { return 413 } /** * {@code 413 Request Entity Too Large}. - * @see HTTP/1.1, section 10.4.14 + * @see HTTP/1.1, section 10.4.14 * @deprecated in favor of {@link #PAYLOAD_TOO_LARGE} which will be returned from {@code HttpStatus.valueOf(413)} */ @Deprecated int REQUEST_ENTITY_TOO_LARGE() { return 413 } /** * {@code 414 URI Too Long}. - * @since 4.1* @see HTTP/1.1: Semantics and Content, section 6.5.12 + * @since 4.1* @see HTTP/1.1: Semantics and Content, section 6.5.12 */ int URI_TOO_LONG() { return 414 } /** * {@code 414 Request-URI Too Long}. - * @see HTTP/1.1, section 10.4.15 + * @see HTTP/1.1, section 10.4.15 * @deprecated in favor of {@link #URI_TOO_LONG} which will be returned from {@code HttpStatus.valueOf(414)} */ @Deprecated int REQUEST_URI_TOO_LONG() { return 414 } /** * {@code 415 Unsupported Media Type}. - * @see HTTP/1.1: Semantics and Content, section 6.5.13 + * @see HTTP/1.1: Semantics and Content, section 6.5.13 */ int UNSUPPORTED_MEDIA_TYPE() { return 415 } /** * {@code 416 Requested Range Not Satisfiable}. - * @see HTTP/1.1: Range Requests, section 4.4 + * @see HTTP/1.1: Range Requests, section 4.4 */ int REQUESTED_RANGE_NOT_SATISFIABLE() { return 416 } /** * {@code 417 Expectation Failed}. - * @see HTTP/1.1: Semantics and Content, section 6.5.14 + * @see HTTP/1.1: Semantics and Content, section 6.5.14 */ int EXPECTATION_FAILED() { return 417 } /** * {@code 418 I'm a teapot}. - * @see HTCPCP/1.0 + * @see HTCPCP/1.0 */ int I_AM_A_TEAPOT() { return 418 } /** - * @deprecated See WebDAV Draft Changes + * @deprecated See WebDAV Draft Changes */ @Deprecated int INSUFFICIENT_SPACE_ON_RESOURCE() { return 419 } /** - * @deprecated See WebDAV Draft Changes + * @deprecated See WebDAV Draft Changes */ @Deprecated int METHOD_FAILURE() { return 420 } /** - * @deprecated See WebDAV Draft Changes + * @deprecated See WebDAV Draft Changes */ @Deprecated int DESTINATION_LOCKED() { return 421 } /** * {@code 422 Unprocessable Entity}. - * @see WebDAV + * @see WebDAV */ int UNPROCESSABLE_ENTITY() { return 422 } /** * {@code 423 Locked}. - * @see WebDAV + * @see WebDAV */ int LOCKED() { return 423 } /** * {@code 424 Failed Dependency}. - * @see WebDAV + * @see WebDAV */ int FAILED_DEPENDENCY() { return 424 } /** * {@code 426 Upgrade Required}. - * @see Upgrading to TLS Within HTTP/1.1 + * @see Upgrading to TLS Within HTTP/1.1 */ int UPGRADE_REQUIRED() { return 426 } /** * {@code 428 Precondition Required}. - * @see Additional HTTP Status Codes + * @see Additional HTTP Status Codes */ int PRECONDITION_REQUIRED() { return 428 } /** * {@code 429 Too Many Requests}. - * @see Additional HTTP Status Codes + * @see Additional HTTP Status Codes */ int TOO_MANY_REQUESTS() { return 429 } /** * {@code 431 Request Header Fields Too Large}. - * @see Additional HTTP Status Codes + * @see Additional HTTP Status Codes */ int REQUEST_HEADER_FIELDS_TOO_LARGE() { return 431 } /** @@ -336,47 +336,47 @@ class HttpStatus { /** * {@code 500 Internal Server Error}. - * @see HTTP/1.1: Semantics and Content, section 6.6.1 + * @see HTTP/1.1: Semantics and Content, section 6.6.1 */ int INTERNAL_SERVER_ERROR() { return 500 } /** * {@code 501 Not Implemented}. - * @see HTTP/1.1: Semantics and Content, section 6.6.2 + * @see HTTP/1.1: Semantics and Content, section 6.6.2 */ int NOT_IMPLEMENTED() { return 501 } /** * {@code 502 Bad Gateway}. - * @see HTTP/1.1: Semantics and Content, section 6.6.3 + * @see HTTP/1.1: Semantics and Content, section 6.6.3 */ int BAD_GATEWAY() { return 502 } /** * {@code 503 Service Unavailable}. - * @see HTTP/1.1: Semantics and Content, section 6.6.4 + * @see HTTP/1.1: Semantics and Content, section 6.6.4 */ int SERVICE_UNAVAILABLE() { return 503 } /** * {@code 504 Gateway Timeout}. - * @see HTTP/1.1: Semantics and Content, section 6.6.5 + * @see HTTP/1.1: Semantics and Content, section 6.6.5 */ int GATEWAY_TIMEOUT() { return 504 } /** * {@code 505 HTTP Version Not Supported}. - * @see HTTP/1.1: Semantics and Content, section 6.6.6 + * @see HTTP/1.1: Semantics and Content, section 6.6.6 */ int HTTP_VERSION_NOT_SUPPORTED() { return 505 } /** * {@code 506 Variant Also Negotiates} - * @see Transparent Content Negotiation + * @see Transparent Content Negotiation */ int VARIANT_ALSO_NEGOTIATES() { return 506 } /** * {@code 507 Insufficient Storage} - * @see WebDAV + * @see WebDAV */ int INSUFFICIENT_STORAGE() { return 507 } /** * {@code 508 Loop Detected} - * @see WebDAV Binding Extensions + * @see WebDAV Binding Extensions */ int LOOP_DETECTED() { return 508 } /** @@ -385,12 +385,12 @@ class HttpStatus { int BANDWIDTH_LIMIT_EXCEEDED() { return 509 } /** * {@code 510 Not Extended} - * @see HTTP Extension Framework + * @see HTTP Extension Framework */ int NOT_EXTENDED() { return 510 } /** * {@code 511 Network Authentication Required}. - * @see Additional HTTP Status Codes + * @see Additional HTTP Status Codes */ int NETWORK_AUTHENTICATION_REQUIRED() { return 511 } } diff --git a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy index 5e8f44ecdf..bb26a0d03f 100644 --- a/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy +++ b/spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy @@ -188,7 +188,7 @@ class UrlHelper { // Examples: "fitbit.com", "22.231.113.64", "localhost" private static final String REGEX_HOST = "(?:" + - // @Author = http://www.regular-expressions.info/examples.html + // @Author = https://www.regular-expressions.info/examples.html // IP address "(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)" + "|" + diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy index dc60fcb8d7..a58ba16d03 100644 --- a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy +++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy @@ -54,59 +54,59 @@ class RegexPatternsSpec extends Specification { 'asdf@asdf.online' || true } - // @see http://formvalidation.io/validators/uri/ + // @see https://formvalidation.io/validators/uri/ def "should generate a regex for url [#textToMatch] that is a match [#shouldMatch]"() { expect: shouldMatch == regexPatterns.url().matcher(textToMatch).matches() where: textToMatch || shouldMatch 'ftp://asd.com:9090/asd/a?a=b' || true - 'http://foo.com/blah_blah' || true + 'http://www.foo.com/blah_blah' || true 'ftp://localhost/api' || true 'http://localhost:8080/api' || true - 'http://foo.com/blah_blah/' || true - 'http://foo.com/blah_blah_(wikipedia)' || true - 'http://foo.com/blah_blah_(wikipedia)_(again)' || true - 'http://www.example.com/wpstyle/?p=364' || true + 'http://www.foo.com/blah_blah/' || true + 'http://www.foo.com/blah_blah_(wikipedia)' || true + 'http://www.foo.com/blah_blah_(wikipedia)_(again)' || true + 'https://www.example.com/wpstyle/?p=364' || true 'https://www.example.com/foo/?bar=baz&inga=42&quux' || true 'http://✪df.ws/123' || true - 'http://userid:password@example.com:8080' || true - 'http://userid:password@example.com:8080/' || true - 'http://userid@example.com' || true - 'http://userid@example.com/' || true - 'http://userid@example.com:8080' || true - 'http://userid@example.com:8080/' || true - 'http://userid:password@example.com' || true - 'http://userid:password@example.com/' || true - 'http://142.42.1.1/' || true - 'http://142.42.1.1:8080/' || true + 'https://userid:password@example.com:8080' || true + 'https://userid:password@example.com:8080/' || true + 'https://userid@example.com' || true + 'https://userid@example.com/' || true + 'https://userid@example.com:8080' || true + 'https://userid@example.com:8080/' || true + 'https://userid:password@example.com' || true + 'https://userid:password@example.com/' || true + 'https://142.42.1.1/' || true + 'https://142.42.1.1:8080/' || true 'http://⌘.ws' || true 'http://⌘.ws/' || true - 'http://foo.com/blah_(wikipedia)#cite-1' || true - 'http://foo.com/blah_(wikipedia)_blah#cite-1' || true - 'http://foo.com/unicode_(✪)_in_parens' || true - 'http://foo.com/(something)?after=parens' || true + 'http://www.foo.com/blah_(wikipedia)#cite-1' || true + 'http://www.foo.com/blah_(wikipedia)_blah#cite-1' || true + 'http://www.foo.com/unicode_(✪)_in_parens' || true + 'http://www.foo.com/(something)?after=parens' || true 'http://☺.damowmow.com/' || true - 'http://code.google.com/events/#&product=browser' || true - 'http://j.mp' || true + 'https://code.google.com/events/#&product=browser' || true + 'https://j.mp' || true 'ftp://foo.bar/baz' || true - 'http://foo.bar/?q=Test%20URL-encoded%20stuff' || true + 'https://foo.bar/?q=Test%20URL-encoded%20stuff' || true 'http://1337.net' || true - 'http://a.b-c.de' || true - 'http://223.255.255.254' || true + 'https://a.b-c.de' || true + 'https://223.255.255.254' || true 'foo.com' || true 'a.b.' || false 'http://' || false 'http://.' || false 'http://..' || false - 'http://../' || false + 'https://../' || false 'http://?' || false 'http://??' || false 'http://??/' || false 'http://#' || false 'http://##' || false 'http://##/' || false - 'http://foo.bar?q=Spaces should be encoded' || false + 'https://foo.bar?q=Spaces should be encoded' || false '//' || false '//a' || false '///a' || false @@ -116,16 +116,16 @@ class RegexPatternsSpec extends Specification { 'h://test' || false 'http:// shouldfail.com' || false ':// should fail' || false - 'http://foo.bar/foo(bar)baz quux' || false - 'http://-error-.invalid/' || false - 'http://-a.b.co' || false - 'http://a.b-.co' || false - 'http://1.1.1.1.1' || false - 'http://123.123.123' || false + 'https://foo.bar/foo(bar)baz quux' || false + 'https://-error-.invalid/' || false + 'https://-a.b.co' || false + 'https://a.b-.co' || false + 'https://1.1.1.1.1' || false + 'https://123.123.123' || false 'http://3628126748' || false - 'http://.www.foo.bar/' || false - 'http://www.foo.bar./' || false - 'http://.www.foo.bar./' || false + 'https://.www.foo.bar/' || false + 'https://www.foo.bar./' || false + 'https://.www.foo.bar./' || false } def "should generate a regex for httpsUrl [#textToMatch] that is a match [#shouldMatch]"() { @@ -136,8 +136,8 @@ class RegexPatternsSpec extends Specification { 'ftp://asd.com:9090/asd/a?a=b' || false 'https://foo.com/blah_blah/' || true 'https://foo.com/blah_blah' || true - 'http://foo.com/blah_blah' || false - 'http://foo.com/blah_blah/' || false + 'http://www.foo.com/blah_blah' || false + 'http://www.foo.com/blah_blah/' || false 'https://foo.com/blah_blah_(wikipedia)' || true 'https://foo.com/blah_blah_(wikipedia)_(again)' || true 'https://www.example.com/wpstyle/?p=364' || true diff --git a/spring-cloud-contract-stub-runner/README.adoc b/spring-cloud-contract-stub-runner/README.adoc index a01e329ce0..d13c12b64f 100644 --- a/spring-cloud-contract-stub-runner/README.adoc +++ b/spring-cloud-contract-stub-runner/README.adoc @@ -4,7 +4,7 @@ === Stub Runner Core Runs stubs for service collaborators. Treating stubs as contracts of services allows to use stub-runner as an implementation of -http://martinfowler.com/articles/consumerDrivenContracts.html[Consumer Driven Contracts]. +https://martinfowler.com/articles/consumerDrivenContracts.html[Consumer Driven Contracts]. Stub Runner allows you to automatically download the stubs of the provided dependencies (or pick those from the classpath), start WireMock servers for them and feed them with proper stub definitions. For messaging, special stub routes are defined. @@ -32,7 +32,7 @@ Example: [source,java] ---- -@AutoConfigureStubRunner(repositoryRoot="http://foo.bar", ids = "com.example:beer-api-producer:+:stubs:8095", stubsMode = StubRunnerProperties.StubsMode.LOCAL) +@AutoConfigureStubRunner(repositoryRoot="https://foo.bar", ids = "com.example:beer-api-producer:+:stubs:8095", stubsMode = StubRunnerProperties.StubsMode.LOCAL) ---- ===== Classpath scanning @@ -539,7 +539,7 @@ $ java -jar stub-runner.jar --stubrunner.ids=... --stubrunner.repositoryRoot=... ===== Spring Cloud CLI -Starting from `1.4.0.RELEASE` version of the http://cloud.spring.io/spring-cloud-cli[Spring Cloud CLI] +Starting from `1.4.0.RELEASE` version of the https://cloud.spring.io/spring-cloud-cli[Spring Cloud CLI] project you can start Stub Runner Boot by executing `spring cloud stubrunner`. In order to pass the configuration just create a `stubrunner.yml` file in the current working directory diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java index 0e1d2addab..c74b1ab588 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java @@ -76,7 +76,7 @@ public class GitStubDownloaderTests { StubDownloader stubDownloader = stubDownloaderBuilder .build(new StubRunnerOptionsBuilder() .withStubsMode(StubRunnerProperties.StubsMode.REMOTE) - .withStubRepositoryRoot("http://foo.com").withProperties(props()) + .withStubRepositoryRoot("http://www.foo.com/").withProperties(props()) .build()); then(stubDownloader).isNull(); diff --git a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom index a37c6365a6..75cfeb2cae 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom index 4ee444bff5..ea62bdcbe4 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom index c648b50e46..43e1818681 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT.pom index 5b9966886c..8f62b77afa 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-stub-runner/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/producerWithMultipleConsumers/0.0.1-SNAPSHOT/producerWithMultipleConsumers-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy index c7dfef80b1..f1237ef910 100755 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy @@ -289,7 +289,7 @@ class DslToWireMockClientConverterSpec extends Specification { "id":"01fbe706f872cb32", "name":"Washington", "place_type":"city", - "url": "http://api.twitter.com/1/geo/id/01fbe706f872cb32.json" + "url": "https://api.twitter.com/1/geo/id/01fbe706f872cb32.json" } }] ''' @@ -329,7 +329,7 @@ class DslToWireMockClientConverterSpec extends Specification { }, { "matchesJsonPath" : "$[*].['place'].['bounding_box'][?(@.['type'] == 'Polygon')]" }, { - "matchesJsonPath" : "$[*].['place'][?(@.['url'] == 'http://api.twitter.com/1/geo/id/01fbe706f872cb32.json')]" + "matchesJsonPath" : "$[*].['place'][?(@.['url'] == 'https://api.twitter.com/1/geo/id/01fbe706f872cb32.json')]" }, { "matchesJsonPath" : "$[*].['place'].['bounding_box'].['coordinates'][*][*][?(@ == 38.995548)]" }, { @@ -385,7 +385,7 @@ class DslToWireMockClientConverterSpec extends Specification { "id":"01fbe706f872cb32", "name":"Washington", "place_type":"city", - "url": "http://api.twitter.com/1/geo/id/01fbe706f872cb32.json" + "url": "https://api.twitter.com/1/geo/id/01fbe706f872cb32.json" } }]'''), String) } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/m2repo/repository/com/example/jersey-contracts/0.0.1-SNAPSHOT/jersey-contracts-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/m2repo/repository/com/example/jersey-contracts/0.0.1-SNAPSHOT/jersey-contracts-0.0.1-SNAPSHOT.pom index be7709b4c4..4b4ae1a9dc 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/m2repo/repository/com/example/jersey-contracts/0.0.1-SNAPSHOT/jersey-contracts-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/m2repo/repository/com/example/jersey-contracts/0.0.1-SNAPSHOT/jersey-contracts-0.0.1-SNAPSHOT.pom @@ -16,7 +16,7 @@ --> 4.0.0 com.example diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/0.0.1-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/0.0.1-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom index 98a4a3b3b5..d0c5beede7 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/0.0.1-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/0.0.1-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 com.example diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/1.0.4-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/1.0.4-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom index 98a4a3b3b5..d0c5beede7 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/1.0.4-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/contracts/1.0.4-SNAPSHOT/contracts-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 com.example diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/services-contracts/1.0.4-SNAPSHOT/services-contracts-1.0.4-SNAPSHOT.pom b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/services-contracts/1.0.4-SNAPSHOT/services-contracts-1.0.4-SNAPSHOT.pom index 2894e9ed1c..b36f96b616 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/services-contracts/1.0.4-SNAPSHOT/services-contracts-1.0.4-SNAPSHOT.pom +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/resources/m2repo/repository/com/example/services-contracts/1.0.4-SNAPSHOT/services-contracts-1.0.4-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 com.example diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy index 7b95840558..6f5f6fdc52 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/TestSideRequestTemplateModel.groovy @@ -99,7 +99,7 @@ class TestSideRequestTemplateModel { } private static List buildPathsFromUrl(String url) { - String fakeUrl = "http://foo.bar" + (url.startsWith("/") ? url : "/" + url) + String fakeUrl = "https://foo.bar" + (url.startsWith("/") ? url : "/" + url) List paths = new URL(fakeUrl).path.split("/") as List if (!paths.isEmpty()) { paths.remove(0) diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy index 9f4d277e8e..64aebbf871 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy @@ -1184,7 +1184,7 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub SyntaxChecker.tryToCompile(methodBuilderName, blockBuilder.toString()) and: String jsonSample = '''\ - String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"positiveInt\\":42,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"http://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"http://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; + String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"positiveInt\\":42,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"https://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"https://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; DocumentContext parsedJson = JsonPath.parse(json); ''' and: diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy index 4786d0e53d..029306bce9 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy @@ -603,7 +603,7 @@ then: !test.contains('REGEXP>>') and: String jsonSample = '''\ - String json = "{\\"shouldFail\\":123,\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"anInteger\\":1780305902,\\"positiveInt\\":345,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"http://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"http://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; + String json = "{\\"shouldFail\\":123,\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"anInteger\\":1780305902,\\"positiveInt\\":345,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"https://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"https://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; DocumentContext parsedJson = JsonPath.parse(json); ''' and: diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy index cf0fe03d43..d2b1456b71 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy @@ -1970,7 +1970,7 @@ World.'''""" "id":"01fbe706f872cb32", "name":"Washington", "place_type":"city", - "url": "http://api.twitter.com/1/geo/id/01fbe706f872cb32.json" + "url": "https://api.twitter.com/1/geo/id/01fbe706f872cb32.json" } }] ''' @@ -2332,7 +2332,7 @@ World.'''""" SyntaxChecker.tryToCompile(methodBuilderName, blockBuilder.toString()) and: String jsonSample = '''\ -String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"anInteger\\":1780305902,\\"positiveInt\\":345,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"http://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"http://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; +String json = "{\\"duck\\":\\"8\\",\\"alpha\\":\\"YAJEOWYGMFBEWPMEMAZI\\",\\"number\\":-2095030871,\\"anInteger\\":1780305902,\\"positiveInt\\":345,\\"aDouble\\":42.345,\\"aBoolean\\":true,\\"ip\\":\\"129.168.99.100\\",\\"hostname\\":\\"https://foo389886219.com\\",\\"email\\":\\"foo@bar1367573183.com\\",\\"url\\":\\"https://foo-597104692.com\\",\\"httpsUrl\\":\\"https://baz-486093581.com\\",\\"uuid\\":\\"e436b817-b764-49a2-908e-967f2f99eb9f\\",\\"date\\":\\"2014-04-14\\",\\"dateTime\\":\\"2011-01-11T12:23:34\\",\\"time\\":\\"12:20:30\\",\\"iso8601WithOffset\\":\\"2015-05-15T12:23:34.123Z\\",\\"nonBlankString\\":\\"EPZWVIRHSUAPBJMMQSFO\\",\\"nonEmptyString\\":\\"RVMFDSEQFHRQFVUVQPIA\\",\\"anyOf\\":\\"foo\\"}"; DocumentContext parsedJson = JsonPath.parse(json); ''' and: diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java index 0d2c26f734..14be6e3160 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockMockServerApplicationTests.java @@ -39,9 +39,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGet() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); server.verify(); } @@ -49,10 +49,10 @@ public class WiremockMockServerApplicationTests { @Test public void simplePutShouldFail() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource.json").build(); RequestEntity postRequest = RequestEntity - .post(URI.create("http://example.org/resource")) + .post(URI.create("https://example.org/resource")) .accept(MediaType.TEXT_PLAIN).build(); ResponseEntity response; try { @@ -70,9 +70,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithBodyFile() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-body-file.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)) .isEqualToIgnoringWhitespace("{\"message\":\"Hello World\"}"); server.verify(); @@ -81,10 +81,10 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithBodyFileCustomLocation() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-body-file.json") .files("classpath:/custom/").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)) .isEqualToIgnoringWhitespace("{\"message\":\"Hello Custom\"}"); server.verify(); @@ -93,10 +93,10 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithBodyFileCustomLocationDirectory() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-body-file.json") .files("file:src/test/resources/custom").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)) .isEqualToIgnoringWhitespace("{\"message\":\"Hello Custom\"}"); server.verify(); @@ -105,9 +105,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithEmptyPath() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-empty-path.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/", String.class)) + assertThat(this.restTemplate.getForObject("https://example.org/", String.class)) .isEqualTo("Hello World"); server.verify(); } @@ -115,9 +115,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithContentType() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-content-type.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); server.verify(); } @@ -125,9 +125,9 @@ public class WiremockMockServerApplicationTests { @Test public void simpleGetWithoutContentType() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-without-content-type.json").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); server.verify(); } @@ -135,9 +135,9 @@ public class WiremockMockServerApplicationTests { @Test public void simplePost() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/poster.json").build(); - assertThat(this.restTemplate.postForObject("http://example.org/poster", + assertThat(this.restTemplate.postForObject("https://example.org/poster", "greeting", String.class)).isEqualTo("Hello World"); server.verify(); } @@ -145,14 +145,14 @@ public class WiremockMockServerApplicationTests { @Test public void postWithHeader() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order determined by content... + .baseUrl("https://example.org") // order determined by content... .stubs("classpath:/mappings/poster.json", "classpath:/mappings/accept.json") .build(); assertThat( this.restTemplate .exchange( - RequestEntity.post(new URI("http://example.org/poster")) + RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.TEXT_PLAIN).build(), String.class) .getBody()).isEqualTo("Accepted World"); @@ -161,12 +161,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithHeaderContains() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order determined by content... + .baseUrl("https://example.org") // order determined by content... .stubs("classpath:/mappings/poster.json", "classpath:/mappings/header-contains.json") .build(); assertThat(this.restTemplate.exchange( - RequestEntity.post(new URI("http://example.org/poster")) + RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.valueOf("application/v.foo")).build(), String.class).getBody()).isEqualTo("Foo World"); } @@ -174,12 +174,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithHeaderMatches() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order determined by content... + .baseUrl("https://example.org") // order determined by content... .stubs("classpath:/mappings/poster.json", "classpath:/mappings/header-matches.json") .build(); assertThat(this.restTemplate.exchange( - RequestEntity.post(new URI("http://example.org/poster")) + RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.valueOf("application/v.bar")).build(), String.class).getBody()).isEqualTo("Bar World"); } @@ -187,14 +187,14 @@ public class WiremockMockServerApplicationTests { @Test public void postWithMoreExactHeaderMatch() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order determined by content... + .baseUrl("https://example.org") // order determined by content... .stubs("classpath:/mappings/header-matches.json", "classpath:/mappings/header-matches-precise.json") .build(); assertThat( this.restTemplate .exchange( - RequestEntity.post(new URI("http://example.org/poster")) + RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.valueOf("application/v.bar")) .header("X-Precise", "true").build(), String.class) @@ -204,14 +204,14 @@ public class WiremockMockServerApplicationTests { @Test public void postWithMoreExactHeaderMatchButOrdered() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // order matters... + .baseUrl("https://example.org") // order matters... .stubs("classpath:/mappings/header-matches.json", "classpath:/mappings/header-matches-precise.json") .ignoreExpectOrder(false).build(); assertThat( this.restTemplate .exchange( - RequestEntity.post(new URI("http://example.org/poster")) + RequestEntity.post(new URI("https://example.org/poster")) .accept(MediaType.valueOf("application/v.bar")) .header("X-Precise", "true").build(), String.class) @@ -222,29 +222,29 @@ public class WiremockMockServerApplicationTests { @Test public void getWithPriortyOrder() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/resource-with-low-priority.json", "classpath:/mappings/resource-with-high-priority.json") .build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello High"); } @Test public void simpleGetWithAllStubs() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); } @Test public void simpleGetWithAllStubsInDirectoryWithPeriod() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/io.stubs/mappings").build(); - assertThat(this.restTemplate.getForObject("http://example.org/resource", + assertThat(this.restTemplate.getForObject("https://example.org/resource", String.class)).isEqualTo("Hello World"); } @@ -252,10 +252,10 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingJsonPaths() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-jsonpath.json").build(); - assertThat(this.restTemplate.postForObject("http://example.org/body", + assertThat(this.restTemplate.postForObject("https://example.org/body", new Things(Collections.singletonList(new Thing("RequiredThing"))), String.class)).isEqualTo("Hello Body"); } @@ -263,12 +263,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingJsonPaths() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-jsonpath.json").build(); String response; try { - response = this.restTemplate.postForObject("http://example.org/body", + response = this.restTemplate.postForObject("https://example.org/body", new Things(Collections.singletonList(new Thing("AbsentThing"))), String.class); } @@ -284,11 +284,11 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingXPath() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-xpath.json").build(); assertThat(this.restTemplate.exchange(RequestEntity - .post(URI.create("http://example.org/body")) + .post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("RequiredThing"), String.class).getBody()).isEqualTo("Hello Body"); @@ -297,13 +297,13 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingXPaths() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-xpath.json").build(); ResponseEntity response; try { response = this.restTemplate.exchange( - RequestEntity.post(URI.create("http://example.org/body")) + RequestEntity.post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML).body(""), String.class); } @@ -319,10 +319,10 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingJson() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-equaltojson.json").build(); - assertThat(this.restTemplate.postForObject("http://example.org/body", + assertThat(this.restTemplate.postForObject("https://example.org/body", new Things(Collections.singletonList(new Thing("RequiredThing"))), String.class)).isEqualTo("Hello Body"); } @@ -330,12 +330,12 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingJson() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-equaltojson.json").build(); String response; try { - response = this.restTemplate.postForObject("http://example.org/body", + response = this.restTemplate.postForObject("https://example.org/body", new Things(Collections.singletonList(new Thing("AbsentThing"))), String.class); } @@ -351,11 +351,11 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingXml() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-equaltoxml.json").build(); assertThat(this.restTemplate.exchange(RequestEntity - .post(URI.create("http://example.org/body")) + .post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("RequiredThing"), String.class).getBody()).isEqualTo("Hello Body"); @@ -364,13 +364,13 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingXml() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-equaltoxml.json").build(); ResponseEntity response; try { response = this.restTemplate.exchange(RequestEntity - .post(URI.create("http://example.org/body")) + .post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("AbsentThing"), String.class); @@ -387,11 +387,11 @@ public class WiremockMockServerApplicationTests { @Test public void postWithBodyMatchingRegex() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-regex.json").build(); assertThat(this.restTemplate.exchange(RequestEntity - .post(URI.create("http://example.org/body")) + .post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("RequiredThing"), String.class).getBody()).isEqualTo("Hello Body"); @@ -400,13 +400,13 @@ public class WiremockMockServerApplicationTests { @Test public void postWithRequestThatHasNonMatchingRegex() throws Exception { WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/body-matches-regex.json").build(); ResponseEntity response; try { response = this.restTemplate.exchange(RequestEntity - .post(URI.create("http://example.org/body")) + .post(URI.create("https://example.org/body")) .contentType(MediaType.APPLICATION_XML) .body("AbsentThing"), String.class); @@ -423,10 +423,10 @@ public class WiremockMockServerApplicationTests { @Test public void getWithUrlPathMatching() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/url-path-pattern.json").build(); assertThat(this.restTemplate - .getForObject("http://example.org/123/url-path-pattern/", String.class)) + .getForObject("https://example.org/123/url-path-pattern/", String.class)) .isEqualTo("Hello Url Path Matcher"); server.verify(); } @@ -434,10 +434,10 @@ public class WiremockMockServerApplicationTests { @Test public void getWithUrlMatching() throws Exception { MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) // - .baseUrl("http://example.org") // + .baseUrl("https://example.org") // .stubs("classpath:/mappings/url-matches.json").build(); assertThat(this.restTemplate - .getForObject("http://example.org/123/hello-url-matcher/", String.class)) + .getForObject("https://example.org/123/hello-url-matcher/", String.class)) .isEqualTo("Hello Url Matcher"); server.verify(); } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java index bebb0fe493..a15b5844af 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java @@ -72,7 +72,7 @@ class Service { private static final Log log = LogFactory.getLog(Service.class); - @Value("${app.baseUrl:http://example.org}") + @Value("${app.baseUrl:https://example.org}") String base; private RestTemplate restTemplate; diff --git a/tests/samples-messaging-amqp/src/test/groovy/com/example/AmqpMessagingApplicationSpec.groovy b/tests/samples-messaging-amqp/src/test/groovy/com/example/AmqpMessagingApplicationSpec.groovy index 1ffd0eaa8e..d6e1dc2243 100644 --- a/tests/samples-messaging-amqp/src/test/groovy/com/example/AmqpMessagingApplicationSpec.groovy +++ b/tests/samples-messaging-amqp/src/test/groovy/com/example/AmqpMessagingApplicationSpec.groovy @@ -95,7 +95,7 @@ class AmqpMessagingApplicationSpec extends Specification { Contract.make { description(""" Represents scenario 2 from documentation: -http://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html#_publisher_side_test_generation +https://cloud.spring.io/spring-cloud-contract/spring-cloud-contract.html#_publisher_side_test_generation "The input message triggers an output message." diff --git a/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/amqp/spring-cloud-contract-amqp-test/0.4.0-SNAPSHOT/spring-cloud-contract-amqp-test-0.4.0-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/amqp/spring-cloud-contract-amqp-test/0.4.0-SNAPSHOT/spring-cloud-contract-amqp-test-0.4.0-SNAPSHOT.pom index 3a442ac5c1..a850e13681 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/amqp/spring-cloud-contract-amqp-test/0.4.0-SNAPSHOT/spring-cloud-contract-amqp-test-0.4.0-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/amqp/spring-cloud-contract-amqp-test/0.4.0-SNAPSHOT/spring-cloud-contract-amqp-test-0.4.0-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs.amqp diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom index a37c6365a6..75cfeb2cae 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom index 4ee444bff5..ea62bdcbe4 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom index c648b50e46..43e1818681 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom index a37c6365a6..75cfeb2cae 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/bootService/0.0.1-SNAPSHOT/bootService-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom index 4ee444bff5..ea62bdcbe4 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/fraudDetectionServer-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom index c648b50e46..43e1818681 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/loanIssuance/0.0.1-SNAPSHOT/loanIssuance-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-camel/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/camelService/0.0.1-SNAPSHOT/camelService-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-camel/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/camelService/0.0.1-SNAPSHOT/camelService-0.0.1-SNAPSHOT.pom index 13b3cd9e8b..e98259f269 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/camelService/0.0.1-SNAPSHOT/camelService-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-camel/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/camelService/0.0.1-SNAPSHOT/camelService-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-context-path/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/contextPathFraudDetectionServer/0.0.1-SNAPSHOT/contextPathFraudDetectionServer-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-context-path/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/contextPathFraudDetectionServer/0.0.1-SNAPSHOT/contextPathFraudDetectionServer-0.0.1-SNAPSHOT.pom index 409bda0568..552698968f 100644 --- a/tests/spring-cloud-contract-stub-runner-context-path/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/contextPathFraudDetectionServer/0.0.1-SNAPSHOT/contextPathFraudDetectionServer-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-context-path/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/contextPathFraudDetectionServer/0.0.1-SNAPSHOT/contextPathFraudDetectionServer-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT.pom index 094290c823..0e395ad856 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/integrationService/0.0.1-SNAPSHOT/integrationService-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs diff --git a/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT.pom b/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT.pom index 433926bcd2..2c99c0009f 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT.pom +++ b/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/m2repo/repository/org/springframework/cloud/contract/verifier/stubs/streamService/0.0.1-SNAPSHOT/streamService-0.0.1-SNAPSHOT.pom @@ -17,7 +17,7 @@ 4.0.0 org.springframework.cloud.contract.verifier.stubs From 3eca2df6f9c241094f0f18d6ff59becb2eca926c Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 27 Mar 2019 09:58:23 -0700 Subject: [PATCH 3/5] URL Cleanup (#944) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * http://foo.bar (UnknownHostException) with 1 occurrences migrated to: https://foo.bar ([https](https://foo.bar) result UnknownHostException). * http://link/to/your/nexus/or/artifactory/or/sth (UnknownHostException) with 1 occurrences migrated to: https://link/to/your/nexus/or/artifactory/or/sth ([https](https://link/to/your/nexus/or/artifactory/or/sth) result UnknownHostException). * http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * http://maven.apache.org/xsd/assembly-1.1.3.xsd with 3 occurrences migrated to: https://maven.apache.org/xsd/assembly-1.1.3.xsd ([https](https://maven.apache.org/xsd/assembly-1.1.3.xsd) result 200). * http://maven.apache.org/xsd/maven-4.0.0.xsd with 82 occurrences migrated to: https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200). * http://www.springframework.org/schema/beans/spring-beans.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans.xsd ([https](https://www.springframework.org/schema/beans/spring-beans.xsd) result 200). * http://www.springframework.org/schema/integration/spring-integration.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/integration/spring-integration.xsd ([https](https://www.springframework.org/schema/integration/spring-integration.xsd) result 200). # Ignored These URLs were intentionally ignored. * http://maven.apache.org/POM/4.0.0 with 164 occurrences * http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 with 6 occurrences * http://www.springframework.org/schema/beans with 4 occurrences * http://www.springframework.org/schema/integration with 4 occurrences * http://www.w3.org/2001/XMLSchema-instance with 87 occurrences --- docker/pom.xml | 2 +- docker/spring-cloud-contract-docker/pom.xml | 2 +- docker/spring-cloud-contract-stub-runner-docker/pom.xml | 2 +- docs/pom.xml | 2 +- pom.xml | 2 +- samples/pom.xml | 2 +- samples/standalone/contracts/com/example/server/pom.xml | 2 +- samples/standalone/contracts/pom.xml | 2 +- samples/standalone/contracts/src/assembly/contracts.xml | 2 +- samples/standalone/dsl/http-client/pom.xml | 2 +- samples/standalone/dsl/http-server/pom.xml | 2 +- samples/standalone/dsl/pom.xml | 2 +- samples/standalone/messaging/pom.xml | 2 +- samples/standalone/messaging/stream-sink/pom.xml | 2 +- samples/standalone/messaging/stream-source/pom.xml | 2 +- samples/standalone/pact/pact-http-client/pom.xml | 2 +- samples/standalone/pact/pact-http-server/pom.xml | 2 +- samples/standalone/pact/pom.xml | 2 +- samples/standalone/pom.xml | 2 +- samples/standalone/restdocs/http-client/pom.xml | 2 +- samples/standalone/restdocs/http-server/pom.xml | 2 +- samples/standalone/restdocs/http-server/src/assembly/stub.xml | 2 +- samples/standalone/restdocs/pom.xml | 2 +- samples/standalone/webclient/http-client/pom.xml | 2 +- samples/standalone/webclient/http-server/pom.xml | 2 +- .../standalone/webclient/http-server/src/assembly/stub.xml | 2 +- samples/standalone/webclient/pom.xml | 2 +- samples/standalone/yml/http-client/pom.xml | 2 +- samples/standalone/yml/http-server/pom.xml | 2 +- samples/standalone/yml/pom.xml | 2 +- samples/wiremock-jetty/pom.xml | 2 +- samples/wiremock-native/pom.xml | 2 +- samples/wiremock-tomcat/pom.xml | 2 +- samples/wiremock-undertow-ssl/pom.xml | 2 +- samples/wiremock-undertow/pom.xml | 2 +- samples/wiremock/pom.xml | 2 +- spring-cloud-contract-dependencies/pom.xml | 2 +- spring-cloud-contract-shade/pom.xml | 2 +- spring-cloud-contract-spec/pom.xml | 2 +- spring-cloud-contract-starters/pom.xml | 2 +- .../spring-cloud-starter-contract-stub-runner-jetty/pom.xml | 2 +- .../spring-cloud-starter-contract-stub-runner/pom.xml | 2 +- .../spring-cloud-starter-contract-verifier/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 +- .../spring-cloud-contract-gradle-plugin/pom.xml | 2 +- .../spring-cloud-contract-maven-plugin/pom.xml | 2 +- .../src/test/projects/basic-baseclass-from-mappings/pom.xml | 2 +- .../src/test/projects/basic-generated-baseclass/pom.xml | 2 +- .../test/projects/basic-remote-contracts/pom-with-repo.xml | 4 ++-- .../src/test/projects/basic-remote-contracts/pom.xml | 2 +- .../src/test/projects/basic/pom.xml | 2 +- .../src/test/projects/common-repo/pom.xml | 2 +- .../test/projects/complex-common-repo-with-messaging/pom.xml | 2 +- .../src/test/projects/complex-configuration/pom.xml | 2 +- .../src/test/projects/complex-remote-contracts/pom.xml | 2 +- .../projects/different-module-configuration/module/pom.xml | 2 +- .../src/test/projects/different-module-configuration/pom.xml | 2 +- .../src/test/projects/generatedStubs/pom.xml | 2 +- .../src/test/projects/git-basic-remote-contracts/pom.xml | 4 ++-- .../src/test/projects/multiple-contracts/pom.xml | 2 +- .../src/test/projects/pact/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 +- .../src/test/projects/withStubs/pom.xml | 2 +- .../spring-cloud-contract-pact/pom.xml | 2 +- spring-cloud-contract-verifier/pom.xml | 2 +- spring-cloud-contract-wiremock/pom.xml | 2 +- src/checkstyle/checkstyle-suppressions.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 +- .../src/main/resources/integration-context.xml | 4 ++-- tests/samples-messaging-stream/pom.xml | 2 +- tests/spring-cloud-contract-stub-runner-amqp/pom.xml | 2 +- tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml | 2 +- .../spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml | 2 +- tests/spring-cloud-contract-stub-runner-camel/pom.xml | 2 +- tests/spring-cloud-contract-stub-runner-context-path/pom.xml | 2 +- tests/spring-cloud-contract-stub-runner-integration/pom.xml | 2 +- .../src/test/resources/integration-context.xml | 4 ++-- .../pom.xml | 2 +- tests/spring-cloud-contract-stub-runner-moco/pom.xml | 2 +- tests/spring-cloud-contract-stub-runner-stream/pom.xml | 2 +- 88 files changed, 92 insertions(+), 92 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index 5d103178fb..84dc03684f 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/docker/spring-cloud-contract-docker/pom.xml b/docker/spring-cloud-contract-docker/pom.xml index ec33943ab4..a5a035ce1e 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 53be57bcd5..2d8e80c7a6 100644 --- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml +++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/docs/pom.xml b/docs/pom.xml index 4be9977c10..e1d0b00012 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/pom.xml b/pom.xml index fff0b2cb25..3ef706a435 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/samples/pom.xml b/samples/pom.xml index ece2b9873b..65d7cea2f4 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml index fd80e379fa..70a6416125 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/contracts/pom.xml b/samples/standalone/contracts/pom.xml index 678e7efbb8..a35339e1cf 100644 --- a/samples/standalone/contracts/pom.xml +++ b/samples/standalone/contracts/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example.standalone diff --git a/samples/standalone/contracts/src/assembly/contracts.xml b/samples/standalone/contracts/src/assembly/contracts.xml index 7b278bcf38..478cdc59d1 100644 --- a/samples/standalone/contracts/src/assembly/contracts.xml +++ b/samples/standalone/contracts/src/assembly/contracts.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 https://maven.apache.org/xsd/assembly-1.1.3.xsd"> project jar diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index d3757fb212..ff65b51831 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index 1cd6b13d1d..d2ebb23005 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/dsl/pom.xml b/samples/standalone/dsl/pom.xml index d647c63811..d7099529a6 100644 --- a/samples/standalone/dsl/pom.xml +++ b/samples/standalone/dsl/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/samples/standalone/messaging/pom.xml b/samples/standalone/messaging/pom.xml index 2271567349..25b9b874c3 100644 --- a/samples/standalone/messaging/pom.xml +++ b/samples/standalone/messaging/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/samples/standalone/messaging/stream-sink/pom.xml b/samples/standalone/messaging/stream-sink/pom.xml index fc036b1b2a..ba80f85134 100644 --- a/samples/standalone/messaging/stream-sink/pom.xml +++ b/samples/standalone/messaging/stream-sink/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml index 652bcde55c..076443d9b4 100644 --- a/samples/standalone/messaging/stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/pact/pact-http-client/pom.xml b/samples/standalone/pact/pact-http-client/pom.xml index 4e95c07da0..2964bc85b2 100644 --- a/samples/standalone/pact/pact-http-client/pom.xml +++ b/samples/standalone/pact/pact-http-client/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/pact/pact-http-server/pom.xml b/samples/standalone/pact/pact-http-server/pom.xml index e9da2343d5..6b87545564 100644 --- a/samples/standalone/pact/pact-http-server/pom.xml +++ b/samples/standalone/pact/pact-http-server/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/pact/pom.xml b/samples/standalone/pact/pom.xml index 198218e1f6..6a23a09332 100644 --- a/samples/standalone/pact/pom.xml +++ b/samples/standalone/pact/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index e72b64e51f..8fce4e2c84 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index 73496d5002..e8b08d77fc 100644 --- a/samples/standalone/restdocs/http-client/pom.xml +++ b/samples/standalone/restdocs/http-client/pom.xml @@ -18,7 +18,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index 6ea15a732f..02e1f70e38 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/restdocs/http-server/src/assembly/stub.xml b/samples/standalone/restdocs/http-server/src/assembly/stub.xml index 947f7d9aff..70ae6e17f3 100644 --- a/samples/standalone/restdocs/http-server/src/assembly/stub.xml +++ b/samples/standalone/restdocs/http-server/src/assembly/stub.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 https://maven.apache.org/xsd/assembly-1.1.3.xsd"> stubs jar diff --git a/samples/standalone/restdocs/pom.xml b/samples/standalone/restdocs/pom.xml index f06c288996..7b21efa540 100644 --- a/samples/standalone/restdocs/pom.xml +++ b/samples/standalone/restdocs/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml index 88f0e6b5f7..39ddfb9c40 100644 --- a/samples/standalone/webclient/http-client/pom.xml +++ b/samples/standalone/webclient/http-client/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml index fb0364afe6..7ec705c698 100644 --- a/samples/standalone/webclient/http-server/pom.xml +++ b/samples/standalone/webclient/http-server/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/webclient/http-server/src/assembly/stub.xml b/samples/standalone/webclient/http-server/src/assembly/stub.xml index 118b211809..13bdf69cef 100644 --- a/samples/standalone/webclient/http-server/src/assembly/stub.xml +++ b/samples/standalone/webclient/http-server/src/assembly/stub.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 https://maven.apache.org/xsd/assembly-1.1.3.xsd"> stubs jar diff --git a/samples/standalone/webclient/pom.xml b/samples/standalone/webclient/pom.xml index 6c6b976a7b..1047db154c 100644 --- a/samples/standalone/webclient/pom.xml +++ b/samples/standalone/webclient/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/samples/standalone/yml/http-client/pom.xml b/samples/standalone/yml/http-client/pom.xml index 3dae11d93d..77ecbb6b7d 100644 --- a/samples/standalone/yml/http-client/pom.xml +++ b/samples/standalone/yml/http-client/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/yml/http-server/pom.xml b/samples/standalone/yml/http-server/pom.xml index 8a6307b0d3..0b6a802b0e 100644 --- a/samples/standalone/yml/http-server/pom.xml +++ b/samples/standalone/yml/http-server/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/samples/standalone/yml/pom.xml b/samples/standalone/yml/pom.xml index 72e226d8ab..4d1920b09e 100644 --- a/samples/standalone/yml/pom.xml +++ b/samples/standalone/yml/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index 6161dfec07..81b790bf41 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 wiremock-jetty diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index ea87585efa..307b7330fc 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 wiremock-native diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 5bd720cb66..03c7d377f3 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 wiremock-tomcat diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index af0f8f0fa5..29ec4f62a9 100644 --- a/samples/wiremock-undertow-ssl/pom.xml +++ b/samples/wiremock-undertow-ssl/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 wiremock-undertow-ssl diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 71bbed3868..5342c2985d 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 wiremock-undertow diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index c0c5ca468a..387e8b3e99 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 wiremock diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index dba6d71e61..3e16a82115 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-dependencies-parent diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml index cc1ff79565..88518851ed 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 0.1.1 diff --git a/spring-cloud-contract-spec/pom.xml b/spring-cloud-contract-spec/pom.xml index 4cc6e4cf89..ae045a155b 100644 --- a/spring-cloud-contract-spec/pom.xml +++ b/spring-cloud-contract-spec/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 22d825766d..e8b1a5bfdf 100644 --- a/spring-cloud-contract-starters/pom.xml +++ b/spring-cloud-contract-starters/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 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 4ad4987a88..ffcc0eff1e 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 @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud 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 affae328e7..e694ebe8db 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 @@ -18,7 +18,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud 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 29de190653..cee4b15f0f 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 @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/spring-cloud-contract-stub-runner-boot/pom.xml b/spring-cloud-contract-stub-runner-boot/pom.xml index 3c84ea1c54..92dda0b08a 100644 --- a/spring-cloud-contract-stub-runner-boot/pom.xml +++ b/spring-cloud-contract-stub-runner-boot/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/pom.xml index 1962815eb2..3b1eb22f85 100644 --- a/spring-cloud-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-stub-runner/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 0853ae650c..705756f453 100644 --- a/spring-cloud-contract-tools/pom.xml +++ b/spring-cloud-contract-tools/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 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 183ceb1fde..40be9a86ff 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud 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 0bc0ae306f..8d7b5a9127 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 @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 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 278b583183..a09725c1a8 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 @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-baseclass-from-mappings/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-baseclass-from-mappings/pom.xml index cc69fd5138..198eaf3961 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-baseclass-from-mappings/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-baseclass-from-mappings/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud.verifier.sample diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-generated-baseclass/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-generated-baseclass/pom.xml index 662f639ceb..f5c1acd313 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-generated-baseclass/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-generated-baseclass/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud.verifier.sample diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-remote-contracts/pom-with-repo.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-remote-contracts/pom-with-repo.xml index cc42c912c6..26dfd9018e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-remote-contracts/pom-with-repo.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-remote-contracts/pom-with-repo.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example @@ -35,7 +35,7 @@ REMOTE - http://link/to/your/nexus/or/artifactory/or/sth + https://link/to/your/nexus/or/artifactory/or/sth com.example.standalone diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-remote-contracts/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-remote-contracts/pom.xml index 4ba75c5384..a1012d08c1 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-remote-contracts/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic-remote-contracts/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/pom.xml index bba07ca022..1b0b426f80 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud.verifier.sample diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/common-repo/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/common-repo/pom.xml index 1b5ec81b54..bfa0c0199f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/common-repo/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/common-repo/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud.verifier.sample diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-common-repo-with-messaging/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-common-repo-with-messaging/pom.xml index 6cad149ac3..5974112b60 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-common-repo-with-messaging/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-common-repo-with-messaging/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example 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 0ddf5ed4ea..d6fee5576e 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 @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.blogspot.toomuchcoding.frauddetection diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-remote-contracts/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-remote-contracts/pom.xml index 49ecf7a29f..52b7628ced 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-remote-contracts/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-remote-contracts/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example.foo.bar.baz 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 8b60b0fb62..abd14e24db 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 @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.blogspot.toomuchcoding.frauddetection diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/pom.xml index 31c17df2ee..a581c75a8a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.blogspot.toomuchcoding.frauddetection diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/generatedStubs/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/generatedStubs/pom.xml index bba07ca022..1b0b426f80 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/generatedStubs/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/generatedStubs/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud.verifier.sample diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/git-basic-remote-contracts/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/git-basic-remote-contracts/pom.xml index f4d34c4bf5..4119c5de16 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/git-basic-remote-contracts/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/git-basic-remote-contracts/pom.xml @@ -16,7 +16,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example @@ -30,7 +30,7 @@ spring-cloud-contract-maven-plugin REMOTE - http://foo.bar + https://foo.bar diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/multiple-contracts/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/multiple-contracts/pom.xml index fc62e38e99..3975b5b21c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/multiple-contracts/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/multiple-contracts/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud.verifier.sample diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml index e64b34396f..30cbf56204 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/pact/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud.verifier.sample 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 5438997709..81ba005c2c 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 @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework 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 7aadefa715..a8a1082fa5 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 @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework 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 5438997709..81ba005c2c 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 @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/withStubs/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/withStubs/pom.xml index bba07ca022..1b0b426f80 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/withStubs/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/withStubs/pom.xml @@ -19,7 +19,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud.verifier.sample 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 92cb52d02d..c1ea5539c3 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index 209d6a0e18..fd8824813e 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index af3aab3ff7..1f32d8477b 100644 --- a/spring-cloud-contract-wiremock/pom.xml +++ b/spring-cloud-contract-wiremock/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index e6b88a2723..c10b0c01fa 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -18,7 +18,7 @@ + "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> diff --git a/tests/pom.xml b/tests/pom.xml index 99ebbdbde0..e332c83c95 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index b3aa140858..33e2ddd261 100644 --- a/tests/samples-messaging-amqp/pom.xml +++ b/tests/samples-messaging-amqp/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index e1a564d549..4419654d03 100644 --- a/tests/samples-messaging-camel/pom.xml +++ b/tests/samples-messaging-camel/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index e12f37aa3c..f6d020360a 100644 --- a/tests/samples-messaging-integration/pom.xml +++ b/tests/samples-messaging-integration/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/tests/samples-messaging-integration/src/main/resources/integration-context.xml b/tests/samples-messaging-integration/src/main/resources/integration-context.xml index c40f17dc13..31c1693d41 100644 --- a/tests/samples-messaging-integration/src/main/resources/integration-context.xml +++ b/tests/samples-messaging-integration/src/main/resources/integration-context.xml @@ -19,9 +19,9 @@ xmlns:beans="http://www.springframework.org/schema/beans" xmlns="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd + https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration.xsd"> + https://www.springframework.org/schema/integration/spring-integration.xsd"> diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index 28f2827985..2b810fae53 100644 --- a/tests/samples-messaging-stream/pom.xml +++ b/tests/samples-messaging-stream/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml index 6f48bf308a..624a04b992 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud 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 a0547e41b7..17ae746947 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud 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 a61a9c2d53..e2af3d52df 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/tests/spring-cloud-contract-stub-runner-camel/pom.xml b/tests/spring-cloud-contract-stub-runner-camel/pom.xml index bb0cb5e071..63cc1063da 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-camel/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud 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 35dd372282..3adbae5b92 100644 --- a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/tests/spring-cloud-contract-stub-runner-integration/pom.xml b/tests/spring-cloud-contract-stub-runner-integration/pom.xml index 4e870e5cef..16e1659472 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-integration/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/integration-context.xml b/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/integration-context.xml index c2a3666776..c6631e049e 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/integration-context.xml +++ b/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/integration-context.xml @@ -19,9 +19,9 @@ xmlns:beans="http://www.springframework.org/schema/beans" xmlns="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd + https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration.xsd"> + https://www.springframework.org/schema/integration/spring-integration.xsd"> 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 70001c0629..696233a815 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 @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/tests/spring-cloud-contract-stub-runner-moco/pom.xml b/tests/spring-cloud-contract-stub-runner-moco/pom.xml index 3198b6e214..0b7f59f5f2 100644 --- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud diff --git a/tests/spring-cloud-contract-stub-runner-stream/pom.xml b/tests/spring-cloud-contract-stub-runner-stream/pom.xml index aacec58e7e..7f34d80bf6 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-stream/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud From ea986b832980e87014ef68729b1ba61facc60458 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Mar 2019 18:52:50 +0100 Subject: [PATCH 4/5] Fix more URLs. # Conflicts: # docs/src/main/asciidoc/verifier_setup.adoc --- docs/src/main/asciidoc/spring-cloud-wiremock.adoc | 4 ++-- docs/src/main/asciidoc/verifier_faq.adoc | 2 +- docs/src/main/asciidoc/verifier_introduction.adoc | 12 ++++++------ docs/src/main/asciidoc/verifier_setup.adoc | 4 ++-- .../src/main/resources/application.properties | 2 +- .../contract/spec/internal/RegexPatternsSpec.groovy | 2 +- .../cloud/contract/stubrunner/StubRunnerMain.java | 2 +- .../serverexamples/StubRunnerBootEurekaExample.java | 2 +- .../wiremock/DslToWireMockClientConverterSpec.groovy | 12 ++++++------ .../src/main/resources/application.properties | 2 +- .../verifier/builder/ContractHttpDocsSpec.groovy | 4 ++-- .../dsl/wiremock/WireMockGroovyDslSpec.groovy | 6 +++--- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc index f3addf4f27..6ac8387011 100644 --- a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc +++ b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc @@ -4,7 +4,7 @@ == Spring Cloud Contract WireMock -The Spring Cloud Contract WireMock modules let you use http://wiremock.org[WireMock] in a +The Spring Cloud Contract WireMock modules let you use https://github.com/tomakehurst/wiremock[WireMock] in a Spring Boot application. Check out the https://github.com/spring-cloud/spring-cloud-contract/tree/{branch}/samples[samples] for more details. @@ -164,7 +164,7 @@ visit `https://example.org/`, it gets the responses as being declared at that UR than one stub pattern can be specified, and each one can be a directory (for a recursive list of all ".json"), a fixed filename (as in the example above), or an Ant-style pattern. The JSON format is the normal WireMock format, which you can read about in the -http://wiremock.org/docs/stubbing/[WireMock website]. +https://wiremock.org/docs/stubbing/[WireMock website]. Currently, the Spring Cloud Contract Verifier supports Tomcat, Jetty, and Undertow as Spring Boot embedded servers, and Wiremock itself has "native" support for a particular diff --git a/docs/src/main/asciidoc/verifier_faq.adoc b/docs/src/main/asciidoc/verifier_faq.adoc index 148116b72d..e061ee3306 100644 --- a/docs/src/main/asciidoc/verifier_faq.adoc +++ b/docs/src/main/asciidoc/verifier_faq.adoc @@ -164,7 +164,7 @@ org.springframework.cloud.contract.spec.Contract.make { } ---- -IMPORTANT: Please read the http://groovy-lang.org/json.html[Groovy docs related to JSON] to understand how to +IMPORTANT: Please read the https://groovy-lang.org/json.html[Groovy docs related to JSON] to understand how to properly structure the request / response bodies. === How to do Stubs versioning? diff --git a/docs/src/main/asciidoc/verifier_introduction.adoc b/docs/src/main/asciidoc/verifier_introduction.adoc index d8dd72ee30..f2342dd43f 100644 --- a/docs/src/main/asciidoc/verifier_introduction.adoc +++ b/docs/src/main/asciidoc/verifier_introduction.adoc @@ -20,7 +20,7 @@ Spring Cloud Contract Verifier. Before becoming Spring Cloud Contract, this project was called https://github.com/Codearte/accurest[Accurest]. It was created by https://twitter.com/mgrzejszczak[Marcin Grzejszczak] and https://twitter.com/jkubrynski[Jakub Kubrynski] -from (http://codearte.io[codearte.io]. +from (https://github.com/Codearte[Codearte]. The `0.1.0` release took place on 26 Jan 2015 and it became stable with `1.0.0` release on 29 Feb 2016. @@ -732,7 +732,7 @@ a map notation or String with interpolations. Consult the <> section for more information. We highly recommend using the map notation! TIP: You must understand the map notation in order to set up contracts. Please read the -http://groovy-lang.org/json.html[Groovy docs regarding JSON]. +https://groovy-lang.org/json.html[Groovy docs regarding JSON]. The previously shown contract is an agreement between two sides that: @@ -911,7 +911,7 @@ the `contracts` folder, pick only one, which should be `fraud`. Add the `Base` s capitalize `fraud`. That gives you the `FraudBase` test class name. All the generated tests extend that class. Over there, you can set up your Spring Context -or whatever is necessary. In this case, use http://rest-assured.io/[Rest Assured MVC] to +or whatever is necessary. In this case, use https://github.com/rest-assured/rest-assured[Rest Assured MVC] to start the server side `FraudDetectionController`. [source,java,indent=0] @@ -1046,9 +1046,9 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480] ==== Readings - https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] -- http://toomuchcoding.com/blog/categories/accurest/[Accurest related articles from Marcin Grzejszczak's blog] -- http://toomuchcoding.com/blog/categories/spring-cloud-contract/[Spring Cloud Contract related articles from Marcin Grzejszczak's blog] -- http://groovy-lang.org/json.html[Groovy docs regarding JSON] +- https://toomuchcoding.com/blog/categories/accurest/[Accurest related articles from Marcin Grzejszczak's blog] +- https://toomuchcoding.com/blog/categories/spring-cloud-contract/[Spring Cloud Contract related articles from Marcin Grzejszczak's blog] +- https://groovy-lang.org/json.html[Groovy docs regarding JSON] === Samples diff --git a/docs/src/main/asciidoc/verifier_setup.adoc b/docs/src/main/asciidoc/verifier_setup.adoc index e435ffb2d5..6b219eb317 100644 --- a/docs/src/main/asciidoc/verifier_setup.adoc +++ b/docs/src/main/asciidoc/verifier_setup.adoc @@ -1007,7 +1007,7 @@ name of `scenario1` and the three following steps: . logout marked as `Step2` which will close the scenario. More details about WireMock scenarios can be found at -http://wiremock.org/docs/stateful-behaviour/[http://wiremock.org/docs/stateful-behaviour/] +https://wiremock.org/docs/stateful-behaviour/[https://wiremock.org/docs/stateful-behaviour/] Spring Cloud Contract Verifier also generates tests with a guaranteed order of execution. @@ -1073,7 +1073,7 @@ It's enough for you to mount your contracts, pass the environment variables - generate the contract tests - execute the tests against the provided URL -- generate the http://wiremock.org[WireMock] stubs +- generate the https://github.com/tomakehurst/wiremock[WireMock] stubs - (optional - turned on by default) publish the stubs to a Artifact Manager ===== Environment Variables diff --git a/samples/wiremock-undertow-ssl/src/main/resources/application.properties b/samples/wiremock-undertow-ssl/src/main/resources/application.properties index 7159285ff1..1314e83fb0 100644 --- a/samples/wiremock-undertow-ssl/src/main/resources/application.properties +++ b/samples/wiremock-undertow-ssl/src/main/resources/application.properties @@ -1,4 +1,4 @@ -#WireMock password - http://wiremock.org/docs/running-standalone/ +#WireMock password - https://wiremock.org/docs/running-standalone/ server.ssl.key-store-password=password server.ssl.key-password=password server.ssl.trust-store-password=password diff --git a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy index a58ba16d03..67af92ffc9 100644 --- a/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy +++ b/spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy @@ -91,7 +91,7 @@ class RegexPatternsSpec extends Specification { 'https://j.mp' || true 'ftp://foo.bar/baz' || true 'https://foo.bar/?q=Test%20URL-encoded%20stuff' || true - 'http://1337.net' || true + 'https://1224.net/' || true 'https://a.b-c.de' || true 'https://223.255.255.254' || true 'foo.com' || true diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerMain.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerMain.java index 522f3ee1b6..5302a8f5ea 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerMain.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerMain.java @@ -64,7 +64,7 @@ public class StubRunnerMain { ArgumentAcceptingOptionSpec rootOpt = parser.acceptsAll( Arrays.asList("r", "root"), "Location of a Jar containing server where you keep " - + "your stubs (e.g. http://nexus.net/content/repositories/repository)") + + "your stubs (e.g. https://nexus.net/content/repositories/repository)") .withRequiredArg(); ArgumentAcceptingOptionSpec usernameOpt = parser .acceptsAll(Arrays.asList("u", "username"), diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/serverexamples/StubRunnerBootEurekaExample.java b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/serverexamples/StubRunnerBootEurekaExample.java index 58a3917a4b..c6724b1a7d 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/serverexamples/StubRunnerBootEurekaExample.java +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/serverexamples/StubRunnerBootEurekaExample.java @@ -42,7 +42,7 @@ public class StubRunnerBootEurekaExample { /* * * // tag::stubrunnereureka_args[] - * -Dstubrunner.repositoryRoot=https://repo.spring.io/snapshots (1) + * -Dstubrunner.repositoryRoot=https://repo.spring.io/snapshot (1) * -Dstubrunner.cloud.stubbed.discovery.enabled=false (2) * -Dstubrunner.ids=org.springframework.cloud.contract.verifier.stubs:loanIssuance,org. * springframework.cloud.contract.verifier.stubs:fraudDetectionServer,org.springframework. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy index f1237ef910..e4af63caea 100755 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/src/test/groovy/org/springframework/cloud/contract/verifier/wiremock/DslToWireMockClientConverterSpec.groovy @@ -488,7 +488,7 @@ class DslToWireMockClientConverterSpec extends Specification { } body( email: $(consumer(optional(regex(email()))), producer('abc@abc.com')), - callback_url: $(consumer(regex(hostname())), producer('http://partners.com')) + callback_url: $(consumer(regex(hostname())), producer('https://partners.com')) ) } response { @@ -543,7 +543,7 @@ class DslToWireMockClientConverterSpec extends Specification { and: def response = restTemplate.exchange(RequestEntity.post("${url}/users/password".toURI()) .header("Content-Type", "application/json") - .body('''{"email":"abc@abc.com", "callback_url":"http://partners.com"}''') + .body('''{"email":"abc@abc.com", "callback_url":"https://partners.com"}''') , String) response.headers.get('Content-Type') == ['application/json'] response.statusCodeValue == 404 @@ -846,7 +846,7 @@ class DslToWireMockClientConverterSpec extends Specification { } body( email: 'abc@abc.com', - callback_url: 'http://partners.com' + callback_url: 'https://partners.com' ) bodyMatchers { jsonPath('$.[\\'email\\']', byRegex(email())) @@ -908,7 +908,7 @@ class DslToWireMockClientConverterSpec extends Specification { and: def response = restTemplate.exchange(RequestEntity.post("${url}/users/password2".toURI()) .header("Content-Type", "application/json") - .body('''{"email":"abc@abc.com", "callback_url":"http://partners.com"}''') + .body('''{"email":"abc@abc.com", "callback_url":"https://partners.com"}''') , String) response.headers.get('Content-Type') == ['application/json'] response.statusCodeValue == 404 @@ -932,7 +932,7 @@ class DslToWireMockClientConverterSpec extends Specification { } body( email: 'abc@abc.com', - callback_url: 'http://partners.com' + callback_url: 'https://partners.com' ) bodyMatchers { jsonPath('$.[\\'email\\']', byRegex(email())) @@ -1006,7 +1006,7 @@ class DslToWireMockClientConverterSpec extends Specification { and: def response = restTemplate.exchange(RequestEntity.post("${url}/users/password2".toURI()) .header("Content-Type", "application/json") - .body('''{"email":"abc@abc.com", "callback_url":"http://partners.com"}''') + .body('''{"email":"abc@abc.com", "callback_url":"https://partners.com"}''') , String) response.headers.get('Content-Type') == ['application/json;charset=UTF-8'] response.statusCodeValue == 400 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/src/main/resources/application.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/src/main/resources/application.properties index 5c46ff42f3..17d0b12361 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/src/main/resources/application.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/fraudDetectionService/src/main/resources/application.properties @@ -1,4 +1,4 @@ -#WireMock password - http://wiremock.org/docs/running-standalone/ +#WireMock password - https://wiremock.org/docs/running-standalone/ server.ssl.key-store-password=password server.ssl.key-password=password server.ssl.trust-store-password=password diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ContractHttpDocsSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ContractHttpDocsSpec.groovy index a12d31fbd8..75642ad0df 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ContractHttpDocsSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/ContractHttpDocsSpec.groovy @@ -287,7 +287,7 @@ class ContractHttpDocsSpec extends Specification { } body( email: $(consumer(optional(regex(email()))), producer('abc@abc.com')), - callback_url: $(consumer(regex(hostname())), producer('http://partners.com')) + callback_url: $(consumer(regex(hostname())), producer('https://partners.com')) ) } response { @@ -315,7 +315,7 @@ class ContractHttpDocsSpec extends Specification { given: def request = given() .header("Content-Type", "application/json") - .body('''{"email":"abc@abc.com","callback_url":"http://partners.com"}''') + .body('''{"email":"abc@abc.com","callback_url":"https://partners.com"}''') when: def response = given().spec(request) diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockGroovyDslSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockGroovyDslSpec.groovy index 7917b3696c..8dabae12fa 100755 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockGroovyDslSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockGroovyDslSpec.groovy @@ -1365,7 +1365,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie } body( email: $(consumer(regex(email())), producer('not.existing@user.com')), - callback_url: $(consumer(regex(hostname())), producer('http://partners.com')) + callback_url: $(consumer(regex(hostname())), producer('https://partners.com')) ) } response { @@ -1504,7 +1504,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie } body( email: $(consumer(optional(regex(email()))), producer('abc@abc.com')), - callback_url: $(consumer(regex(hostname())), producer('http://partners.com')) + callback_url: $(consumer(regex(hostname())), producer('https://partners.com')) ) } response { @@ -1529,7 +1529,7 @@ class WireMockGroovyDslSpec extends Specification implements WireMockStubVerifie body( """ { "email" : "${value(consumer(optional(regex(email()))), producer('abc@abc.com'))}", - "callback_url" : "${value(consumer(regex(hostname())), producer('http://partners.com'))}" + "callback_url" : "${value(consumer(regex(hostname())), producer('https://partners.com'))}" } """ ) From 19085e39ae2b0176afb3973deef1f4939cb8a56c Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 28 Mar 2019 11:49:15 +0100 Subject: [PATCH 5/5] Fix more URLs. # Conflicts: # docs/src/main/asciidoc/verifier_setup.adoc --- README.adoc | 18 ++++++++++-------- .../stubrunner/GitStubDownloaderTests.java | 4 ++-- .../src/main/resources/integration-context.xml | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.adoc b/README.adoc index 6eeeb5daa1..3a0dc74c7e 100644 --- a/README.adoc +++ b/README.adoc @@ -49,7 +49,7 @@ Spring Cloud Contract Verifier. Before becoming Spring Cloud Contract, this project was called https://github.com/Codearte/accurest[Accurest]. It was created by https://twitter.com/mgrzejszczak[Marcin Grzejszczak] and https://twitter.com/jkubrynski[Jakub Kubrynski] -from (http://codearte.io[codearte.io]. +from (https://github.com/Codearte[Codearte]. The `0.1.0` release took place on 26 Jan 2015 and it became stable with `1.0.0` release on 29 Feb 2016. @@ -1123,7 +1123,7 @@ a map notation or String with interpolations. Consult the <> section for more information. We highly recommend using the map notation! TIP: You must understand the map notation in order to set up contracts. Please read the -http://groovy-lang.org/json.html[Groovy docs regarding JSON]. +https://groovy-lang.org/json.html[Groovy docs regarding JSON]. The previously shown contract is an agreement between two sides that: @@ -1354,7 +1354,7 @@ the `contracts` folder, pick only one, which should be `fraud`. Add the `Base` s capitalize `fraud`. That gives you the `FraudBase` test class name. All the generated tests extend that class. Over there, you can set up your Spring Context -or whatever is necessary. In this case, use http://rest-assured.io/[Rest Assured MVC] to +or whatever is necessary. In this case, use https://github.com/rest-assured/rest-assured[Rest Assured MVC] to start the server side `FraudDetectionController`. [source,java,indent=0] @@ -1539,9 +1539,9 @@ video::sAAklvxmPmk[youtube,start=538,width=640,height=480] ==== Readings - https://www.slideshare.net/MarcinGrzejszczak/stick-to-the-rules-consumer-driven-contracts-201507-confitura[Slides from Marcin Grzejszczak's talk about Accurest] -- http://toomuchcoding.com/blog/categories/accurest/[Accurest related articles from Marcin Grzejszczak's blog] -- http://toomuchcoding.com/blog/categories/spring-cloud-contract/[Spring Cloud Contract related articles from Marcin Grzejszczak's blog] -- http://groovy-lang.org/json.html[Groovy docs regarding JSON] +- https://toomuchcoding.com/blog/categories/accurest/[Accurest related articles from Marcin Grzejszczak's blog] +- https://toomuchcoding.com/blog/categories/spring-cloud-contract/[Spring Cloud Contract related articles from Marcin Grzejszczak's blog] +- https://groovy-lang.org/json.html[Groovy docs regarding JSON] === Samples @@ -1568,7 +1568,7 @@ Marcin Grzejszczak] == Spring Cloud Contract WireMock -The Spring Cloud Contract WireMock modules let you use http://wiremock.org[WireMock] in a +The Spring Cloud Contract WireMock modules let you use https://github.com/tomakehurst/wiremock[WireMock] in a Spring Boot application. Check out the https://github.com/spring-cloud/spring-cloud-contract/tree/{branch}/samples[samples] for more details. @@ -1801,7 +1801,7 @@ visit `https://example.org/`, it gets the responses as being declared at that UR than one stub pattern can be specified, and each one can be a directory (for a recursive list of all ".json"), a fixed filename (as in the example above), or an Ant-style pattern. The JSON format is the normal WireMock format, which you can read about in the -http://wiremock.org/docs/stubbing/[WireMock website]. +https://wiremock.org/docs/stubbing/[WireMock website]. Currently, the Spring Cloud Contract Verifier supports Tomcat, Jetty, and Undertow as Spring Boot embedded servers, and Wiremock itself has "native" support for a particular @@ -2249,6 +2249,8 @@ IMPORTANT: You need to have all the necessary Groovy plugins IMPORTANT: Spring Cloud Contract builds Docker images. Remember to have Docker installed. +IMPORTANT: If you want to run the build in offline mode, you have to have Maven 3.5.2+ installed. + === Project structure Here you can find the Spring Cloud Contract folder structure diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java index c74b1ab588..7fe4ffcd7c 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java @@ -76,8 +76,8 @@ public class GitStubDownloaderTests { StubDownloader stubDownloader = stubDownloaderBuilder .build(new StubRunnerOptionsBuilder() .withStubsMode(StubRunnerProperties.StubsMode.REMOTE) - .withStubRepositoryRoot("http://www.foo.com/").withProperties(props()) - .build()); + .withStubRepositoryRoot("http://www.foo.com/") + .withProperties(props()).build()); then(stubDownloader).isNull(); } diff --git a/tests/samples-messaging-integration/src/main/resources/integration-context.xml b/tests/samples-messaging-integration/src/main/resources/integration-context.xml index 31c1693d41..11f19e73f3 100644 --- a/tests/samples-messaging-integration/src/main/resources/integration-context.xml +++ b/tests/samples-messaging-integration/src/main/resources/integration-context.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration - https://www.springframework.org/schema/integration/spring-integration.xsd"> + http://www.springframework.org/schema/integration/spring-integration.xsd">