[camel] branch master updated: CAMEL-15854: camel-allcomponents should also include other components.

[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 254e65b  CAMEL-15854: camel-allcomponents should also include other 
components.
254e65b is described below

commit 254e65b0a73b598023e2491dbcad7b9e8aaf5480
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Dec 7 07:22:09 2020 +0100

    CAMEL-15854: camel-allcomponents should also include other components.
---
 core/camel-componentdsl/pom.xml | 22 +++++++++++++++-------
 core/camel-endpointdsl/pom.xml  | 10 ++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/core/camel-componentdsl/pom.xml b/core/camel-componentdsl/pom.xml
index d4b85e3..b200fe3 100644
--- a/core/camel-componentdsl/pom.xml
+++ b/core/camel-componentdsl/pom.xml
@@ -45,18 +45,26 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-util</artifactId>
+            <artifactId>camel-allcomponents</artifactId>
+            <type>pom</type>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-reactive-executor-vertx</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-threadpoolfactory-vertx</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-allcomponents</artifactId>
-            <type>pom</type>
-            <scope>provided</scope>
-        </dependency>
+
         <!-- testing -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/core/camel-endpointdsl/pom.xml b/core/camel-endpointdsl/pom.xml
index 594fa11..ee0356f 100644
--- a/core/camel-endpointdsl/pom.xml
+++ b/core/camel-endpointdsl/pom.xml
@@ -52,6 +52,16 @@
             <artifactId>camel-allcomponents</artifactId>
             <type>pom</type>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-reactive-executor-vertx</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.camel</groupId>
+                    <artifactId>camel-threadpoolfactory-vertx</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>