Repository: camel
Updated Branches:
  refs/heads/master 77f203dfd -> a1b9a5348


CAMEL-10971: Deprecate catalog-commands and remove from karaf feature


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1b9a534
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1b9a534
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1b9a534

Branch: refs/heads/master
Commit: a1b9a534869220fe4c7937a9766229dc0f59e95f
Parents: 77f203d
Author: Claus Ibsen <davscl...@apache.org>
Authored: Wed Mar 8 19:26:31 2017 +0100
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Wed Mar 8 19:29:12 2017 +0100

----------------------------------------------------------------------
 platforms/commands/commands-jolokia/pom.xml              | 2 +-
 platforms/karaf/commands-catalog/pom.xml                 | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a1b9a534/platforms/commands/commands-jolokia/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-jolokia/pom.xml 
b/platforms/commands/commands-jolokia/pom.xml
index 9b22610..73a475b 100644
--- a/platforms/commands/commands-jolokia/pom.xml
+++ b/platforms/commands/commands-jolokia/pom.xml
@@ -27,7 +27,7 @@
 
   <artifactId>camel-commands-jolokia</artifactId>
   <packaging>jar</packaging>
-  <name>Camel :: Platforms :: Commands :: Jolokia</name>
+  <name>Camel :: Platforms :: Commands :: Jolokia (deprecated)</name>
   <description>Camel Commands using Jolokia</description>
 
   <properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/a1b9a534/platforms/karaf/commands-catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/pom.xml 
b/platforms/karaf/commands-catalog/pom.xml
index cc98eab..9c82432 100644
--- a/platforms/karaf/commands-catalog/pom.xml
+++ b/platforms/karaf/commands-catalog/pom.xml
@@ -28,7 +28,7 @@
   <groupId>org.apache.camel.karaf</groupId>
   <artifactId>camel-karaf-commands-catalog</artifactId>
   <packaging>jar</packaging>
-  <name>Camel :: Platforms :: Apache Karaf :: Commands :: Catalog</name>
+  <name>Camel :: Platforms :: Apache Karaf :: Commands :: Catalog 
(deprecated)</name>
 
   <properties>
     
<camel.osgi.export.pkg>org.apache.camel.karaf.commands.catalog.*</camel.osgi.export.pkg>

http://git-wip-us.apache.org/repos/asf/camel/blob/a1b9a534/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index e124064..c98a463 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -49,14 +49,6 @@
       * = *
     </config>
   </feature>
-  <feature name='camel-catalog' version='${project.version}' resolver='(obr)' 
start-level='50'>
-    <details>Install the camel catalog commands</details>
-    <feature version='${project.version}'>camel-core</feature>
-    <conditional>
-      <condition>shell</condition>
-      
<bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle>
-    </conditional>
-  </feature>
   <feature name='camel-blueprint' version='${project.version}' 
resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-blueprint/${project.version}</bundle>

Reply via email to