You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/10 05:48:50 UTC
[camel] branch master updated: Upgraded consul docker image
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f7ec6e1 Upgraded consul docker image
f7ec6e1 is described below
commit f7ec6e1d6ee418d418cf42939a762ae55aac1c77
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Aug 10 07:41:20 2019 +0200
Upgraded consul docker image
---
.../test/java/org/apache/camel/component/consul/ConsulTestSupport.java | 2 +-
.../test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java | 2 +-
.../apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java | 2 +-
examples/camel-example-spring-cloud-serviceregistry/README.adoc | 2 +-
.../component/consul/springboot/cloud/ConsulServiceRegistryIT.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
index bc1d6cd..5dff0b3 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/ConsulTestSupport.java
@@ -31,7 +31,7 @@ import org.junit.rules.TestName;
import org.testcontainers.containers.GenericContainer;
public class ConsulTestSupport extends ContainerAwareTestSupport {
- public static final String CONTAINER_IMAGE = "consul:1.5.1";
+ public static final String CONTAINER_IMAGE = "consul:1.5.3";
public static final String CONTAINER_NAME = "consul";
public static final String KV_PREFIX = "/camel";
diff --git a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
index 3e0420f..7cd0522 100644
--- a/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
+++ b/components/camel-testcontainers-spring/src/test/java/org/apache/camel/test/testcontainers/spring/ContainerAwareSpringTestSupportIT.java
@@ -42,7 +42,7 @@ public class ContainerAwareSpringTestSupportIT extends ContainerAwareSpringTestS
@Override
protected GenericContainer<?> createContainer() {
- return new GenericContainer("consul:1.5.1")
+ return new GenericContainer("consul:1.5.3")
.withNetworkAliases("myconsul")
.withExposedPorts(8500)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
diff --git a/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java b/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
index d776d88..ec8d402f 100644
--- a/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
+++ b/components/camel-testcontainers/src/test/java/org/apache/camel/test/testcontainers/ContainerAwareTestSupportIT.java
@@ -34,7 +34,7 @@ public class ContainerAwareTestSupportIT extends ContainerAwareTestSupport {
@Override
protected GenericContainer<?> createContainer() {
- return new GenericContainer<>("consul:1.5.1")
+ return new GenericContainer<>("consul:1.5.3")
.withNetworkAliases("myconsul")
.withExposedPorts(8500)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
diff --git a/examples/camel-example-spring-cloud-serviceregistry/README.adoc b/examples/camel-example-spring-cloud-serviceregistry/README.adoc
index 195f27d..c0890fd 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/README.adoc
+++ b/examples/camel-example-spring-cloud-serviceregistry/README.adoc
@@ -24,7 +24,7 @@ Using multiple shells:
- start consul:
docker run --rm -ti --publish 8500:8500 \
- consul:1.5.1 \
+ consul:1.5.3 \
agent \
-dev \
-server \
diff --git a/platforms/spring-boot/components-starter/camel-consul-starter/src/test/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryIT.java b/platforms/spring-boot/components-starter/camel-consul-starter/src/test/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryIT.java
index ea47a17..e937b44 100644
--- a/platforms/spring-boot/components-starter/camel-consul-starter/src/test/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryIT.java
+++ b/platforms/spring-boot/components-starter/camel-consul-starter/src/test/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryIT.java
@@ -46,7 +46,7 @@ public class ConsulServiceRegistryIT {
private static final int SERVICE_PORT = SocketUtils.findAvailableTcpPort();
@Rule
- public GenericContainer container = new GenericContainer("consul:1.5.1")
+ public GenericContainer container = new GenericContainer("consul:1.5.3")
.withExposedPorts(Consul.DEFAULT_HTTP_PORT)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
.withLogConsumer(new Slf4jLogConsumer(LOGGER).withPrefix("consul"))