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 2016/03/12 16:16:18 UTC
camel git commit: Fixed some karaf feature validation error.
Repository: camel
Updated Branches:
refs/heads/master 7db9c8e5e -> 9da5226bb
Fixed some karaf feature validation error.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9da5226b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9da5226b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9da5226b
Branch: refs/heads/master
Commit: 9da5226bbe19e2c3aca8ae4f357c6c8b1db2a409
Parents: 7db9c8e
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 12 16:15:41 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 12 16:16:03 2016 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 4 +++-
.../java/org/apache/camel/itest/karaf/AbstractFeatureTest.java | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9da5226b/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 b11cfff..747f833 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -50,6 +50,8 @@
</feature>
<feature name='camel-catalog' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle>
</feature>
<feature name='camel-blueprint' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -676,7 +678,7 @@
</feature>
<feature name='camel-hessian' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle dependency='true'>mvn:com.caucho/hessian/${hessian-version}}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.caucho/hessian/${hessian-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hessian/${project.version}</bundle>
</feature>
<feature name='camel-hl7' version='${project.version}' resolver='(obr)' start-level='50'>
http://git-wip-us.apache.org/repos/asf/camel/blob/9da5226b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index 2589c0d..ee7d51f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -61,6 +61,9 @@ public abstract class AbstractFeatureTest {
@Before
public void setUp() throws Exception {
LOG.info("setUp() using BundleContext: {}", bundleContext);
+
+ // give time for karaf to install
+ Thread.sleep(3000);
}
@After