You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/02/17 09:39:45 UTC
git commit: CAMEL-6978 War examples should not include lib/servlet
JARs
Repository: camel
Updated Branches:
refs/heads/master 7b1dba9a4 -> a31868abb
CAMEL-6978 War examples should not include lib/servlet JARs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a31868ab
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a31868ab
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a31868ab
Branch: refs/heads/master
Commit: a31868abbb87209e0bdefe9046141f422008c736
Parents: 7b1dba9
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Feb 17 16:39:21 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Feb 17 16:39:21 2014 +0800
----------------------------------------------------------------------
components/camel-servlet/pom.xml | 6 ++++++
examples/camel-example-reportincident/pom.xml | 18 ++++++++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a31868ab/components/camel-servlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 8e95f12..7d6e8c1 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -47,6 +47,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/a31868ab/examples/camel-example-reportincident/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index 1bf946c..02dc427 100755
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -63,6 +63,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- mock mail server so we do not send an email for real -->
<dependency>
@@ -85,12 +91,12 @@
<version>${cxf-version}</version>
</dependency>
- <!-- regular http transport -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf-version}</version>
- </dependency>
+ <!-- regular http transport -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
<!-- logging -->
<dependency>