[camel] branch boot2ga updated: CAMEL-12378: Spring Boot 2 - Fix the camel-example-spring-cloud-servicecall

[ig...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

igarashitm pushed a commit to branch boot2ga
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/boot2ga by this push:
     new 585b8c2  CAMEL-12378: Spring Boot 2 - Fix the camel-example-spring-cloud-servicecall
585b8c2 is described below

commit 585b8c2a880952763b4763b1cc1fca69bbe8a5ce
Author: Tomohisa Igarashi <tm...@gmail.com>
AuthorDate: Wed Mar 28 13:21:51 2018 -0400

    CAMEL-12378: Spring Boot 2 - Fix the camel-example-spring-cloud-servicecall
---
 .../camel-example-spring-cloud-servicecall/consumer/pom.xml  | 12 ++++++++++--
 .../consumer/src/main/resources/application.properties       |  6 ++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
index 889526b..44112bb 100644
--- a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
@@ -78,6 +78,14 @@
       <artifactId>spring-boot-starter</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-undertow</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-consul-discovery</artifactId>
     </dependency>
@@ -93,11 +101,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-servlet-starter</artifactId>
+      <artifactId>camel-http4-starter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-http-starter</artifactId>
+      <artifactId>camel-servlet-starter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
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 e5df334..5e9f543 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
@@ -15,6 +15,8 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
+spring.application.name=consumer
+
 # Spring Boot
 management.endpoints.enabled-by-default=false
 management.endpoint.health.enabled=true
@@ -30,8 +32,8 @@ spring.cloud.consul.discovery.register = false
 camel.springboot.main-run-controller=true
 camel.springboot.jmx-enabled=false
 
-camel.rest.component=undertow
+camel.rest.component=servlet
 camel.rest.binding-mode=auto
 
 # Configure the underlying Service Call component
-camel.cloud.service-call.component = http
+camel.cloud.service-call.component = http4

-- 
To stop receiving notification emails like this one, please contact
igarashitm@apache.org.