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/16 21:47:30 UTC
[05/12] 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/b1d38d5d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b1d38d5d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b1d38d5d
Branch: refs/heads/master
Commit: b1d38d5d800d216dd822218c216d423cc24af481
Parents: 35c2a64
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 16 20:05:42 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100
----------------------------------------------------------------------
components/camel-cometd/pom.xml | 2 +-
components/camel-cxf/pom.xml | 99 +++++++++++++-------
components/camel-jetty9/pom.xml | 5 +
.../jetty/JettyHttpContentTypeTest.java | 2 +-
parent/pom.xml | 36 +------
5 files changed, 75 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-cometd/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 35ff182..583f2ec 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -33,7 +33,7 @@
<camel.osgi.export.pkg>org.apache.camel.component.cometd.*</camel.osgi.export.pkg>
<camel.osgi.import.pkg>
!org.apache.camel.component.cometd.*,
- org.eclipse.jetty.util.ssl;version="[9,9.5)";resolution:=optional,
+ org.eclipse.jetty.util.ssl;version="[9.2,10)";resolution:=optional,
${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 5cd9cc4..88ef884 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -113,9 +114,9 @@
<version>${cxf-version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-oauth</artifactId>
- <version>${cxf-version}</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-oauth</artifactId>
+ <version>${cxf-version}</version>
</dependency>
<dependency>
@@ -161,12 +162,12 @@
<artifactId>camel-core-xml</artifactId>
<scope>test</scope>
</dependency>
-
+
<!-- Try to test convert PayLoad into POJO -->
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jaxb</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jaxb</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -184,25 +185,25 @@
<!-- test for the cxf jms transport -->
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <scope>test</scope>
</dependency>
-
+
<!-- test for cxf failover feature -->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-features-clustering</artifactId>
- <version>${cxf-version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-features-clustering</artifactId>
+ <version>${cxf-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-kahadb-store</artifactId>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
@@ -215,8 +216,40 @@
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf-version}</version>
<scope>test</scope>
+ <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>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf-version}</version>
@@ -233,13 +266,13 @@
<artifactId>httpclient</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -262,7 +295,7 @@
<version>${cxf-version}</version>
<scope>test</scope>
</dependency>
-
+
<!-- this dependency is just for testing -->
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -270,7 +303,7 @@
<version>${cxf-version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
@@ -307,7 +340,7 @@
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>${cxf-version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
@@ -334,7 +367,7 @@
<configuration>
<childDelegation>false</childDelegation>
<forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
+ <reuseForks>true</reuseForks>
<forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
<reportFormat>brief</reportFormat>
<useFile>false</useFile>
@@ -381,7 +414,7 @@
<configuration>
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<defaultOptions>
- <frontEnd>jaxws21</frontEnd>
+ <frontEnd>jaxws21</frontEnd>
</defaultOptions>
<wsdlOptions>
<wsdlOption>
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-jetty9/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 7ccba3e..b040bc9 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -83,6 +83,11 @@
<artifactId>jetty-jmx</artifactId>
<version>${jetty9-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty9-version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java
index 45fe7e5..2c0b982 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpContentTypeTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
public class JettyHttpContentTypeTest extends BaseJettyTest {
- private static final String CHARSET = "ISO-8859-1";
+ private static final String CHARSET = "iso-8859-1";
@Test
public void testContentType() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/b1d38d5d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4182c70..b50a049 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -325,7 +325,7 @@
<jedis-client-bundle-version>2.8.1_1</jedis-client-bundle-version>
<jersey-version>2.11</jersey-version>
<jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
- <jetty9-version>9.2.19.v20160908</jetty9-version>
+ <jetty9-version>9.3.14.v20161028</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
@@ -677,7 +677,7 @@
org.apache.commons.httpclient.*;version="[3.1,4.0)",
org.apache.velocity.*;version="[1.6.2,2)",
org.apache.xmlbeans.*;version="[2.4,3)",
- org.eclipse.jetty.*;version="[8.0,10)",
+ org.eclipse.jetty.*;version="[9.2,10)",
com.thoughtworks.xstream.*;version="[1.4.7,2)",
org.antlr.stringtemplate.*;version="[3.0,4)",
org.ccil.cowan.tagsoup.*;version="[1.2,2)",
@@ -4955,38 +4955,6 @@
</profile>
<profile>
- <id>jetty9</id>
- <properties>
- <jetty-version>${jetty9-version}</jetty-version>
- <jetty-plugin-version>${jetty9-version}</jetty-plugin-version>
- <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
- </properties>
- </profile>
-
- <profile>
- <id>jdk1.7</id>
- <activation>
- <jdk>1.7</jdk>
- </activation>
-
- <!-- Update JAXB version here -->
- <properties>
- <jaxb-version>2.2.11</jaxb-version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>jdk1.8</id>
<activation>
<jdk>1.8</jdk>