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
commit 208a1340c317dc7acfca0cbae3052e9ed08ac529 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Mar 19 09:43:39 2018 +0100 CAMEL-11430: Migrate to Spring Boot 2 - work in progress --- .../consumer/pom.xml | 18 +----------------- .../consumer/src/main/resources/application.properties | 4 ++-- .../camel-example-spring-cloud-servicecall/pom.xml | 14 +++++++++++++- .../service/pom.xml | 4 ++++ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml index 13acec0..202b7f8 100644 --- a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml +++ b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml @@ -39,7 +39,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <spring.boot-version>${spring-boot-version}</spring.boot-version> - <spring.cloud-version>1.1.3.RELEASE</spring.cloud-version> + <spring.cloud-version>2.0.0.M6</spring.cloud-version> </properties> <dependencyManagement> @@ -78,18 +78,6 @@ <artifactId>spring-boot-starter</artifactId> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-undertow</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-actuator</artifactId> - </dependency> - <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-consul-discovery</artifactId> </dependency> @@ -109,10 +97,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-undertow-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-http-starter</artifactId> </dependency> <dependency> diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/src/main/resources/application.properties b/examples/camel-example-spring-cloud-servicecall/consumer/src/main/resources/application.properties index c633bcc..c5d7a0b 100644 --- a/examples/camel-example-spring-cloud-servicecall/consumer/src/main/resources/application.properties +++ b/examples/camel-example-spring-cloud-servicecall/consumer/src/main/resources/application.properties @@ -30,8 +30,8 @@ spring.cloud.consul.discovery.register = false camel.springboot.main-run-controller=true camel.springboot.jmx-enabled=false -camel.rest.component=servlet +camel.rest.component=undertow camel.rest.binding-mode=auto # Configure the underlying Service Call component -camel.cloud.service-call.component = undertow +camel.cloud.service-call.component = http diff --git a/examples/camel-example-spring-cloud-servicecall/pom.xml b/examples/camel-example-spring-cloud-servicecall/pom.xml index abb141f..8d193ef 100644 --- a/examples/camel-example-spring-cloud-servicecall/pom.xml +++ b/examples/camel-example-spring-cloud-servicecall/pom.xml @@ -34,10 +34,22 @@ <description>An example showing how to work with Camel ServiceCall EIP and Spring Cloud</description> <packaging>pom</packaging> - <properties> + <properties> <category>Cloud</category> </properties> + <!-- spring-cloud with support for spring boot 2 is not in maven central yet --> + <repositories> + <repository> + <id>spring-milestones</id> + <name>Spring Milestones</name> + <url>https://repo.spring.io/libs-milestone</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <modules> <module>consumer</module> <module>service</module> diff --git a/examples/camel-example-spring-cloud-servicecall/service/pom.xml b/examples/camel-example-spring-cloud-servicecall/service/pom.xml index 967be03..1564779 100644 --- a/examples/camel-example-spring-cloud-servicecall/service/pom.xml +++ b/examples/camel-example-spring-cloud-servicecall/service/pom.xml @@ -69,6 +69,10 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-undertow</artifactId> + </dependency> <!-- Camel --> <dependency> -- To stop receiving notification emails like this one, please contact [email protected].
