Repository: camel Updated Branches: refs/heads/master b1c09a33a -> e7c9e405a
Fixed camel-scala installing in osgi. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7c9e405 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7c9e405 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7c9e405 Branch: refs/heads/master Commit: e7c9e405ad063727b89fb39069d63481e9935c76 Parents: b1c09a3 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 13 11:35:01 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 13 11:35:01 2014 +0200 ---------------------------------------------------------------------- components/camel-scala/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e7c9e405/components/camel-scala/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml index 22e444e..3dc21b6 100644 --- a/components/camel-scala/pom.xml +++ b/components/camel-scala/pom.xml @@ -31,6 +31,7 @@ <properties> <camel.osgi.import.before.defaults> + scala.xml.*;version="[1.0,2)", scala.*;version="[2.11,2.12)" </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.scala.*</camel.osgi.export.pkg> http://git-wip-us.apache.org/repos/asf/camel/blob/e7c9e405/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 7d3fc4f..18d4963 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -995,6 +995,7 @@ </feature> <feature name='camel-scala' 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.modules/scala-xml_2.11/${scalaxml-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-scala/${project.version}</bundle> </feature>
