camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: CAMEL-8803: camel-jetty9 should not include duplicate servlet api spec JARs
Date Wed, 29 Jul 2015 13:33:11 GMT
CAMEL-8803: camel-jetty9 should not include duplicate servlet api spec JARs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0689e4c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0689e4c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0689e4c6

Branch: refs/heads/camel-2.15.x
Commit: 0689e4c663e246209f081504351a6957ba1a9d43
Parents: a9c704b
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Jul 29 15:32:44 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Jul 29 15:32:44 2015 +0200

----------------------------------------------------------------------
 components/camel-jetty9/pom.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0689e4c6/components/camel-jetty9/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index a0a4a95..047f04a 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -47,14 +47,24 @@
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-http</artifactId>
+            <exclusions>
+                <!-- must use the servlet-api that jetty 9 provides which is 3.1 -->
+               <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_3.0_spec</artifactId>
+               </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-jetty-common</artifactId> 
-        </dependency>
-        <dependency>        
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <exclusions>
+                <!-- must use the servlet-api that jetty 9 provides which is 3.1 -->
+               <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_3.0_spec</artifactId>
+               </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -62,10 +72,6 @@
             <version>${jetty9-version}</version>
             <exclusions>
                <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-               <exclusion>
                    <groupId>org.eclipse.jetty.orbit</groupId>
                    <artifactId>javax.servlet</artifactId>
                </exclusion>


Mime
View raw message