You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/30 09:59:37 UTC

[camel] branch master updated (d8163d2 -> ad77a5a)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from d8163d2  CAMEL-14805: Fixed tests
     new 1fb8bd8  CAMEL-14715 - Removed ref to camel-karaf-commands (camel-karaf migration)
     new ad77a5a  CAMEL-14715 - Removed ref to camel-catalog-provider-karaf (camel-karaf migration)

The 2 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:
 apache-camel/pom.xml                             |  8 --------
 apache-camel/src/main/descriptors/common-bin.xml |  2 --
 bom/camel-bom/pom.xml                            |  5 -----
 parent/pom.xml                                   | 12 ------------
 4 files changed, 27 deletions(-)


[camel] 01/02: CAMEL-14715 - Removed ref to camel-karaf-commands (camel-karaf migration)

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 1fb8bd8630b415981b1ede1d2c186f1de0ac4a54
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 30 11:42:45 2020 +0200

    CAMEL-14715 - Removed ref to camel-karaf-commands (camel-karaf migration)
---
 apache-camel/pom.xml                             | 4 ----
 apache-camel/src/main/descriptors/common-bin.xml | 1 -
 parent/pom.xml                                   | 7 -------
 3 files changed, 12 deletions(-)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 78709d7..f76d8f0 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -154,10 +154,6 @@
             <artifactId>camel-catalog-provider-karaf</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel.karaf</groupId>
-            <artifactId>camel-karaf-commands</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-route-parser</artifactId>
         </dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 13bb23f..3dfeb6a 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -413,7 +413,6 @@
         <include>org.apache.camel:camel-catalog-lucene</include>
         <include>org.apache.camel:camel-catalog-maven</include>
         <include>org.apache.camel:camel-catalog-provider-karaf</include>
-        <include>org.apache.camel.karaf:camel-karaf-commands</include>
         <include>org.apache.camel:camel-route-parser</include>
       </includes>
     </dependencySet>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6bc764c..3f975a7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2652,13 +2652,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- camel commands -->
-            <dependency>
-                <groupId>org.apache.camel.karaf</groupId>
-                <artifactId>camel-karaf-commands</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <!-- camel misc -->
             <dependency>
                 <groupId>org.apache.camel</groupId>


[camel] 02/02: CAMEL-14715 - Removed ref to camel-catalog-provider-karaf (camel-karaf migration)

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ad77a5a43e436b9e7ce74d45d93de6b26237a9d6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 30 11:48:23 2020 +0200

    CAMEL-14715 - Removed ref to camel-catalog-provider-karaf (camel-karaf migration)
---
 apache-camel/pom.xml                             | 4 ----
 apache-camel/src/main/descriptors/common-bin.xml | 1 -
 bom/camel-bom/pom.xml                            | 5 -----
 parent/pom.xml                                   | 5 -----
 4 files changed, 15 deletions(-)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index f76d8f0..b6d4c09 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -151,10 +151,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-catalog-provider-karaf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
             <artifactId>camel-route-parser</artifactId>
         </dependency>
 
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 3dfeb6a..cf10a59 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -412,7 +412,6 @@
         <include>org.apache.camel:camel-catalog</include>
         <include>org.apache.camel:camel-catalog-lucene</include>
         <include>org.apache.camel:camel-catalog-maven</include>
-        <include>org.apache.camel:camel-catalog-provider-karaf</include>
         <include>org.apache.camel:camel-route-parser</include>
       </includes>
     </dependencySet>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 3e3896f..86dc1af 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -408,11 +408,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-catalog-provider-karaf</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-cbor</artifactId>
         <version>${project.version}</version>
       </dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 3f975a7..9353861 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2633,11 +2633,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
-                <artifactId>camel-catalog-provider-karaf</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.camel</groupId>
                 <artifactId>camel-catalog-lucene</artifactId>
                 <version>${project.version}</version>
             </dependency>