This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
from fbb9b50 skip the maven-karaf-verify goal as that interferes with
subsequent builds
new c02999f instead of a config bundle, let the feature build install the
files it needs
new bbf9222 restructure catalog definitions
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
karaf/config/pom.xml | 77 --------------------
karaf/features/pom.xml | 36 ----------
karaf/features/src/main/feature/feature.xml | 23 ------
.../catalog/catalog-brooklyn-default.bom} | 15 +++-
.../catalog/catalog-brooklyn-software-base.bom | 82 ++++++++++++++++++++++
.../resources/catalog/catalog-core.bom | 14 +++-
.../catalog/catalog-library-software.bom} | 6 +-
.../catalog-templates-brooklyn-samples.bom} | 0
.../resources/catalog/catalog.bom | 3 +-
.../etc}/org.apache.brooklyn.classrename.cfg | 0
.../etc}/org.apache.brooklyn.osgilauncher.cfg | 0
.../etc}/org.apache.felix.scr.ScrService.cfg | 0
karaf/pom.xml | 1 -
13 files changed, 114 insertions(+), 143 deletions(-)
delete mode 100644 karaf/config/pom.xml
copy karaf/{config/src/main/resources/catalog/catalog.bom =>
features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-default.bom}
(65%)
create mode 100644
karaf/features/src/main/filtered-resources/resources/catalog/catalog-brooklyn-software-base.bom
copy karaf/{config/src/main =>
features/src/main/filtered-resources}/resources/catalog/catalog-core.bom (66%)
rename karaf/{config/src/main/resources/catalog/catalog-core.bom =>
features/src/main/filtered-resources/resources/catalog/catalog-library-software.bom}
(89%)
rename karaf/{config/src/main/resources/catalog/catalog-templates.bom =>
features/src/main/filtered-resources/resources/catalog/catalog-templates-brooklyn-samples.bom}
(100%)
rename karaf/{config/src/main =>
features/src/main/filtered-resources}/resources/catalog/catalog.bom (91%)
rename karaf/{config/src/main/resources =>
features/src/main/resources/resources/etc}/org.apache.brooklyn.classrename.cfg
(100%)
rename karaf/{config/src/main/resources =>
features/src/main/resources/resources/etc}/org.apache.brooklyn.osgilauncher.cfg
(100%)
rename karaf/{config/src/main/resources =>
features/src/main/resources/resources/etc}/org.apache.felix.scr.ScrService.cfg
(100%)
