This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 95b1f13 Use tomcat in SB examples so its standard SB
95b1f13 is described below
commit 95b1f134955be4c2a39705656aa840cd2e7929fd
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Feb 6 14:14:03 2023 +0100
Use tomcat in SB examples so its standard SB
---
amqp/pom.xml | 17 +++--------------
fhir-auth-tx/pom.xml | 11 -----------
fhir/pom.xml | 11 -----------
jira/pom.xml | 33 ++++++++++-----------------------
kafka-avro/pom.xml | 10 ----------
kafka-offsetrepository/pom.xml | 10 ----------
platform-http/pom.xml | 10 ----------
rest-openapi-springdoc/pom.xml | 10 ----------
rest-openapi/pom.xml | 10 ----------
routetemplate-xml/pom.xml | 10 ----------
routetemplate/pom.xml | 10 ----------
twitter-salesforce/pom.xml | 10 ----------
validator/pom.xml | 10 ----------
widget-gadget/pom.xml | 13 +------------
xml-import/pom.xml | 10 ----------
15 files changed, 14 insertions(+), 171 deletions(-)
diff --git a/amqp/pom.xml b/amqp/pom.xml
index 8ef1364..b6fb567 100644
--- a/amqp/pom.xml
+++ b/amqp/pom.xml
@@ -67,27 +67,16 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
+ <!-- Camel -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-amqp-starter</artifactId>
+ <artifactId>camel-spring-boot-starter</artifactId>
</dependency>
-
- <!-- Camel -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
+ <artifactId>camel-amqp-starter</artifactId>
</dependency>
<!-- test -->
diff --git a/fhir-auth-tx/pom.xml b/fhir-auth-tx/pom.xml
index 8917121..d41f125 100644
--- a/fhir-auth-tx/pom.xml
+++ b/fhir-auth-tx/pom.xml
@@ -66,16 +66,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -87,7 +77,6 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-fhir-starter</artifactId>
diff --git a/fhir/pom.xml b/fhir/pom.xml
index 643e0ee..43cfb58 100644
--- a/fhir/pom.xml
+++ b/fhir/pom.xml
@@ -65,16 +65,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -86,7 +76,6 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-fhir-starter</artifactId>
diff --git a/jira/pom.xml b/jira/pom.xml
index 098157a..a2fdee1 100644
--- a/jira/pom.xml
+++ b/jira/pom.xml
@@ -57,39 +57,26 @@
<dependencies>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-jira-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>26.0-jre</version>
- </dependency>
-
<!-- Spring Boot -->
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
+
+ <!-- Camel -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-jira-starter</artifactId>
+ </dependency>
+
</dependencies>
<repositories>
diff --git a/kafka-avro/pom.xml b/kafka-avro/pom.xml
index 9d54caf..f830713 100644
--- a/kafka-avro/pom.xml
+++ b/kafka-avro/pom.xml
@@ -71,16 +71,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/kafka-offsetrepository/pom.xml b/kafka-offsetrepository/pom.xml
index ac05e98..56ace43 100644
--- a/kafka-offsetrepository/pom.xml
+++ b/kafka-offsetrepository/pom.xml
@@ -65,16 +65,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/platform-http/pom.xml b/platform-http/pom.xml
index a142e58..3e82d26 100644
--- a/platform-http/pom.xml
+++ b/platform-http/pom.xml
@@ -58,16 +58,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<!-- Camel -->
diff --git a/rest-openapi-springdoc/pom.xml b/rest-openapi-springdoc/pom.xml
index 693e26b..797f09c 100644
--- a/rest-openapi-springdoc/pom.xml
+++ b/rest-openapi-springdoc/pom.xml
@@ -58,16 +58,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<!-- Camel -->
diff --git a/rest-openapi/pom.xml b/rest-openapi/pom.xml
index 94f8837..6a0a977 100644
--- a/rest-openapi/pom.xml
+++ b/rest-openapi/pom.xml
@@ -58,16 +58,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<!-- Camel -->
diff --git a/routetemplate-xml/pom.xml b/routetemplate-xml/pom.xml
index 4dea7e7..d4a2e47 100644
--- a/routetemplate-xml/pom.xml
+++ b/routetemplate-xml/pom.xml
@@ -65,16 +65,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/routetemplate/pom.xml b/routetemplate/pom.xml
index cec4ca0..5fb528a 100644
--- a/routetemplate/pom.xml
+++ b/routetemplate/pom.xml
@@ -65,16 +65,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/twitter-salesforce/pom.xml b/twitter-salesforce/pom.xml
index 6865501..9f494c0 100644
--- a/twitter-salesforce/pom.xml
+++ b/twitter-salesforce/pom.xml
@@ -81,16 +81,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/validator/pom.xml b/validator/pom.xml
index 9016da3..c464dc3 100644
--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -66,16 +66,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/widget-gadget/pom.xml b/widget-gadget/pom.xml
index f925da6..d8d23cd 100644
--- a/widget-gadget/pom.xml
+++ b/widget-gadget/pom.xml
@@ -67,24 +67,13 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
+ <!-- Camel -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-amqp-starter</artifactId>
</dependency>
-
- <!-- Camel -->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
diff --git a/xml-import/pom.xml b/xml-import/pom.xml
index 6d1515e..dd0a949 100644
--- a/xml-import/pom.xml
+++ b/xml-import/pom.xml
@@ -66,16 +66,6 @@
<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>
- <artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
