Repository: servicemix Updated Branches: refs/heads/servicemix-5.0.x 82833da73 -> f8bd1032d
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/f8bd1032 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/f8bd1032 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/f8bd1032 Branch: refs/heads/servicemix-5.0.x Commit: f8bd1032de40e62cc0ab8f90a7456a4c8feef30c Parents: 82833da Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Sep 8 23:08:39 2014 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Mon Sep 8 23:08:39 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/f8bd1032/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 242d058..1e81fe0 100644 --- a/assembly/src/main/filtered-resources/startup-obr.properties +++ b/assembly/src/main/filtered-resources/startup-obr.properties @@ -16,5 +16,5 @@ # # 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/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30 \ No newline at end of file +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 http://git-wip-us.apache.org/repos/asf/servicemix/blob/f8bd1032/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 5d39159..1fb711f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -42,7 +42,7 @@ <camel.version>2.12.4</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>
