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 800ecc832144fb3d20a31465650ebae10827a9a1 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Mar 26 21:19:55 2020 +0100 CAMEL-14794: Upgrade to http client 4.x. --- catalog/camel-catalog-maven/pom.xml | 27 ++++++++++++++++------ .../camel/catalog/maven/MavenVersionManager.java | 4 ---- .../catalog/maven/MavenVersionManagerTest.java | 8 ++----- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/catalog/camel-catalog-maven/pom.xml b/catalog/camel-catalog-maven/pom.xml index 520119a..f616dcc 100644 --- a/catalog/camel-catalog-maven/pom.xml +++ b/catalog/camel-catalog-maven/pom.xml @@ -44,6 +44,26 @@ <version>${project.version}</version> </dependency> + <!-- use http cliet 4.x --> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + + <!-- disable all components --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-allcomponents</artifactId> + <version>${project.version}</version> + <type>pom</type> + <exclusions> + <exclusion> + <groupId>org.apache.camel</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- use groovy grape to download JARs as that is easy to use --> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -56,13 +76,6 @@ <version>${ivy-version}</version> </dependency> - <!-- use http client 3.x for downloading as its better than the JDK client --> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>${httpclient-version}</version> - </dependency> - <!-- testing --> <dependency> <groupId>junit</groupId> diff --git a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java index 77df15e..95880e2 100644 --- a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java +++ b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java @@ -27,7 +27,6 @@ import java.util.Map; import groovy.grape.Grape; import groovy.lang.GroovyClassLoader; import org.apache.camel.catalog.VersionManager; -import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.ivy.util.url.URLHandlerRegistry; /** @@ -199,8 +198,5 @@ public class MavenVersionManager implements VersionManager, Closeable { @Override public void close() throws IOException { - // the http client uses this MultiThreadedHttpConnectionManager for handling http connections - // and we should ensure its shutdown to not leak connections/threads - MultiThreadedHttpConnectionManager.shutdownAll(); } } diff --git a/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java b/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java index 6e8bafe..36f1cc9 100644 --- a/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java +++ b/catalog/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java @@ -38,10 +38,10 @@ public class MavenVersionManagerTest extends Assert { String current = manager.getLoadedVersion(); assertNull(current); - boolean loaded = manager.loadVersion("2.17.1"); + boolean loaded = manager.loadVersion("2.17.2"); assertTrue(loaded); - assertEquals("2.17.1", manager.getLoadedVersion()); + assertEquals("2.17.2", manager.getLoadedVersion()); InputStream is = manager.getResourceAsStream(COMPONENTS_CATALOG); assertNotNull(is); @@ -104,8 +104,6 @@ public class MavenVersionManagerTest extends Assert { assertTrue(names.contains("file")); assertTrue(names.contains("ftp")); assertTrue(names.contains("jms")); - // camel-pax-logging does not work in spring-boot - assertFalse(names.contains("paxlogging")); } @Test @@ -130,8 +128,6 @@ public class MavenVersionManagerTest extends Assert { assertTrue(names.contains("file")); assertTrue(names.contains("ftp")); assertTrue(names.contains("jms")); - // camel-pax-logging does not work in spring-boot - assertFalse(names.contains("paxlogging")); } @Test