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 b42e54295e1a437eb07a04bd9d0f68b643ffc2c2 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 | 12 ++++-------- examples/camel-example-twitter-salesforce/pom.xml | 6 ++++++ examples/camel-example-validator-spring-boot/pom.xml | 6 ++++++ 15 files changed, 88 insertions(+), 20 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 88be571..2f23a1a 100644 --- a/examples/camel-example-rabbitmq/pom.xml +++ b/examples/camel-example-rabbitmq/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> diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml index bf78554..4cc744e 100644 --- a/examples/camel-example-rest-producer/pom.xml +++ b/examples/camel-example-rest-producer/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> 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 16bccf0..fa049b9 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 @@ -57,11 +57,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 8d8fa5e..316686d 100644 --- a/examples/camel-example-spring-boot-health-checks/application/pom.xml +++ b/examples/camel-example-spring-boot-health-checks/application/pom.xml @@ -63,6 +63,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 650b827..1532cc4 100644 --- a/examples/camel-example-spring-boot-health-checks/service/pom.xml +++ b/examples/camel-example-spring-boot-health-checks/service/pom.xml @@ -54,6 +54,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 2b4057b..8973f26 100644 --- a/examples/camel-example-spring-boot-master/pom.xml +++ b/examples/camel-example-spring-boot-master/pom.xml @@ -65,11 +65,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 cb1d77e..f2aa9f4 100644 --- a/examples/camel-example-spring-boot-rest-swagger/pom.xml +++ b/examples/camel-example-spring-boot-rest-swagger/pom.xml @@ -61,6 +61,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-servicecall/consumer/pom.xml b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml index f0e05fe..041519d 100644 --- a/examples/camel-example-spring-boot-servicecall/consumer/pom.xml +++ b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml @@ -67,11 +67,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 195c4a0..11b7ec9 100644 --- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml +++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml @@ -72,6 +72,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 82cf717..488571f 100644 --- a/examples/camel-example-spring-boot-xml/pom.xml +++ b/examples/camel-example-spring-boot-xml/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> diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml index d771ba3..8263894 100644 --- a/examples/camel-example-spring-boot/pom.xml +++ b/examples/camel-example-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> diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml index 4e32d50..a2b3514 100644 --- a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml +++ b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml @@ -75,14 +75,6 @@ <!-- Spring Boot --> <dependency> <groupId>org.springframework.boot</groupId> - <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> <exclusions> <exclusion> @@ -92,6 +84,10 @@ </exclusions> </dependency> <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-undertow</artifactId> + </dependency> + <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-consul-discovery</artifactId> </dependency> diff --git a/examples/camel-example-twitter-salesforce/pom.xml b/examples/camel-example-twitter-salesforce/pom.xml index 9bf1538..5a601a9 100644 --- a/examples/camel-example-twitter-salesforce/pom.xml +++ b/examples/camel-example-twitter-salesforce/pom.xml @@ -78,6 +78,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 9b0b4b8..cd71244 100644 --- a/examples/camel-example-validator-spring-boot/pom.xml +++ b/examples/camel-example-validator-spring-boot/pom.xml @@ -68,6 +68,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.