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 2016/08/29 08:13:29 UTC
[5/5] camel git commit: Removed @ignore annotation on Camel-Consul
Karaf Integration Test and fixed the Camel-Consul Karaf feature
Removed @ignore annotation on Camel-Consul Karaf Integration Test and fixed the Camel-Consul Karaf feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07c12950
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07c12950
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07c12950
Branch: refs/heads/master
Commit: 07c12950700cf15fe008b3163c0cd2916ef3a4ae
Parents: c540e7a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Aug 29 10:11:52 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Aug 29 10:11:52 2016 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 2 ++
.../test/java/org/apache/camel/itest/karaf/CamelConsulTest.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/07c12950/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 a403007..08826ef 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -360,6 +360,8 @@
<feature name='camel-consul' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.orbitz-consul-client/${consul-client-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-consul/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/camel/blob/07c12950/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java
index ef3b555..99d7cdc 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java
@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-@Ignore("OSGi bundle not released yet")
public class CamelConsulTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelConsulTest.class);
@@ -32,4 +31,4 @@ public class CamelConsulTest extends BaseKarafTest {
testComponent(COMPONENT);
}
-}
\ No newline at end of file
+}