This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.21.x in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.21.x by this push: new 18edc7a Spring Boot examples that uses undertow should exclude tomcat 18edc7a is described below commit 18edc7adab1d96d17a08f87a7b24dee50af136a6 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Apr 11 10:12:22 2018 +0200 Spring Boot examples that uses undertow should exclude tomcat --- .../src/main/resources/archetype-resources/pom.xml | 6 ++++++ examples/camel-example-rabbitmq/pom.xml | 6 ++++++ examples/camel-example-rest-producer/pom.xml | 6 ++++++ .../cluster-node/pom.xml | 10 ++++++---- .../application/pom.xml | 6 ++++++ .../camel-example-spring-boot-health-checks/service/pom.xml | 6 ++++++ examples/camel-example-spring-boot-master/pom.xml | 10 ++++++---- examples/camel-example-spring-boot-rest-swagger/pom.xml | 6 ++++++ .../camel-example-spring-boot-servicecall/consumer/pom.xml | 10 ++++++---- .../pom.xml | 6 ++++++ examples/camel-example-spring-boot-xml/pom.xml | 6 ++++++ examples/camel-example-spring-boot/pom.xml | 6 ++++++ .../camel-example-spring-cloud-servicecall/consumer/pom.xml | 10 ++++++---- examples/camel-example-twitter-salesforce/pom.xml | 6 ++++++ examples/camel-example-validator-spring-boot/pom.xml | 6 ++++++ 15 files changed, 90 insertions(+), 16 deletions(-) diff --git a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml index d8a3fca..29dc99b 100644 --- a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml @@ -60,6 +60,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-rabbitmq/pom.xml b/examples/camel-example-rabbitmq/pom.xml index 754766c..35be3d7 100644 --- a/examples/camel-example-rabbitmq/pom.xml +++ b/examples/camel-example-rabbitmq/pom.xml @@ -66,6 +66,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml index 115643b..80d7ab7 100644 --- a/examples/camel-example-rest-producer/pom.xml +++ b/examples/camel-example-rest-producer/pom.xml @@ -66,6 +66,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml index 279d4ff..4be746b 100644 --- a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml +++ b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml @@ -55,11 +55,13 @@ <dependencies> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-spring-boot-health-checks/application/pom.xml b/examples/camel-example-spring-boot-health-checks/application/pom.xml index c21b99e..b8f0b55 100644 --- a/examples/camel-example-spring-boot-health-checks/application/pom.xml +++ b/examples/camel-example-spring-boot-health-checks/application/pom.xml @@ -62,6 +62,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-spring-boot-health-checks/service/pom.xml b/examples/camel-example-spring-boot-health-checks/service/pom.xml index c9b8470..3e866a5 100644 --- a/examples/camel-example-spring-boot-health-checks/service/pom.xml +++ b/examples/camel-example-spring-boot-health-checks/service/pom.xml @@ -53,6 +53,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-spring-boot-master/pom.xml b/examples/camel-example-spring-boot-master/pom.xml index d645707..7c6951b 100644 --- a/examples/camel-example-spring-boot-master/pom.xml +++ b/examples/camel-example-spring-boot-master/pom.xml @@ -64,11 +64,13 @@ <dependencies> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-spring-boot-rest-swagger/pom.xml b/examples/camel-example-spring-boot-rest-swagger/pom.xml index 2a6c0cd..d97db33 100644 --- a/examples/camel-example-spring-boot-rest-swagger/pom.xml +++ b/examples/camel-example-spring-boot-rest-swagger/pom.xml @@ -60,6 +60,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Camel --> diff --git a/examples/camel-example-spring-boot-servicecall/consumer/pom.xml b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml index 7d7e75b..57d647e 100644 --- a/examples/camel-example-spring-boot-servicecall/consumer/pom.xml +++ b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml @@ -65,11 +65,13 @@ <!-- Spring Boot --> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml index f581628..eec30ce 100644 --- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml +++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml @@ -71,6 +71,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-spring-boot-xml/pom.xml b/examples/camel-example-spring-boot-xml/pom.xml index 3f6f7eb..94d6e5c 100644 --- a/examples/camel-example-spring-boot-xml/pom.xml +++ b/examples/camel-example-spring-boot-xml/pom.xml @@ -66,6 +66,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml index 4e2496b..c9f757a 100644 --- a/examples/camel-example-spring-boot/pom.xml +++ b/examples/camel-example-spring-boot/pom.xml @@ -66,6 +66,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml index 73a4e9a..0c36123 100644 --- a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml +++ b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml @@ -73,11 +73,13 @@ <!-- Spring Boot --> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-twitter-salesforce/pom.xml b/examples/camel-example-twitter-salesforce/pom.xml index 3e34bde..06e797c 100644 --- a/examples/camel-example-twitter-salesforce/pom.xml +++ b/examples/camel-example-twitter-salesforce/pom.xml @@ -77,6 +77,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/examples/camel-example-validator-spring-boot/pom.xml b/examples/camel-example-validator-spring-boot/pom.xml index 1ac47c9..8cfd81f 100644 --- a/examples/camel-example-validator-spring-boot/pom.xml +++ b/examples/camel-example-validator-spring-boot/pom.xml @@ -67,6 +67,12 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-tomcat</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId> -- To stop receiving notification emails like this one, please contact davscl...@apache.org.