Repository: camel Updated Branches: refs/heads/master cb3471c28 -> c52309c51
Added Brave-zipkin bundle to camel-zipkin feature and remove @ignore annotation on CamelZipkinTest of Karaf Integration Tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c52309c5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c52309c5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c52309c5 Branch: refs/heads/master Commit: c52309c51e085418f1b882bb42aea966be5cb91f Parents: cb3471c Author: Andrea Cosentino <anco...@gmail.com> Authored: Wed May 4 09:54:00 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Wed May 4 09:54:00 2016 +0200 ---------------------------------------------------------------------- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 5 +---- .../test/java/org/apache/camel/itest/karaf/CamelZipkinTest.java | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c52309c5/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d5db7ec..e358ece 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -79,6 +79,7 @@ <boxjavalibv2.version>3.2.1</boxjavalibv2.version> <braintree-gateway-version>2.61.0</braintree-gateway-version> <brave-zipkin-version>3.5.0</brave-zipkin-version> + <brave-zipkin-bundle-version>3.5.0_1</brave-zipkin-bundle-version> <build-helper-maven-plugin-version>1.10</build-helper-maven-plugin-version> <c3p0-version>0.9.5.2</c3p0-version> <caffeine-version>2.3.0</caffeine-version> http://git-wip-us.apache.org/repos/asf/camel/blob/c52309c5/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 a699d7c..e2727e2 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1832,11 +1832,8 @@ <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> - <!--<bundle dependency='true'>wrap:mvn:com.github.kristofa/brave-spancollector-scribe/${brave-zipkin-version}</bundle>--> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.brave-zipkin/${brave-zipkin-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.thrift/libthrift/${libthrift-version}</bundle> <bundle>mvn:org.apache.camel/camel-zipkin/${project.version}</bundle> </feature> http://git-wip-us.apache.org/repos/asf/camel/blob/c52309c5/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 4c38500..428c7e2 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 @@ -22,7 +22,6 @@ 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 BaseKarafTest { public static final String COMPONENT = extractName(CamelZipkinTest.class);
