[camel] branch master updated: CAMEL-14640: Upgrade to http client 4.x for testing.

[davsclaus]

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


The following commit(s) were added to refs/heads/master by this push:
     new 4692b25  CAMEL-14640: Upgrade to http client 4.x for testing.
4692b25 is described below

commit 4692b2556c8fe4504b5a1f00b508804181e5835d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Mar 26 11:21:51 2020 +0100

    CAMEL-14640: Upgrade to http client 4.x for testing.
---
 tests/camel-itest/pom.xml                                            | 5 -----
 .../org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java   | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 91b7f7e..86f3488 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -229,11 +229,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-spring</artifactId>
             <scope>test</scope>
diff --git 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
index 2df0051..11163bc 100644
--- 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
+++ 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
@@ -25,7 +25,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.jaxb.FallbackTypeConverter;
 import org.apache.camel.itest.jaxb.example.Bar;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.httpclient.methods.RequestEntity;
 import org.junit.Test;
 
 public class JaxbFallbackTypeConverterTest extends CamelTestSupport {
@@ -55,8 +54,6 @@ public class JaxbFallbackTypeConverterTest extends 
CamelTestSupport {
                     @Override
                     public void process(Exchange exchange) throws Exception {
                         Message in = exchange.getIn();
-                        RequestEntity entity = in.getBody(RequestEntity.class);
-                        assertNull("We should not get the entity here", 
entity);
                         InputStream is = 
in.getMandatoryBody(InputStream.class);
                         // make sure we can get the InputStream rightly.
                         exchange.getOut().setBody(is);