SM-2290: Add obr feature to featuresBoot
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/3cffa715 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/3cffa715 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/3cffa715 Branch: refs/heads/master Commit: 3cffa715f67a05a00675277a83fb3e055f660ccc Parents: e73cd86 Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Jun 8 22:05:51 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Mon Jun 8 22:05:51 2015 +0200 ---------------------------------------------------------------------- .../main/filtered-resources/etc/org.apache.karaf.features.cfg | 5 +++-- assembly/src/main/filtered-resources/startup-obr.properties | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/3cffa715/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg index 3b68c9f..38869e9 100644 --- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg +++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg @@ -51,6 +51,8 @@ featuresRepositories=\ # Comma separated list of features to install at startup # featuresBoot=\ + (obr,\ + war),\ config,\ standard,\ package,\ @@ -64,8 +66,7 @@ featuresBoot=\ cxf,\ camel-cxf,\ camel-blueprint,\ - activemq-service,\ - war + activemq-service # http://git-wip-us.apache.org/repos/asf/servicemix/blob/3cffa715/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 06704b7..c813599 100644 --- a/assembly/src/main/filtered-resources/startup-obr.properties +++ b/assembly/src/main/filtered-resources/startup-obr.properties @@ -15,10 +15,6 @@ # limitations under the License. # -# enabling features OBR resolver support -org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=10 -org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30 - # workaround for SM-2469 # # some standard features install the version 2.2 of joda-time bundle ans bundles which depend on joda-time
