You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/07/29 15:33:10 UTC
[1/2] camel git commit: CAMEL-8803: camel-jetty9 should not include
duplicate servlet api spec JARs
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x a9c704b5e -> 0689e4c66
refs/heads/master 7acd97f57 -> 182034424
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/18203442
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/18203442
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/18203442
Branch: refs/heads/master
Commit: 182034424f7a81e92e2614d507aef99d6a1677db
Parents: 7acd97f
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 29 15:23:14 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 29 15:23:14 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/18203442/components/camel-jetty9/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 426b8e5..2175d3d 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -48,14 +48,24 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-http-common</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>
@@ -63,10 +73,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>
[2/2] camel git commit: CAMEL-8803: camel-jetty9 should not include
duplicate servlet api spec JARs
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Wed Jul 29 15:32:44 2015 +0200
Committer: Claus Ibsen <da...@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>