CAMEL-10770: Upgrade to Spring Boot 1.5.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/837fa76a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/837fa76a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/837fa76a Branch: refs/heads/master Commit: 837fa76adcfe9774688cce814d2382a2f366bd62 Parents: 4e719f2 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jan 31 11:26:13 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jan 31 11:36:39 2017 +0100 ---------------------------------------------------------------------- .../client/src/main/java/sample/camel/ClientApplication.java | 2 +- examples/camel-example-spring-boot-starter/pom.xml | 2 +- .../test/java/sample/camel/SampleCamelApplicationTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/837fa76a/examples/camel-example-hystrix/client/src/main/java/sample/camel/ClientApplication.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-hystrix/client/src/main/java/sample/camel/ClientApplication.java b/examples/camel-example-hystrix/client/src/main/java/sample/camel/ClientApplication.java index 574bb0b..f55b5e0 100644 --- a/examples/camel-example-hystrix/client/src/main/java/sample/camel/ClientApplication.java +++ b/examples/camel-example-hystrix/client/src/main/java/sample/camel/ClientApplication.java @@ -19,7 +19,7 @@ package sample.camel; import org.apache.camel.component.hystrix.metrics.servlet.HystrixEventStreamServlet; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.embedded.ServletRegistrationBean; +import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; /** http://git-wip-us.apache.org/repos/asf/camel/blob/837fa76a/examples/camel-example-spring-boot-starter/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-boot-starter/pom.xml b/examples/camel-example-spring-boot-starter/pom.xml index 6373f62..c886edd 100644 --- a/examples/camel-example-spring-boot-starter/pom.xml +++ b/examples/camel-example-spring-boot-starter/pom.xml @@ -80,7 +80,7 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-spring</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/837fa76a/examples/camel-example-spring-boot-starter/src/test/java/sample/camel/SampleCamelApplicationTest.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-boot-starter/src/test/java/sample/camel/SampleCamelApplicationTest.java b/examples/camel-example-spring-boot-starter/src/test/java/sample/camel/SampleCamelApplicationTest.java index e5a097c..7d53276 100644 --- a/examples/camel-example-spring-boot-starter/src/test/java/sample/camel/SampleCamelApplicationTest.java +++ b/examples/camel-example-spring-boot-starter/src/test/java/sample/camel/SampleCamelApplicationTest.java @@ -20,16 +20,16 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; import org.apache.camel.builder.NotifyBuilder; +import org.apache.camel.test.spring.CamelSpringBootRunner; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.boot.test.context.SpringBootTest; import static org.junit.Assert.assertTrue; -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(SampleCamelApplication.class) +@RunWith(CamelSpringBootRunner.class) +@SpringBootTest(classes = SampleCamelApplication.class) public class SampleCamelApplicationTest { @Autowired
