Repository: camel Updated Branches: refs/heads/master aa629b280 -> 6e3ef759e
CAMEL-10612: fixed osgi compatibility Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6e3ef759 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6e3ef759 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6e3ef759 Branch: refs/heads/master Commit: 6e3ef759e143fcc0b78d2cfc94685412d105b29c Parents: aa629b2 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Mon Feb 6 11:21:12 2017 +0100 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Mon Feb 6 11:21:12 2017 +0100 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 1 + .../org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6e3ef759/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 c9ec945..ba64ee9 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1472,6 +1472,7 @@ <feature name='camel-reactive-streams' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle> + <bundle>mvn:org.apache.camel/camel-reactive-streams/${project.version}</bundle> </feature> <feature name='camel-restlet' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> http://git-wip-us.apache.org/repos/asf/camel/blob/6e3ef759/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java index ad395f2..108409a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelReactiveStreamsTest.java @@ -16,13 +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; @RunWith(PaxExam.class) -@Ignore("Not installing") public class CamelReactiveStreamsTest extends BaseKarafTest { public static final String COMPONENT = extractName(CamelReactiveStreamsTest.class);
