Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/72ed9cfe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/72ed9cfe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/72ed9cfe Branch: refs/heads/master Commit: 72ed9cfe5386b6998f665a05774b9eab64c4770d Parents: e64aee4 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Feb 15 09:57:36 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Feb 15 09:57:36 2016 +0100 ---------------------------------------------------------------------- tests/camel-itest/pom.xml | 17 +++++++++++++++++ .../itest/http/HttpRouteContentLengthTest.java | 4 ---- 2 files changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/72ed9cfe/tests/camel-itest/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml index bc2efee..b5f45c4 100644 --- a/tests/camel-itest/pom.xml +++ b/tests/camel-itest/pom.xml @@ -328,6 +328,23 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> </exclusion> + <!-- we use the version from camel-jetty9 --> + <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-http</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/72ed9cfe/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java index f5dc5ca..def1efb 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java @@ -49,15 +49,11 @@ public class HttpRouteContentLengthTest extends CamelTestSupport { assertNotNull(out); assertEquals("Bye Camel request.: 14", out.getOut().getBody(String.class)); - - - } protected String getHttpEndpointScheme() { return "http4://localhost:"; } - @Override protected RouteBuilder createRouteBuilder() throws Exception {