SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update SNAPSHOT to 3.1.2

Browse Source
This commit is contained in:
buildmaster
2022-04-27 10:40:46 +00:00
parent 989c17c911
commit 48be8bc3c5
12 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<relativePath>..</relativePath>
</parent>

6
pom.xml
View File

@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<packaging>pom</packaging>
<name>Spring Cloud Config</name>
<description>Spring Cloud Config</description>
@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<scm>
@@ -27,7 +27,7 @@
</scm>
<properties>
<bintray.package>config</bintray.package>
<spring-cloud-commons.version>3.1.2-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-commons.version>3.1.2</spring-cloud-commons.version>
<aws-java-sdk.version>1.11.911</aws-java-sdk.version>
<google-api-services-iam.version>v1-rev20201112-1.30.10</google-api-services-iam.version>
<testcontainers.version>1.16.2</testcontainers.version>

2
spring-cloud-config-client-tls-tests/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-config-client/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<relativePath>..</relativePath>
</parent>

4
spring-cloud-config-dependencies/pom.xml
View File

@@ -6,11 +6,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-config-dependencies</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<packaging>pom</packaging>
<name>spring-cloud-config-dependencies</name>
<description>Spring Cloud Config Dependencies</description>

4
spring-cloud-config-monitor/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-config-monitor</artifactId>
@@ -14,7 +14,7 @@
<description>Spring Cloud Config Monitor</description>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<spring-cloud-bus.version>3.1.1-SNAPSHOT</spring-cloud-bus.version>
<spring-cloud-bus.version>3.1.0</spring-cloud-bus.version>
</properties>
<dependencyManagement>
<dependencies>

2
spring-cloud-config-sample/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-config-server/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<relativePath>..</relativePath>
</parent>

5
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/config/HttpClientVaultRestTemplateFactoryTest.java
View File

@@ -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);
}

4
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java
View File

@@ -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");
}

6
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/proxy/SchemeBasedRoutePlannerTest.java
View File

@@ -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());

4
spring-cloud-starter-config/pom.xml
View File

@@ -6,10 +6,10 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
</parent>
<artifactId>spring-cloud-starter-config</artifactId>
<version>3.1.2-SNAPSHOT</version>
<version>3.1.2</version>
<name>spring-cloud-starter-config</name>
<description>Spring Cloud Starter</description>
<url>https://projects.spring.io/spring-cloud</url>