camel-kafka should use scala-2.10.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/baf84ebf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/baf84ebf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/baf84ebf Branch: refs/heads/master Commit: baf84ebff70f74387c1f4c803ee7d5d59afa5292 Parents: 2806bb1 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Aug 28 20:33:16 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Aug 28 20:42:42 2014 +0800 ---------------------------------------------------------------------- components/camel-kafka/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/baf84ebf/components/camel-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml index c0a8908..e550b93 100644 --- a/components/camel-kafka/pom.xml +++ b/components/camel-kafka/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>${scala-version}</version> + <version>${scala-2.10-version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/baf84ebf/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 e178f0f..2e6ca60 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -216,7 +216,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-castor/${project.version}</bundle> </feature> -<!-- TODO: Karaf does not yet support CDI seamless in the container +<!-- TODO: Karaf does not yet support CDI seamless in the container <feature name='camel-cdi' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jcdi_1.0_spec/1.0</bundle> @@ -608,7 +608,7 @@ <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <feature version='${project.version}'>camel-avro</feature> <bundle>mvn:org.apache.camel/camel-infinispan/${project.version}</bundle> - </feature> + </feature> <feature name='camel-irc' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature> @@ -635,7 +635,7 @@ <feature version='${jclouds-version}'>jclouds</feature> <feature version='${jclouds-version}'>jclouds-blobstore</feature> <feature version='${jclouds-version}'>jclouds-compute</feature> - <feature version='${project.version}'>camel-core</feature> + <feature version='${project.version}'>camel-core</feature> <bundle>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle> <bundle>mvn:org.apache.camel/camel-jclouds/${project.version}</bundle> </feature> @@ -748,7 +748,7 @@ <bundle>mvn:org.apache.camel/camel-jxpath/${project.version}</bundle> </feature> <feature name='camel-kafka' version='${project.version}' resolver='(obr)' start-level='50'> - <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-version}</bundle> + <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-2.10-version}</bundle> <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle> <bundle dependency='true'>wrap:mvn:com.yammer.metrics/metrics-core/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}&Export-Package=*;-noimport:=true;version="${yammer-metrics-version}"</bundle> <bundle dependency='true'>wrap:mvn:com.yammer.metrics/metrics-annotation/${yammer-metrics-version}$Bundle-Version=${yammer-metrics-version}&Export-Package=*;-noimport:=true;version="${yammer-metrics-version}"</bundle>