Fixed broken osgi-related Kafka tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/532b3735 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/532b3735 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/532b3735 Branch: refs/heads/ignite-1786 Commit: 532b37358de4f5c4143b6692178dca23e37f1fda Parents: e2be94e Author: shtykh_roman <[email protected]> Authored: Fri Feb 5 12:32:06 2016 +0900 Committer: shtykh_roman <[email protected]> Committed: Fri Feb 5 12:32:06 2016 +0900 ---------------------------------------------------------------------- modules/osgi-karaf/src/main/resources/features.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/532b3735/modules/osgi-karaf/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/modules/osgi-karaf/src/main/resources/features.xml b/modules/osgi-karaf/src/main/resources/features.xml index 983aeed..584429d 100644 --- a/modules/osgi-karaf/src/main/resources/features.xml +++ b/modules/osgi-karaf/src/main/resources/features.xml @@ -154,16 +154,15 @@ <feature name="ignite-kafka" version="${project.version}" description="Apache Ignite :: Kafka"> <details> - <![CDATA[The Apache Ignite Kafka module + dependencies. This module installs the Scala 2.10 library bundle.]]> + <![CDATA[The Apache Ignite Kafka module + dependencies. This module installs the Scala 2.1 library bundle.]]> </details> <feature prerequisite="true">wrap</feature> - <bundle start="true" dependency="true">mvn:org.scala-lang/scala-library/${scala210.library.version}</bundle> - <bundle start="true" dependency="true">mvn:org.apache.zookeeper/zookeeper/${zookeeper.version}</bundle> - <bundle start="true" dependency="true">wrap:mvn:com.101tec/zkclient/${zkclient.version}$Bundle-SymbolicName=zkclient&Bundle-Version=${zkclient.version}&Export-Package=*;-noimport:=true;version=${zkclient.version}</bundle> + <bundle start="true" dependency="true">mvn:org.scala-lang/scala-library/${scala211.library.version}</bundle> <bundle start="true" dependency="true">wrap:mvn:com.yammer.metrics/metrics-core/${yammer.metrics.core.version}$Bundle-SymbolicName=yammer-metrics-core&Bundle-Version=2.2.0&Export-Package=*;-noimport:=true;version=${yammer.metrics.core.version}</bundle> <bundle start="true" dependency="true">wrap:mvn:com.yammer.metrics/metrics-annotation/${yammer.metrics.annotation.version}$Bundle-SymbolicName=yammer-metrics-annotation&Bundle-Version=2.2.0&Export-Package=*;-noimport:=true;version=${yammer.metrics.annotation.version}</bundle> - <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafka.clients.bundle.version}</bundle> - <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka_2.10/${kafka.bundle.version}</bundle> + <bundle start="true" dependency="true">wrap:mvn:org.apache.kafka/connect-api/${kafka.version}$Bundle-SymbolicName=connect-api&Bundle-Version=${kafka.version}</bundle> + <bundle start="true" dependency="true">wrap:mvn:org.apache.kafka/kafka_2.11/${kafka.version}$Bundle-SymbolicName=kafka_2.11&Bundle-Version=${kafka.version}</bundle> + <bundle start="true" dependency="true">wrap:mvn:org.apache.kafka/kafka-clients/${kafka.version}$Bundle-SymbolicName=kafka-clients&Bundle-Version=${kafka.version}</bundle> <bundle start="true">mvn:org.apache.ignite/ignite-kafka/${project.version}</bundle> </feature> @@ -317,6 +316,7 @@ <details> <![CDATA[The Apache Ignite ZooKeeper module + dependencies.]]> </details> + <bundle start="true" dependency="true">mvn:org.apache.zookeeper/zookeeper/${zookeeper.version}</bundle> <bundle start="true" dependency="true">mvn:com.google.guava/guava/${guava16.version}</bundle> <bundle start="true" dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle> <bundle start="true" dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
