Repository: camel
Updated Branches:
  refs/heads/master 0fb19fb5e -> a5bba2244


camel-zipkin does not work yet in OSGi


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

Branch: refs/heads/master
Commit: a5bba2244218e3b58d8e7ab649949dc6ae5ce212
Parents: 0fb19fb
Author: Claus Ibsen <davscl...@apache.org>
Authored: Thu Mar 31 10:17:49 2016 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Thu Mar 31 10:17:49 2016 +0200

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/features.xml           | 1 +
 .../test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java    | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a5bba224/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 65d2e54..e09fbf1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1808,6 +1808,7 @@
     <bundle>mvn:org.apache.camel/camel-zipfile/${project.version}</bundle>
   </feature>
   <feature name='camel-zipkin' version='${project.version}' resolver='(obr)' 
start-level='50'>
+    <!-- TODO: https://issues.apache.org/jira/browse/SMX4-1983 -->
     <details>camel-zpikin using spancollector-scribe does not yet work in 
OSGi</details>
     <feature version='${project.version}'>camel-core</feature>
     <bundle 
dependency='true'>wrap:mvn:com.github.kristofa/brave-core/${brave-zipkin-version}</bundle>

http://git-wip-us.apache.org/repos/asf/camel/blob/a5bba224/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
----------------------------------------------------------------------
diff --git 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
index 2916976..a08abdc 100644
--- 
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
+++ 
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java
@@ -16,11 +16,13 @@
  */
 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;
 
 @RunWith(PaxExam.class)
+@Ignore("Does not yet work in OSGi: 
https://issues.apache.org/jira/browse/SMX4-1983";)
 public class CamelZipkinTest extends AbstractFeatureTest {
 
     public static final String COMPONENT = extractName(CamelZipkinTest.class);

Reply via email to