This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 13277e4 CAMEL-13084 Clean up the camel-example dependencies
13277e4 is described below
commit 13277e44c5066d996d74519cbb53d55e20ad4458
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Fri Feb 1 11:08:23 2019 +0800
CAMEL-13084 Clean up the camel-example dependencies
---
examples/camel-example-rest-producer/pom.xml | 5 -----
examples/camel-example-spring-boot/pom.xml | 5 -----
examples/pom.xml | 25 ++++++++++++++++++++-----
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/examples/camel-example-rest-producer/pom.xml
b/examples/camel-example-rest-producer/pom.xml
index 5621d21..39f2ae4 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>4.0.1</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/camel-example-spring-boot/pom.xml
b/examples/camel-example-spring-boot/pom.xml
index 9cb269b..c7f633b 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>4.0.1</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/examples/pom.xml b/examples/pom.xml
index 03c0e8a..80c55be 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -80,7 +80,7 @@
<module>camel-example-loan-broker-cxf</module>
<module>camel-example-loan-broker-jms</module>
<module>camel-example-management</module>
- <module>camel-example-micrometer</module>
+ <module>camel-example-micrometer</module>
<module>camel-example-mybatis</module>
<module>camel-example-netty-custom-correlation</module>
<module>camel-example-netty-http</module>
@@ -151,9 +151,24 @@
<!-- as having org.apache.camel as prefix is not needed and makes the name
very long -->
<camel.osgi.symbolic.name>${project.artifactId}</camel.osgi.symbolic.name>
<skip.starting.camel.context>false</skip.starting.camel.context>
- <camel.osgi.export.pkg/>
+ <javax.servlet.api.version>4.0.1</javax.servlet.api.version>
+ <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>
@@ -260,9 +275,9 @@
<skip.starting.camel.context>true</skip.starting.camel.context>
</properties>
</profile>
- <!--
- This profile allows you to add a repository to the repo list so that
- you can test the examples out against a staged version of the camel
distribution
+ <!--
+ This profile allows you to add a repository to the repo list so that
+ you can test the examples out against a staged version of the camel
distribution
-->
<profile>
<id>add-remote-repo</id>
