You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by on...@apache.org on 2017/07/22 16:57:44 UTC
camel git commit: CAMEL-11531-set servlet as provided and backport to
2.19.x branch
Repository: camel
Updated Branches:
refs/heads/camel-2.19.x 70cb089f7 -> 65baf940a
CAMEL-11531-set servlet as provided and backport to 2.19.x branch
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/65baf940
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/65baf940
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/65baf940
Branch: refs/heads/camel-2.19.x
Commit: 65baf940ae473aa46cb96e1c00cf3679616f5ece
Parents: 70cb089
Author: onders86 <on...@gmail.com>
Authored: Sat Jul 22 19:57:05 2017 +0300
Committer: onders86 <on...@gmail.com>
Committed: Sat Jul 22 19:57:05 2017 +0300
----------------------------------------------------------------------
components/camel-http-common/pom.xml | 1 +
.../components-starter/camel-servlet-starter/pom.xml | 11 +++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/65baf940/components/camel-http-common/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index 083603b..a46d951 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -46,6 +46,7 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api-version}</version>
+ <scope>provided</scope>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/65baf940/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml
index 9ae8c52..8736391 100644
--- a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml
@@ -36,6 +36,17 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- Test dependencies -->
<dependency>