From ee548d06d6fc775ec45dab1f13d540693bbf47b1 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 26 Aug 2016 08:43:18 -0600 Subject: [PATCH] Update SNAPSHOT to 1.1.0.M1 --- README.adoc | 4 ++-- docs/pom.xml | 2 +- docs/src/main/asciidoc/README.adoc | 4 ++-- pom.xml | 4 ++-- spring-cloud-consul-binder/pom.xml | 2 +- .../cloud/consul/binder/ConsulBinderTests.java | 15 +++++---------- .../consul/binder/test/producer/TestProducer.java | 4 ++-- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 15 ++++++++------- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 17 files changed, 32 insertions(+), 36 deletions(-) diff --git a/README.adoc b/README.adoc index 17cdddbc..ba7773fc 100644 --- a/README.adoc +++ b/README.adoc @@ -36,9 +36,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.0.3.BUILD-SNAPSHOT.jar` +4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.RELEASE.jar` 5. visit http://localhost:8080, verify that `{"serviceId":":8080","host":"","port":8080}` results -6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.3.BUILD-SNAPSHOT.jar --server.port=8081` +6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.RELEASE.jar --server.port=8081` 7. visit http://localhost:8080 again, verify that `{"serviceId":":8081","host":"","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so). == Building diff --git a/docs/pom.xml b/docs/pom.xml index 4bc55b2f..6e386a0b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 spring-cloud-consul-docs pom diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 5173aac4..824fcfed 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -27,9 +27,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.0.3.BUILD-SNAPSHOT.jar` +4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.RELEASE.jar` 5. visit http://localhost:8080, verify that `{"serviceId":":8080","host":"","port":8080}` results -6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.3.BUILD-SNAPSHOT.jar --server.port=8081` +6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.0.RELEASE.jar --server.port=8081` 7. visit http://localhost:8080 again, verify that `{"serviceId":":8081","host":"","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so). == Building diff --git a/pom.xml b/pom.xml index e84e8dfa..3b1791ee 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 pom Spring Cloud Consul Spring Cloud Consul @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 1.2.0.BUILD-SNAPSHOT + 1.2.0.RELEASE diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index 76434a64..aeaadc87 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderTests.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderTests.java index 5158f549..eef10bfc 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderTests.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/ConsulBinderTests.java @@ -90,7 +90,7 @@ public class ConsulBinderTests { */ @Test public void testMessageSendReceive() throws Exception { - testMessageSendReceive(null, false); + testMessageSendReceive(null); } /** @@ -120,21 +120,17 @@ public class ConsulBinderTests { * @param partitioned if true, execute test with a partition selector * @throws Exception */ - private void testMessageSendReceive(String[] groups, boolean partitioned) throws Exception { + private void testMessageSendReceive(String[] groups) throws Exception { Set consumers = null; AppId producer = null; try { consumers = launchConsumers(groups); - producer = launchProducer(partitioned); + producer = launchProducer(); for (AppId consumer : consumers) { assertEquals(MESSAGE_PAYLOAD, waitForMessage(consumer.port)); } - - if (partitioned) { - assertTrue(partitionSelectorUsed(producer.port)); - } } finally { if (producer != null) { @@ -182,16 +178,15 @@ public class ConsulBinderTests { /** * Launch a producer that publishes a test message. * - * @param partitioned if true, configure producer to use a partition selector * @return {@link AppId} for producer */ - private AppId launchProducer(boolean partitioned) { + private AppId launchProducer() { int producerPort = SocketUtils.findAvailableTcpPort(); Map appProperties = new HashMap<>(); appProperties.put("server.port", String.valueOf(producerPort)); List args = new ArrayList<>(); args.add(String.format("--server.port=%d", producerPort)); - args.add(String.format("--partitioned=%b", partitioned)); + args.add(String.format("--partitioned=%b", false)); args.add("--debug"); return new AppId(launchApplication(TestProducer.class, appProperties, args), producerPort); diff --git a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java index 88e3d049..c3b79323 100644 --- a/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java +++ b/spring-cloud-consul-binder/src/test/java/org/springframework/cloud/consul/binder/test/producer/TestProducer.java @@ -60,10 +60,10 @@ public class TestProducer implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { - if (args.containsOption("partitioned") + /*if (args.containsOption("partitioned") && Boolean.valueOf(args.getOptionValues("partitioned").get(0))) { binder.setPartitionSelector(stubPartitionSelectorStrategy()); - } + }*/ SubscribableChannel producerChannel = producerChannel(); ProducerProperties properties = new ProducerProperties(); properties.setPartitionKeyExpression(new SpelExpressionParser().parseExpression("payload")); diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index f0e3caa8..afb82267 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index ef80a949..230112d2 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 11782374..d223e853 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -5,20 +5,20 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.2.0.BUILD-SNAPSHOT + 1.2.0.RELEASE spring-cloud-consul-dependencies - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies - 1.1.1.BUILD-SNAPSHOT - 1.1.2.BUILD-SNAPSHOT - 1.2.0.BUILD-SNAPSHOT - 1.0.0.BUILD-SNAPSHOT - 1.0.3.BUILD-SNAPSHOT + 1.2.0.M1 + 1.1.1.RELEASE + 1.2.0.M1 + 1.0.2.RELEASE + Brooklyn.M1 1.1.10 2.3.1 4.5 @@ -109,6 +109,7 @@ org.springframework.cloud spring-cloud-deployer-local ${spring-cloud-deployer.version} + test org.springframework.cloud diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 470a6617..f140f750 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index 3fba1d85..cade12ac 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index cbe247d0..8dbd541b 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index ef523282..dc7ecf4d 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 10d1d5ec..3fb31cd8 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 337f38a2..43abb593 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index ae2b7eb8..1d626266 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M1 .. spring-cloud-starter-consul