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
commit 9faae1e078bbb62f2808baea580f1dcf0041ed5c Author: Alex Heneveld <[email protected]> AuthorDate: Wed Nov 10 12:41:28 2021 +0000 slight reorg of feature defs - use essential deps feature --- karaf/features/src/main/feature/feature.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index 51cf55b..4517095 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -55,16 +55,15 @@ <feature name="brooklyn-startup-features" version="${project.version}" description="Bundles to load early"> <!-- this might not be needed as a separate feature anymore; the load order has changed --> + <!-- use jakarta not servicemix --> + <bundle dependency="true">mvn:com.sun.activation/jakarta.activation/${jakarta.activation.version}</bundle> <!-- <bundle dependency="true">mvn:org.apache.servicemix.specs.activation-api-1.1</bundle>--> <!-- <bundle dependency="true">mvn:org.apache.servicemix.specs.activation-api-1.1/2.9.0</bundle>--> - <bundle dependency="true">mvn:com.sun.activation/jakarta.activation/${jakarta.activation.version}</bundle> + <!-- Register javax.mail along with pax-logging-service so it doesn't get refreshed later --> <bundle dependency="true">mvn:javax.mail/mail/${javax.mail.version}</bundle> - </feature> - <feature name="brooklyn-guava-optional-deps" version="${project.version}" description="Guava dependencies to avoid refreshing the bundle"> - <!-- Register javax.annotation (coming from cxf-jaxrs) before guava so it doesn't get rewired when it sees it --> - <bundle>mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation-api.version}</bundle> + <bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation-api.version}</bundle> </feature> <feature name="brooklyn-config" version="${project.version}"> @@ -88,11 +87,13 @@ </configfile> </feature> - <feature name="brooklyn-headless" version="${project.version}" description="All Brooklyn bundles witht the exception of the launcher"> + <feature name="brooklyn-headless" version="${project.version}" description="All Brooklyn bundles with the exception of the launcher and actual ui+rest"> + <feature prerequisite="true">brooklyn-startup-features</feature> + <feature prerequisite="true">brooklyn-standard-karaf</feature> <feature prerequisite="true">brooklyn-config</feature> <feature prerequisite="true">brooklyn-catalog</feature> - <feature prerequisite="true">brooklyn-standard-karaf</feature> - <feature prerequisite="true">brooklyn-guava-optional-deps</feature> + <feature prerequisite="true">brooklyn-essential-deps</feature> + <feature>brooklyn-core</feature> <feature>brooklyn-locations-jclouds</feature> <feature>brooklyn-commands</feature>
