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

Update SNAPSHOT to 2.2.0.M1

Browse Source
This commit is contained in:
buildmaster
2019-07-03 17:53:09 +00:00
parent f24f023951
commit 0e229c91b4
10 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.adoc
View File

@@ -257,7 +257,7 @@ credentials and you already have those.
The projects that require middleware generally include a
`docker-compose.yml`, so consider using
https://compose.docker.io/[Docker Compose] to run the middeware servers
https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
in Docker containers. See the README in the
https://github.com/spring-cloud-samples/scripts[scripts demo
repository] for specific instructions about the common cases of mongo,
@@ -459,6 +459,7 @@ $ touch .springformat
==== Intellij IDEA
In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
.spring-cloud-build-tools/
----

2
docs/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</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>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</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>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<scm>
@@ -27,7 +27,7 @@
</scm>
<properties>
<bintray.package>config</bintray.package>
<spring-cloud-commons.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-commons.version>2.2.0.M1</spring-cloud-commons.version>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
<maven-checkstyle-plugin.failsOnViolation>true
</maven-checkstyle-plugin.failsOnViolation>

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>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</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>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M3</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-config-dependencies</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</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>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</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>2.1.1.BUILD-SNAPSHOT</spring-cloud-bus.version>
<spring-cloud-bus.version>2.2.0.M1</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>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</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>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</version>
<relativePath>..</relativePath>
</parent>

4
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java
View File

@@ -181,9 +181,7 @@ public class EnvironmentController {
if (output.length() > 0) {
output.append("\n");
}
output.append(entry.getKey())
.append(": ")
.append(entry.getValue());
output.append(entry.getKey()).append(": ").append(entry.getValue());
}
return output.toString();
}

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>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</version>
</parent>
<artifactId>spring-cloud-starter-config</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</version>
<name>spring-cloud-starter-config</name>
<description>Spring Cloud Starter</description>
<url>https://projects.spring.io/spring-cloud</url>