From 48be8bc3c5361d4946eb677d9efb286b6df519c2 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 10:40:46 +0000 Subject: [PATCH] Update SNAPSHOT to 3.1.2 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- .../config/HttpClientVaultRestTemplateFactoryTest.java | 5 ++--- .../ConfigurableHttpConnectionFactoryIntegrationTests.java | 4 ++-- .../config/server/proxy/SchemeBasedRoutePlannerTest.java | 6 ++++-- spring-cloud-starter-config/pom.xml | 4 ++-- 12 files changed, 22 insertions(+), 21 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 704dba11..814098d6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/pom.xml b/pom.xml index 12441257..fc266850 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.2-SNAPSHOT + 3.1.2 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 @@ -27,7 +27,7 @@ config - 3.1.2-SNAPSHOT + 3.1.2 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 8a2bb080..9ca5efff 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 8d1b5caf..edd75908 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 6b8ece73..094590ba 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-config-dependencies - 3.1.2-SNAPSHOT + 3.1.2 pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index e2d16989..3c75bbe8 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.1-SNAPSHOT + 3.1.0 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index b1efc9f8..6658a338 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index f1f6d345..946a2456 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 3.1.2-SNAPSHOT + 3.1.2 .. diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java index f4da00d5..fd2308a2 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java @@ -107,12 +107,11 @@ public class HttpClientVaultRestTemplateFactoryTest { VaultEnvironmentProperties properties = getVaultEnvironmentProperties(null, HTTPS_PROXY); RestTemplate restTemplate = this.factory.build(properties); this.expectedException.expectCause(allOf(instanceOf(UnknownHostException.class), - hasProperty("message", containsString(HTTPS_PROXY.getHost())))); + hasProperty("message", containsString(HTTPS_PROXY.getHost())))); restTemplate.getForObject("http://somehost", String.class); } - @Test public void authenticatedHttpProxy() throws Exception { VaultEnvironmentProperties properties = getVaultEnvironmentProperties(AUTHENTICATED_HTTP_PROXY, null); @@ -138,7 +137,7 @@ public class HttpClientVaultRestTemplateFactoryTest { VaultEnvironmentProperties properties = getVaultEnvironmentProperties(HTTP_PROXY, null); RestTemplate restTemplate = this.factory.build(properties); this.expectedException.expectCause(allOf(instanceOf(UnknownHostException.class), - hasProperty("message", containsString(HTTP_PROXY.getHost())))); + hasProperty("message", containsString(HTTP_PROXY.getHost())))); restTemplate.getForObject("https://somehost", String.class); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java index 60af4288..afaff3fb 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java @@ -141,7 +141,7 @@ public class ConfigurableHttpConnectionFactoryIntegrationTests { .properties(gitProperties(repoUrl, null, HTTPS_PROXY)).run(); HttpClient httpClient = getHttpClientForUrl(repoUrl); this.expectedException.expectCause(allOf(instanceOf(UnknownHostException.class), - hasProperty("message", containsString(HTTPS_PROXY.getHost())))); + hasProperty("message", containsString(HTTPS_PROXY.getHost())))); makeRequest(httpClient, "http://somehost"); } @@ -188,7 +188,7 @@ public class ConfigurableHttpConnectionFactoryIntegrationTests { .properties(gitProperties(repoUrl, HTTP_PROXY, null)).run(); HttpClient httpClient = getHttpClientForUrl(repoUrl); this.expectedException.expectCause(allOf(instanceOf(UnknownHostException.class), - hasProperty("message", containsString(HTTP_PROXY.getHost())))); + hasProperty("message", containsString(HTTP_PROXY.getHost())))); makeRequest(httpClient, "https://somehost"); } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java index 0ac241b5..12512709 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java @@ -33,7 +33,8 @@ class SchemeBasedRoutePlannerTest { @Test void determineProxy_should_return_https_proxy_when_target_scheme_name_is_https_and_https_proxy_provided() { - SchemeBasedRoutePlanner planner = new SchemeBasedRoutePlanner(SECURED_PROXY_PROPERTIES, UNSECURED_PROXY_PROPERTIES); + SchemeBasedRoutePlanner planner = new SchemeBasedRoutePlanner(SECURED_PROXY_PROPERTIES, + UNSECURED_PROXY_PROPERTIES); final HttpHost result = planner.determineProxy(target("https"), anyRequest(), anyContext()); @@ -55,7 +56,8 @@ class SchemeBasedRoutePlannerTest { @Test void determineProxy_should_return_http_proxy_when_target_scheme_name_is_http_and_http_proxy_provided() { - SchemeBasedRoutePlanner planner = new SchemeBasedRoutePlanner(SECURED_PROXY_PROPERTIES, UNSECURED_PROXY_PROPERTIES); + SchemeBasedRoutePlanner planner = new SchemeBasedRoutePlanner(SECURED_PROXY_PROPERTIES, + UNSECURED_PROXY_PROPERTIES); final HttpHost result = planner.determineProxy(target("http"), anyRequest(), anyContext()); diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index a46cf7dd..1d96a3da 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-starter-config - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud