This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
The following commit(s) were added to refs/heads/master by this push:
new 6961c7b make default catalog replace previous default catalog bundle
6961c7b is described below
commit 6961c7b611d38f53ca6e0573a378ef8f2524a8d8
Author: Alex Heneveld <[email protected]>
AuthorDate: Mon Dec 6 16:50:22 2021 +0000
make default catalog replace previous default catalog bundle
to prevent version-confused references eg to catalog/catalog.bom (which are
versioned with the release)
---
karaf/features/src/main/resources/resources/etc/default.catalog.bom | 4 ++++
1 file changed, 4 insertions(+)
diff --git
a/karaf/features/src/main/resources/resources/etc/default.catalog.bom
b/karaf/features/src/main/resources/resources/etc/default.catalog.bom
index 247c978..7964de1 100644
--- a/karaf/features/src/main/resources/resources/etc/default.catalog.bom
+++ b/karaf/features/src/main/resources/resources/etc/default.catalog.bom
@@ -5,5 +5,9 @@
brooklyn.catalog:
bundle: brooklyn-default-karaf-catalog
version: "1.1.0-SNAPSHOT" # BROOKLYN_VERSION
+ catalog.osgi.wrap.headers:
+ # when this is wrapped to produce a bundle, insert these headers so
previous persisted default catalogs are replaced
+ Brooklyn-Catalog-Force-Remove-Bundles: "*"
+ Brooklyn-Catalog-Upgrade-For-Bundles: "*"
items:
- file:catalog/catalog.bom
