Upgrade Jetty
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b9f16531 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b9f16531 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b9f16531 Branch: refs/heads/master Commit: b9f1653151e28a7bf803ce7c70cbdd5f0b193dc0 Parents: 6556320 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Sep 25 14:26:37 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Sep 25 15:22:01 2017 +0200 ---------------------------------------------------------------------- .../jettyproducer/JettyHttpProducerSendEmptyHeaderTest.java | 2 +- parent/pom.xml | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b9f16531/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendEmptyHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendEmptyHeaderTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendEmptyHeaderTest.java index 6bc0e17..a7db5c1 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendEmptyHeaderTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendEmptyHeaderTest.java @@ -30,7 +30,7 @@ public class JettyHttpProducerSendEmptyHeaderTest extends BaseJettyTest { public void testHttpProducerSendEmptyHeader() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - String expectedValue = isJetty8() ? "" : null; + String expectedValue = ""; mock.expectedHeaderReceived("foo", expectedValue); template.sendBodyAndHeader("jetty:http://localhost:{{port}}/myapp/mytest";, "Hello World", "foo", ""); http://git-wip-us.apache.org/repos/asf/camel/blob/b9f16531/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 4bf507e..ae992c6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -69,7 +69,7 @@ <asterisk-java-version>1.0.0-final</asterisk-java-version> <asterisk-java-bundle-version>1.0.0-final_1</asterisk-java-bundle-version> <atmos-client-version>2.2.2</atmos-client-version> - <atmosphere-version>2.4.10</atmosphere-version> + <atmosphere-version>2.4.14</atmosphere-version> <atmosphere-version-range>[2.4,3.0)</atmosphere-version-range> <atomix-version>1.0.8</atomix-version> <atomix-catalyst-version>1.2.1</atomix-catalyst-version> @@ -370,10 +370,8 @@ <jedis-client-bundle-version>2.9.0_1</jedis-client-bundle-version> <jersey-version>2.11</jersey-version> <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version> - <jetty92-version>9.2.21.v20170120</jetty92-version> - <!-- Jetty version 9.3.15+ contains binary incopatible API changes that break --> - <!-- CXF's websocket support (< 3.1.11) and camel-atmosphere-websocket --> - <jetty9-version>9.3.14.v20161028</jetty9-version> + <jetty92-version>9.2.22.v20170606</jetty92-version> + <jetty9-version>9.3.21.v20170918</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>
