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

Update SNAPSHOT to 1.2.0.M1

Browse Source
This commit is contained in:
Spencer Gibb
2017-01-27 14:29:17 -07:00
parent a242582e6c
commit 01321d78bd
15 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.adoc
View File

@@ -37,9 +37,9 @@ See the https://consul.io/intro/index.html[intro] for more information.
1. Run `docker-compose up`
2. Verify consul is running by visiting http://localhost:8500
3. Run `mvn package` this will bring in the required spring cloud maven repositories and build
4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.BUILD-SNAPSHOT.jar`
4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.M1.jar`
5. visit http://localhost:8080, verify that `{"serviceId":"<yourhost>:8080","host":"<yourhost>","port":8080}` results
6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.BUILD-SNAPSHOT.jar --server.port=8081`
6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.M1.jar --server.port=8081`
7. visit http://localhost:8080 again, verify that `{"serviceId":"<yourhost>:8081","host":"<yourhost>","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so).
== Building
@@ -212,4 +212,4 @@ added after the original pull request but before a merge.
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],
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).
message (where XXXX is the issue number).

2
docs/pom.xml
View File

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

4
docs/src/main/asciidoc/README.adoc
View File

@@ -28,9 +28,9 @@ See the https://consul.io/intro/index.html[intro] for more information.
1. Run `docker-compose up`
2. Verify consul is running by visiting http://localhost:8500
3. Run `mvn package` this will bring in the required spring cloud maven repositories and build
4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.BUILD-SNAPSHOT.jar`
4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.M1.jar`
5. visit http://localhost:8080, verify that `{"serviceId":"<yourhost>:8080","host":"<yourhost>","port":8080}` results
6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.BUILD-SNAPSHOT.jar --server.port=8081`
6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.M1.jar --server.port=8081`
7. visit http://localhost:8080 again, verify that `{"serviceId":"<yourhost>:8081","host":"<yourhost>","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so).
== Building

16
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>1.2.0.BUILD-SNAPSHOT</version>
<version>1.2.0.M1</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>1.3.1.BUILD-SNAPSHOT</version>
<version>1.3.1.M1</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
<properties>
<spring-cloud-bus.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-bus.version>
<spring-cloud-commons.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-config.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-config.version>
<spring-cloud-netflix.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-deployer.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-deployer.version>
<spring-cloud-stream.version>Chelsea.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-bus.version>1.3.0.M1</spring-cloud-bus.version>
<spring-cloud-commons.version>1.2.0.M1</spring-cloud-commons.version>
<spring-cloud-config.version>1.3.0.M2</spring-cloud-config.version>
<spring-cloud-netflix.version>1.3.0.M1</spring-cloud-netflix.version>
<spring-cloud-deployer.version>1.0.3.RELEASE</spring-cloud-deployer.version>
<spring-cloud-stream.version>Chelsea.M1</spring-cloud-stream.version>
</properties>
<scm>

2
spring-cloud-consul-binder/pom.xml
View File

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

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

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

2
spring-cloud-consul-core/pom.xml
View File

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

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

@@ -5,11 +5,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.3.1.BUILD-SNAPSHOT</version>
<version>1.3.1.M1</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-consul-dependencies</artifactId>
<version>1.2.0.BUILD-SNAPSHOT</version>
<version>1.2.0.M1</version>
<packaging>pom</packaging>
<name>spring-cloud-consul-dependencies</name>
<description>Spring Cloud Consul Dependencies</description>

2
spring-cloud-consul-discovery/pom.xml
View File

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

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

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

2
spring-cloud-starter-consul-all/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>1.2.0.BUILD-SNAPSHOT</version>
<version>1.2.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul-all</artifactId>

2
spring-cloud-starter-consul-bus/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>1.2.0.BUILD-SNAPSHOT</version>
<version>1.2.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul-bus</artifactId>

2
spring-cloud-starter-consul-config/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>1.2.0.BUILD-SNAPSHOT</version>
<version>1.2.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul-config</artifactId>

2
spring-cloud-starter-consul-discovery/pom.xml
View File

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

2
spring-cloud-starter-consul/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-consul</artifactId>
<version>1.2.0.BUILD-SNAPSHOT</version>
<version>1.2.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-consul</artifactId>