This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 97b08d7 CAMEL-13084 Clean up the camel-example dependencies
97b08d7 is described below
commit 97b08d77d7f313c823e00be01caad7b694b23c3e
Author: Willem Jiang <[email protected]>
AuthorDate: Fri Feb 1 11:08:23 2019 +0800
CAMEL-13084 Clean up the camel-example dependencies
---
examples/camel-example-fhir-auth-tx-spring-boot/pom.xml | 5 -----
examples/camel-example-fhir-spring-boot/pom.xml | 5 -----
examples/camel-example-rabbitmq/pom.xml | 5 -----
examples/camel-example-rest-producer/pom.xml | 5 -----
.../cluster-node/pom.xml | 5 -----
.../application/pom.xml | 5 -----
.../service/pom.xml | 5 -----
examples/camel-example-spring-boot-master/pom.xml | 5 -----
examples/camel-example-spring-boot-rest-swagger/pom.xml | 5 -----
.../camel-example-spring-boot-servicecall/consumer/pom.xml | 5 -----
.../pom.xml | 5 -----
examples/camel-example-spring-boot-xml/pom.xml | 5 -----
examples/camel-example-spring-boot/pom.xml | 5 -----
.../consumer/pom.xml | 5 -----
.../camel-example-spring-cloud-servicecall/service/pom.xml | 5 -----
.../consumer/pom.xml | 5 -----
.../service/pom.xml | 5 -----
examples/camel-example-twitter-salesforce/pom.xml | 5 -----
examples/camel-example-validator-spring-boot/pom.xml | 5 -----
examples/pom.xml | 14 ++++++++++++++
20 files changed, 14 insertions(+), 95 deletions(-)
diff --git a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
index eb95990..4dc9f98 100644
--- a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
@@ -58,11 +58,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-fhir-spring-boot/pom.xml
b/examples/camel-example-fhir-spring-boot/pom.xml
index 5d27f6f..7392138 100644
--- a/examples/camel-example-fhir-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-spring-boot/pom.xml
@@ -58,11 +58,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-rabbitmq/pom.xml
b/examples/camel-example-rabbitmq/pom.xml
index 7d7c8e7..9990146 100644
--- a/examples/camel-example-rabbitmq/pom.xml
+++ b/examples/camel-example-rabbitmq/pom.xml
@@ -58,11 +58,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-rest-producer/pom.xml
b/examples/camel-example-rest-producer/pom.xml
index ea0f08f..dc10f54 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -58,11 +58,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
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 870b0c0..c8a5ef7 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
@@ -51,11 +51,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
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 ad17bb6..8eaceb3 100644
--- a/examples/camel-example-spring-boot-health-checks/application/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/application/pom.xml
@@ -55,11 +55,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
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 8979790..62c0ad4 100644
--- a/examples/camel-example-spring-boot-health-checks/service/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/service/pom.xml
@@ -47,11 +47,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-spring-boot-master/pom.xml
b/examples/camel-example-spring-boot-master/pom.xml
index 48b0053..ab94019 100644
--- a/examples/camel-example-spring-boot-master/pom.xml
+++ b/examples/camel-example-spring-boot-master/pom.xml
@@ -59,11 +59,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-spring-boot-rest-swagger/pom.xml
b/examples/camel-example-spring-boot-rest-swagger/pom.xml
index 1aa9d56..ca92bfe 100644
--- a/examples/camel-example-spring-boot-rest-swagger/pom.xml
+++ b/examples/camel-example-spring-boot-rest-swagger/pom.xml
@@ -53,11 +53,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
index 93cc65c..f24f3af 100644
--- a/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
+++ b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
@@ -59,11 +59,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
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 974a22a..2c7f0b7 100644
--- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
@@ -58,11 +58,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-spring-boot-xml/pom.xml
b/examples/camel-example-spring-boot-xml/pom.xml
index 021924c..3a3e274 100644
--- a/examples/camel-example-spring-boot-xml/pom.xml
+++ b/examples/camel-example-spring-boot-xml/pom.xml
@@ -59,11 +59,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-spring-boot/pom.xml
b/examples/camel-example-spring-boot/pom.xml
index 5dc0ec2..1a0f227 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -58,11 +58,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
index d4cfe79..812a87c 100644
--- a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
@@ -66,11 +66,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-spring-cloud-servicecall/service/pom.xml
b/examples/camel-example-spring-cloud-servicecall/service/pom.xml
index dd36cb2..9082585 100644
--- a/examples/camel-example-spring-cloud-servicecall/service/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/service/pom.xml
@@ -59,11 +59,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git
a/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
b/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
index c34b336..43c75a2 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
@@ -66,11 +66,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git
a/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
b/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
index 42b56d4..2eb053c 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
@@ -66,11 +66,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-twitter-salesforce/pom.xml
b/examples/camel-example-twitter-salesforce/pom.xml
index f688ae9..a9a2c24 100644
--- a/examples/camel-example-twitter-salesforce/pom.xml
+++ b/examples/camel-example-twitter-salesforce/pom.xml
@@ -55,11 +55,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-validator-spring-boot/pom.xml
b/examples/camel-example-validator-spring-boot/pom.xml
index 84ffc95..8a76088 100644
--- a/examples/camel-example-validator-spring-boot/pom.xml
+++ b/examples/camel-example-validator-spring-boot/pom.xml
@@ -59,11 +59,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/pom.xml b/examples/pom.xml
index 75aa338..429700f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -150,6 +150,20 @@
<camel.osgi.export.pkg/>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <!--
+ CAMEL-13084 Fix the spring-boot examples start up error by overriding
servlet API version from camel-parent
+ Wqe need to clean it up once camel-parent upgrade the servlet api
version.
+ -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet.api.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<resources>
<resource>
