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 ef50900e55d236ff136a23749853d1518a457552
Author: nferraro <ni.ferr...@gmail.com>
AuthorDate: Fri Mar 30 17:34:25 2018 +0200

    CAMEL-12387: small updates to spring-boot examples documentation
---
 examples/camel-example-spring-boot-geocoder/README.adoc     |  8 ++------
 examples/camel-example-spring-boot-rest-swagger/README.adoc | 13 +++++++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/examples/camel-example-spring-boot-geocoder/README.adoc 
b/examples/camel-example-spring-boot-geocoder/README.adoc
index 25f628d..02a07ff 100644
--- a/examples/camel-example-spring-boot-geocoder/README.adoc
+++ b/examples/camel-example-spring-boot-geocoder/README.adoc
@@ -24,19 +24,15 @@ You should see the following output when the application is 
launched:
 
 ----
 [...]
-[INFO] --- spring-boot-maven-plugin:1.5.1.RELEASE:run (default-cli) @ 
camel-example-spring-boot-rest-swagger ---
   .   ____          _            __ _ _
  /\\ / ___'_ __ _ _(_)_ __  __ _ \ \ \ \
 ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
  \\/  ___)| |_)| | | | | || (_| |  ) ) ) )
   '  |____| .__|_| |_|_| |_\__, | / / / /
  =========|_|==============|___/=/_/_/_/
- :: Spring Boot ::        (v1.5.1.RELEASE)
+ :: Spring Boot ::        (v2.0.0.RELEASE)
 [...]
-2017-03-05 14:55:44.032  INFO 15312 --- [           main] 
o.a.camel.spring.SpringCamelContext      : Total 4 routes, of which 4 are 
started.
-2017-03-05 14:55:44.034  INFO 15312 --- [           main] 
o.a.camel.spring.SpringCamelContext      : Apache Camel 2.19.0-SNAPSHOT 
(CamelContext: camel-1) started in 0.614 seconds
-2017-03-05 14:55:44.131  INFO 15312 --- [           main] 
s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat started on port(s): 8080 
(http)
-2017-03-05 14:55:44.140  INFO 15312 --- [           main] 
o.a.c.example.springboot.Application     : Started Application in 6.265 seconds 
(JVM running for 21.092)
+2018-03-30 16:28:56.354  INFO 29880 --- [           main] 
o.a.c.e.springboot.geocoder.Application  : Started Application in 4.806 seconds 
(JVM running for 5.435)
 ----
 
 After the Spring Boot application is started, you can open the following URL 
in your web browser to access the REST endpoint and request the address for 
"Paris": http://localhost:8080/camel/geocoder/?address=Paris
diff --git a/examples/camel-example-spring-boot-rest-swagger/README.adoc 
b/examples/camel-example-spring-boot-rest-swagger/README.adoc
index 698d1e9..47e0a0a 100644
--- a/examples/camel-example-spring-boot-rest-swagger/README.adoc
+++ b/examples/camel-example-spring-boot-rest-swagger/README.adoc
@@ -24,18 +24,23 @@ You should see the following output when the application is 
launched:
 
 [source,text]
 ----
+<<<<<<< HEAD
 ...
 [INFO] --- spring-boot-maven-plugin:1.5.10.RELEASE:run (default-cli) @ 
camel-example-spring-boot-rest-swagger ---
+=======
+[...]
   .   ____          _            __ _ _
  /\\ / ___'_ __ _ _(_)_ __  __ _ \ \ \ \
 ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
  \\/  ___)| |_)| | | | | || (_| |  ) ) ) )
   '  |____| .__|_| |_|_| |_\__, | / / / /
  =========|_|==============|___/=/_/_/_/
- :: Spring Boot ::        (v1.5.10.RELEASE)
-...
-2018-03-22 11:59:18.861  INFO 30508 --- [           main] 
o.a.camel.spring.SpringCamelContext      : Total 4 routes, of which 4 are 
started
-2018-03-22 11:59:18.862  INFO 30508 --- [           main] 
o.a.camel.spring.SpringCamelContext      : Apache Camel 2.22.0-SNAPSHOT 
(CamelContext: MyCamel) started in 0.357 seconds
+ :: Spring Boot ::        (v2.0.0.RELEASE)
+[...]
+2017-03-05 14:55:44.032  INFO 15312 --- [           main] 
o.a.camel.spring.SpringCamelContext      : Total 4 routes, of which 4 are 
started.
+2017-03-05 14:55:44.034  INFO 15312 --- [           main] 
o.a.camel.spring.SpringCamelContext      : Apache Camel 2.22.0-SNAPSHOT 
(CamelContext: camel-1) started in 0.614 seconds
+2017-03-05 14:55:44.131  INFO 15312 --- [           main] 
s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat started on port(s): 8080 
(http)
+2017-03-05 14:55:44.140  INFO 15312 --- [           main] 
o.a.c.example.springboot.Application     : Started Application in 6.265 seconds 
(JVM running for 21.092)
 ----
 
 After the Spring Boot application is started, you can open the following URL 
in your web browser to access the REST endpoint and retrieve a list of users: 
http://localhost:8080/camel/users

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

Reply via email to