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 2019/04/11 11:33:36 UTC

[camel] branch master updated: Camel-Consul Karaf ITest re-introduced: it works now

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


The following commit(s) were added to refs/heads/master by this push:
     new 00ae17b  Camel-Consul Karaf ITest re-introduced: it works now
00ae17b is described below

commit 00ae17b482ee77bba256c736ecdd66ba20362fc3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Apr 11 13:32:57 2019 +0200

    Camel-Consul Karaf ITest re-introduced: it works now
---
 platforms/karaf/features/src/main/resources/features.xml               | 1 -
 .../src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java    | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index c234375..269f3c1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -667,7 +667,6 @@
     <bundle>mvn:org.apache.camel/camel-cometd/${project.version}</bundle>
   </feature>
   <feature name='camel-consul' version='${project.version}' start-level='50'>
-    <details>camel-consul currently does not work in OSGi</details>
     <feature prerequisite='true'>wrap</feature>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:com.google.guava/guava/22.0</bundle>
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 cb9c03b..5dff307 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
@@ -16,14 +16,11 @@
  */
 package org.apache.camel.itest.karaf;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
 
-// TODO: camel-consul does not work in OSGi
 @RunWith(PaxExam.class)
-@Ignore("camel-consul does not work in OSGi")
 public class CamelConsulTest extends BaseKarafTest {
 
     public static final String COMPONENT = extractName(CamelConsulTest.class);