CAMEL-8407: Fixed camel-spring-ldap to install in osgi.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a01e2bd3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a01e2bd3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a01e2bd3 Branch: refs/heads/master Commit: a01e2bd3ab8615bc24364d32c3e7a856f473eccd Parents: 754a615 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Feb 25 17:05:41 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Feb 25 17:05:41 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- platforms/karaf/features/src/main/resources/features.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a01e2bd3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 1b4e47f..cbe9662 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -420,7 +420,7 @@ <spark-rest-version>2.0.0</spark-rest-version> <splunk-version>1.3.0_1</splunk-version> <spring-batch-version>3.0.3.RELEASE</spring-batch-version> - <spring-batch-bundle-version>3.0.2.RELEASE_1</spring-batch-bundle-version> + <spring-batch-bundle-version>3.0.3.RELEASE_1</spring-batch-bundle-version> <spring-boot-version>1.2.1.RELEASE</spring-boot-version> <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version> <spring-data-commons-version>1.6.1.RELEASE</spring-data-commons-version> http://git-wip-us.apache.org/repos/asf/camel/blob/a01e2bd3/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 74abb47..8c6ebfe 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1322,10 +1322,11 @@ <feature version='${spring-version-range-karaf}'>spring-jdbc</feature> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> + <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ldap/${spring-ldap-bundle-version}</bundle> <bundle dependency='true'>mvn:org.springframework.data/spring-data-commons/${spring-data-commons-version}</bundle> - <bundle dependency='true'>mvn:org.springframework.batch/spring-batch-core/${spring-batch-version}</bundle> - <bundle dependency='true'>mvn:org.springframework.batch/spring-batch-infrastructure/${spring-batch-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-core/${spring-batch-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-infrastructure/${spring-batch-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-spring-ldap/${project.version}</bundle> </feature> <feature name='camel-spring-redis' version='${project.version}' resolver='(obr)' start-level='50'>
