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 2020/03/27 05:26:44 UTC
[camel] branch master updated (e09b1c6 -> bc0ef5f)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from e09b1c6 [CAMEL-14786] Fix camel-spring
new 800ecc8 CAMEL-14794: Upgrade to http client 4.x.
new b60903b CAMEL-14796: Remove big depedecy tree for mvn in camel catalog JARs
new bc0ef5f Regen
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
catalog/camel-catalog-lucene/pom.xml | 14 +++++++++++
catalog/camel-catalog-maven/pom.xml | 27 ++++++++++++++++------
.../camel/catalog/maven/MavenVersionManager.java | 4 ----
.../catalog/maven/MavenVersionManagerTest.java | 8 ++-----
catalog/camel-catalog/pom.xml | 14 +++++++++++
catalog/camel-main-maven-plugin/pom.xml | 14 +++++++++++
catalog/camel-report-maven-plugin/pom.xml | 14 +++++++++++
catalog/camel-route-parser/pom.xml | 14 +++++++++++
catalog/dummy-component/pom.xml | 14 +++++++++++
docs/components/modules/ROOT/pages/index.adoc | 4 +---
10 files changed, 107 insertions(+), 20 deletions(-)
[camel] 03/03: Regen
Posted by da...@apache.org.
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 bc0ef5f86d6da9d69eb2074c852c1bf68811ee43
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 26 21:24:59 2020 +0100
Regen
---
docs/components/modules/ROOT/pages/index.adoc | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index 179eff4..75e89b6 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -11,7 +11,7 @@ Below is the list of components that are provided by Apache Camel.
== List of Components
// components: START
-Number of Components: 331 in 264 JAR artifacts (1 deprecated)
+Number of Components: 330 in 263 JAR artifacts (1 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -223,8 +223,6 @@ Number of Components: 331 in 264 JAR artifacts (1 deprecated)
| xref:elsql-component.adoc[ElSQL] (camel-elsql) | 2.16 | The elsql component is an extension to the existing SQL Component that uses ElSql to define the SQL queries.
-| xref:elytron-component.adoc[Elytron] (camel-elytron) | 3.1 | The elytron component is allows you to work with the Elytron Security Framework
-
| xref:etcd-keys-component.adoc[Etcd Keys] (camel-etcd) | 2.18 | Camel Etcd support
| xref:etcd-stats-component.adoc[Etcd Stats] (camel-etcd) | 2.18 | The camel etcd component allows you to work with Etcd, a distributed reliable key-value store.
[camel] 02/03: CAMEL-14796: Remove big depedecy tree for mvn in
camel catalog JARs
Posted by da...@apache.org.
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 b60903bbf647c87af386d7a9fce132f6865da38d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 26 21:22:52 2020 +0100
CAMEL-14796: Remove big depedecy tree for mvn in camel catalog JARs
---
catalog/camel-catalog-lucene/pom.xml | 14 ++++++++++++++
catalog/camel-catalog/pom.xml | 14 ++++++++++++++
catalog/camel-main-maven-plugin/pom.xml | 14 ++++++++++++++
catalog/camel-report-maven-plugin/pom.xml | 14 ++++++++++++++
catalog/camel-route-parser/pom.xml | 14 ++++++++++++++
catalog/dummy-component/pom.xml | 14 ++++++++++++++
6 files changed, 84 insertions(+)
diff --git a/catalog/camel-catalog-lucene/pom.xml b/catalog/camel-catalog-lucene/pom.xml
index 11e9c09..7980630 100644
--- a/catalog/camel-catalog-lucene/pom.xml
+++ b/catalog/camel-catalog-lucene/pom.xml
@@ -54,6 +54,20 @@
<version>${lucene-version}</version>
</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>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index 3271df0..2b6ce42 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -56,6 +56,20 @@
<version>${project.version}</version>
</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>
+
<!-- testing -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/catalog/camel-main-maven-plugin/pom.xml b/catalog/camel-main-maven-plugin/pom.xml
index 0f82f82..7272727 100644
--- a/catalog/camel-main-maven-plugin/pom.xml
+++ b/catalog/camel-main-maven-plugin/pom.xml
@@ -129,6 +129,20 @@
<version>${roaster-version}</version>
</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>
+
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/catalog/camel-report-maven-plugin/pom.xml b/catalog/camel-report-maven-plugin/pom.xml
index 37a9e25..2813026 100644
--- a/catalog/camel-report-maven-plugin/pom.xml
+++ b/catalog/camel-report-maven-plugin/pom.xml
@@ -97,6 +97,20 @@
<version>${project.version}</version>
</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>
+
<!-- camel route parser -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/catalog/camel-route-parser/pom.xml b/catalog/camel-route-parser/pom.xml
index 369cbf5..3ad956d 100644
--- a/catalog/camel-route-parser/pom.xml
+++ b/catalog/camel-route-parser/pom.xml
@@ -53,6 +53,20 @@
<artifactId>camel-tooling-util</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>
+
<!-- only test scopes for camel as we have no runtime dependency on camel -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/catalog/dummy-component/pom.xml b/catalog/dummy-component/pom.xml
index dfaaa43..f60226d 100644
--- a/catalog/dummy-component/pom.xml
+++ b/catalog/dummy-component/pom.xml
@@ -41,6 +41,20 @@
<version>${project.version}</version>
</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>
+
</dependencies>
<build>
[camel] 01/03: CAMEL-14794: Upgrade to http client 4.x.
Posted by da...@apache.org.
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 <cl...@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