Repository: camel Updated Branches: refs/heads/master e201f1235 -> 91bf7bf1e
CAMEL-11769: Allow -starter to be compiled with SB1 and SB2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91bf7bf1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91bf7bf1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91bf7bf1 Branch: refs/heads/master Commit: 91bf7bf1efc479717374bf169d3b9cff8dd3d941 Parents: e201f12 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Sep 11 15:23:02 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Sep 12 08:20:24 2017 +0200 ---------------------------------------------------------------------- .../springboot/test/HystrixMappingAutoConfigurationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/91bf7bf1/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java b/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java index c13a15b..35f23ab 100644 --- a/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java +++ b/platforms/spring-boot/components-starter/camel-hystrix-starter/src/test/java/org/apache/camel/component/hystrix/springboot/test/HystrixMappingAutoConfigurationTest.java @@ -29,8 +29,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; @@ -50,7 +50,7 @@ public class HystrixMappingAutoConfigurationTest { private static final Logger LOG = LoggerFactory.getLogger(HystrixMappingAutoConfigurationTest.class); - @LocalServerPort + @Value("${local.server.port}") private int serverPort; @Test