Repository: servicemix Updated Branches: refs/heads/servicemix-5.2.x 1a8c4d1f2 -> 8f8151c3c
Change the property name for felix bundlerepository Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/8f8151c3 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/8f8151c3 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/8f8151c3 Branch: refs/heads/servicemix-5.2.x Commit: 8f8151c3c2c04400c64ae057a59f877f56a80fe5 Parents: 1a8c4d1 Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Sep 8 23:18:22 2014 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Mon Sep 8 23:18:22 2014 +0200 ---------------------------------------------------------------------- assembly/src/main/filtered-resources/startup-obr.properties | 4 ++-- parent/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/8f8151c3/assembly/src/main/filtered-resources/startup-obr.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/startup-obr.properties b/assembly/src/main/filtered-resources/startup-obr.properties index 9a6991b..23ec087 100644 --- a/assembly/src/main/filtered-resources/startup-obr.properties +++ b/assembly/src/main/filtered-resources/startup-obr.properties @@ -16,8 +16,8 @@ # # enabling features OBR resolver support -org/apache/felix/org.apache.felix.bundlerepository/${felix.obr.version}/org.apache.felix.bundlerepository-${felix.obr.version}.jar=30 +org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=30 org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30 # Fix for SM-2301: ensure joda-time bundle is installed before any features get resolved -org/apache/servicemix/bundles/org.apache.servicemix.bundles.joda-time/2.3_1/org.apache.servicemix.bundles.joda-time-2.3_1.jar=25 \ No newline at end of file +org/apache/servicemix/bundles/org.apache.servicemix.bundles.joda-time/2.3_1/org.apache.servicemix.bundles.joda-time-2.3_1.jar=25 http://git-wip-us.apache.org/repos/asf/servicemix/blob/8f8151c3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0863d32..a8bfc8c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -42,7 +42,7 @@ <camel.version>2.13.2</camel.version> <cxf.version>2.7.11</cxf.version> - <felix.obr.version>1.6.6</felix.obr.version> + <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version> <karaf.version>2.3.7</karaf.version> <aries.proxy.version>1.0.2</aries.proxy.version> <aries.util.version>1.1.0</aries.util.version>
