CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed62696d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed62696d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed62696d Branch: refs/heads/master Commit: ed62696dddabf62126486b382a9673c5215334fb Parents: 13dd368 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Mar 1 10:54:35 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Mar 1 10:54:35 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 5 +++-- platforms/karaf/features/src/main/resources/features.xml | 7 ++----- 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ed62696d/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 055c598..ffaa2e9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -290,7 +290,7 @@ <jt400-bundle-version>6.7_1</jt400-bundle-version> <juel-bundle-version>2.1.3_1</juel-bundle-version> <juel-version>2.1.3</juel-version> - <junit-bundle-version>4.12_1</junit-bundle-version> + <junit-bundle-version>4.11_2</junit-bundle-version> <junit-version>4.12</junit-version> <jython-version>2.5.3</jython-version> <jzlib-version>1.1.3</jzlib-version> @@ -344,7 +344,8 @@ <mqtt-client-version>1.10</mqtt-client-version> <msv-version>2013.6.1</msv-version> <mustache-java-version>0.9.0</mustache-java-version> - <mustache-bundle-version>0.9.0_1</mustache-bundle-version> + <mustache-guava-version>16.0</mustache-guava-version> + <mustache-bundle-version>0.8.16_1</mustache-bundle-version> <mvel-version>2.2.1.Final</mvel-version> <mybatis-version>3.2.8</mybatis-version> <neethi-bundle-version>3.0.1</neethi-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/ed62696d/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 59fba34..f089606 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -972,13 +972,10 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-msv/${project.version}</bundle> - </feature> - <!-- TODO: The mustache bundle is flawed and requires ruby and scala and guava 13.0, see SMX4-1477 --> + </feature> <feature name='camel-mustache' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mustache-compiler/${mustache-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.google.guava/guava/13.0.1</bundle> - <feature version='${project.version}'>camel-ruby</feature> - <feature version='${project.version}'>camel-scala</feature> + <bundle dependency='true'>mvn:com.google.guava/guava/${mustache-guava-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-mustache/${project.version}</bundle> </feature>