Update SNAPSHOT to 2.1.4.RELEASE

This commit is contained in:
buildmaster
2019-11-18 15:14:41 +00:00
parent 5118afce4f
commit 0ca0d4f8e0
14 changed files with 23 additions and 22 deletions

View File

@@ -83,7 +83,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,
@@ -273,6 +273,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/
----
@@ -313,7 +314,7 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring
Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
</parent>
<artifactId>spring-cloud-consul-docs</artifactId>
<packaging>pom</packaging>

14
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<packaging>pom</packaging>
<name>Spring Cloud Consul</name>
<description>Spring Cloud Consul</description>
@@ -14,18 +14,18 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.1.8.BUILD-SNAPSHOT</version>
<version>2.1.9.RELEASE</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
<properties>
<spring-cloud-bus.version>2.1.4.BUILD-SNAPSHOT</spring-cloud-bus.version>
<spring-cloud-commons.version>2.1.4.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-config.version>2.1.5.BUILD-SNAPSHOT</spring-cloud-config.version>
<spring-cloud-netflix.version>2.1.4.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-bus.version>2.1.4.RELEASE</spring-cloud-bus.version>
<spring-cloud-commons.version>2.1.4.RELEASE</spring-cloud-commons.version>
<spring-cloud-config.version>2.1.5.RELEASE</spring-cloud-config.version>
<spring-cloud-netflix.version>2.1.4.RELEASE</spring-cloud-netflix.version>
<spring-cloud-deployer.version>1.0.3.RELEASE</spring-cloud-deployer.version>
<spring-cloud-openfeign.version>2.1.4.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
<spring-cloud-openfeign.version>2.1.4.RELEASE</spring-cloud-openfeign.version>
<spring-cloud-stream.version>Fishtown.SR4</spring-cloud-stream.version>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>

View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -6,11 +6,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>2.1.8.BUILD-SNAPSHOT</version>
<version>2.1.9.RELEASE</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-consul-dependencies</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<packaging>pom</packaging>
<name>spring-cloud-consul-dependencies</name>
<description>Spring Cloud Consul Dependencies</description>

View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul-all</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul-bus</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul-config</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul-discovery</artifactId>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>2.1.4.BUILD-SNAPSHOT</version>
<version>2.1.4.RELEASE</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul</artifactId>