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 2016/12/18 12:31:41 UTC
[2/2] camel git commit: CAMEL-9945: Upgrade to Jetty 9.3
CAMEL-9945: Upgrade to Jetty 9.3
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ede81022
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ede81022
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ede81022
Branch: refs/heads/master
Commit: ede810223d9fca38caaf8e8d0c13231efea85356
Parents: 57e4210
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Dec 18 13:31:34 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Dec 18 13:31:34 2016 +0100
----------------------------------------------------------------------
examples/camel-example-cxf/pom.xml | 39 ++++++++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ede81022/examples/camel-example-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml
index acb4aab..f1413f3 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -30,6 +30,10 @@
<name>Camel :: Example :: CXF</name>
<description>An example which demonstrates the use of the Camel CXF component</description>
+ <properties>
+ <jetty9-version>${jetty92-version}</jetty9-version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -52,14 +56,39 @@
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jetty9</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jetty9</artifactId>
</dependency>
<dependency>