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 2017/11/04 09:05:03 UTC
[camel] 02/02: CAMEL-11836: Upgrade to Jetty 9.4.x
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2c482aff7310e60ade2e5d4c08c07ce0697ffa9a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Nov 4 09:53:48 2017 +0100
CAMEL-11836: Upgrade to Jetty 9.4.x
---
.../JettyHttpProducerSendEmptyHeaderTest.java | 53 ----------------------
parent/pom.xml | 3 +-
platforms/spring-boot/spring-boot-dm/pom.xml | 3 +-
3 files changed, 4 insertions(+), 55 deletions(-)
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
deleted file mode 100644
index a7db5c1..0000000
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendEmptyHeaderTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jetty.jettyproducer;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jetty.BaseJettyTest;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-/**
- *
- */
-public class JettyHttpProducerSendEmptyHeaderTest extends BaseJettyTest {
-
- @Test
- public void testHttpProducerSendEmptyHeader() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(1);
- String expectedValue = "";
- mock.expectedHeaderReceived("foo", expectedValue);
-
- template.sendBodyAndHeader("jetty:http://localhost:{{port}}/myapp/mytest", "Hello World", "foo", "");
-
- assertMockEndpointsSatisfied();
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- allowNullHeaders();
- from("jetty:http://localhost:{{port}}/myapp/mytest")
- .convertBodyTo(String.class)
- .to("mock:result");
- }
- };
- }
-}
diff --git a/parent/pom.xml b/parent/pom.xml
index 34c79df..5033718 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -376,7 +376,8 @@
<jersey-version>2.11</jersey-version>
<jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
<jetty92-version>9.2.22.v20170606</jetty92-version>
- <jetty9-version>9.4.7.v20170914</jetty9-version>
+ <!-- Jetty 9.4.7 is buggy, do not use -->
+ <jetty9-version>9.4.6.v20170531</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>
diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml
index 8394bfa..dbd973c 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -67,7 +67,8 @@
<!-- The following versions should be aligned with the ones in spring-boot-repo/spring-boot-dependencies/pom.xml (for the targeted version of spring-boot) -->
<!-- for example: https://github.com/spring-projects/spring-boot/blob/v1.5.8.RELEASE/spring-boot-dependencies/pom.xml -->
<jackson2-version>2.8.10</jackson2-version>
- <jetty9-version>9.4.7.v20170914</jetty9-version>
+ <!-- jetty 9.4.7 is buggy -->
+ <jetty9-version>9.4.6.v20170531</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jna-version>4.2.2</jna-version>
<hazelcast-version>3.7.8</hazelcast-version>
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.