You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/04/16 11:11:33 UTC
[camel] branch camel-2.x updated: Fixed test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 9f6475e Fixed test
9f6475e is described below
commit 9f6475ec873846f21cae67eaad84b969930f91dd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jan 18 09:28:55 2019 +0100
Fixed test
---
.../cloud/consul/CamelCloudConsulAutoConfigurationTest.java | 12 ++++++++++--
.../cloud/consul/CamelCloudConsulServiceRegistryTest.java | 7 +++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulAutoConfigurationTest.java b/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulAutoConfigurationTest.java
index a291515..f1aaaa0 100644
--- a/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulAutoConfigurationTest.java
+++ b/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulAutoConfigurationTest.java
@@ -44,9 +44,13 @@ public class CamelCloudConsulAutoConfigurationTest {
"--spring.cloud.consul.enabled=true",
"--spring.cloud.consul.config.enabled=false",
"--spring.cloud.consul.discovery.enabled=true",
- "--spring.cloud.service-registry.auto-registration.enabled=false"
+ "--spring.cloud.service-registry.auto-registration.enabled=false",
+ "--spring.main.allow-bean-definition-overriding=true"
);
+ // TODO: Remove --spring.main.allow-bean-definition-overriding=true when new version of spring-cloud
+ // is released that supports Spring Boot 2.1 more properly
+
try {
Map<String, Converter> converters = context.getBeansOfType(Converter.class);
@@ -71,9 +75,13 @@ public class CamelCloudConsulAutoConfigurationTest {
"--spring.cloud.consul.enabled=true",
"--spring.cloud.consul.config.enabled=false",
"--spring.cloud.consul.discovery.enabled=true",
- "--spring.cloud.service-registry.auto-registration.enabled=false"
+ "--spring.cloud.service-registry.auto-registration.enabled=false",
+ "--spring.main.allow-bean-definition-overriding=true"
);
+ // TODO: Remove --spring.main.allow-bean-definition-overriding=true when new version of spring-cloud
+ // is released that supports Spring Boot 2.1 more properly
+
try {
Map<String, Converter> converters = context.getBeansOfType(Converter.class);
diff --git a/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulServiceRegistryTest.java b/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulServiceRegistryTest.java
index 12528b7..0daf9d9 100644
--- a/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulServiceRegistryTest.java
+++ b/components/camel-spring-cloud-consul/src/test/java/org/apache/camel/spring/cloud/consul/CamelCloudConsulServiceRegistryTest.java
@@ -48,7 +48,7 @@ public class CamelCloudConsulServiceRegistryTest {
private static final int SERVICE_PORT = SocketUtils.findAvailableTcpPort();
@Rule
- public GenericContainer container = new GenericContainer("consul:1.0.7")
+ public GenericContainer container = new GenericContainer("consul:1.4.0")
.withExposedPorts(8500)
.waitingFor(Wait.forLogMessageContaining("Synced node info", 1))
.withLogConsumer(new Slf4jLogConsumer(LOGGER).withPrefix("consul"))
@@ -80,8 +80,11 @@ public class CamelCloudConsulServiceRegistryTest {
"--spring.cloud.consul.config.enabled=false",
"--spring.cloud.consul.discovery.enabled=true",
"--spring.cloud.service-registry.auto-registration.enabled=false",
- "--camel.cloud.service-registry.service-host=localhost"
+ "--camel.cloud.service-registry.service-host=localhost",
+ "--spring.main.allow-bean-definition-overriding=true"
);
+ // TODO: Remove --spring.main.allow-bean-definition-overriding=true when new version of spring-cloud
+ // is released that supports Spring Boot 2.1 more properly
try {
final ConsulClient client = context.getBean(ConsulClient.class);