camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [01/12] camel git commit: Fixed Karaf feature not working
Date Fri, 16 Dec 2016 21:47:26 GMT
Repository: camel
Updated Branches:
  refs/heads/master 190c893c2 -> 490951460


Fixed Karaf feature not working


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

Branch: refs/heads/master
Commit: 765b581bebc0efdb3de29ca4bd66631b774050c0
Parents: efc4cf9
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Fri Dec 16 22:06:51 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Dec 16 22:07:03 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml                                           | 1 +
 platforms/karaf/features/pom.xml                         | 5 ++---
 platforms/karaf/features/src/main/resources/features.xml | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/765b581b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b36a134..c3b5c88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -656,6 +656,7 @@
     <yammer-metrics-version>2.2.0</yammer-metrics-version>
     <zjsonpatch-version>0.2.3</zjsonpatch-version>
     <zookeeper-version>3.4.9</zookeeper-version>
+    <zookeeper-guava-version>16.0</zookeeper-guava-version>
     <zxing-version>3.3.0</zxing-version>
     <zxing-bundle-version>3.3.0_1</zxing-bundle-version>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/765b581b/platforms/karaf/features/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 73251a9..785e96f7 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -184,8 +184,7 @@
                 <!-- camel-ignite requires to install apache ignite first -->
                 <!-- camel-guice does not work in OSGi currently -->
                 <!-- camel-leveldb uses some wrap magic to install which validator fails
but it works -->
-                <!-- camel-zipkin needs an OSGi bundle -->
-                <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb|zipkin))*</feature>
+                <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb))*</feature>
               </features>
 			        <configuration>file://${project.build.directory}/classes/config.properties</configuration>
             </configuration>
@@ -202,7 +201,7 @@
               <dependency>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-http-lightweight</artifactId>
-                <version>2.8</version>
+                <version>2.10</version>
               </dependency>
             </dependencies>
           </plugin>

http://git-wip-us.apache.org/repos/asf/camel/blob/765b581b/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 64cebb6..e832155 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2002,6 +2002,10 @@
   <feature name='camel-zookeeper' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.curator/curator-framework/${curator-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.curator/curator-client/${curator-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.curator/curator-recipes/${curator-version}</bundle>
+    <bundle dependency='true'>mvn:com.google.guava/guava/${zookeeper-guava-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-zookeeper/${project.version}</bundle>
   </feature>
 


Mime
View raw message