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 a79227be8a4b6991195b31955af9ca70b0f338a1 Author: Alex Heneveld <[email protected]> AuthorDate: Thu Nov 18 12:28:12 2021 +0000 move jetty config to be installed earlier to prevent rewiring --- karaf/features/src/main/feature/feature.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index 6fefa70..5174781 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -110,6 +110,7 @@ </feature> <feature name="brooklyn-jsgui-prereqs" version="${project.version}" description="Brooklyn REST JavaScript Web GUI"> + <bundle>mvn:org.apache.brooklyn/brooklyn-karaf-jetty-config/${project.version}</bundle> <!-- bring in this config at same time as pax-jetty, to avoid refresh --> <feature>pax-jetty</feature> <!-- jaas bundle --> <feature>war</feature> @@ -151,7 +152,6 @@ <feature name="brooklyn-boot" version="${project.version}" description="Bundles to start on boot"> <feature prerequisite="true">brooklyn-headless</feature> - <bundle>mvn:org.apache.brooklyn/brooklyn-karaf-jetty-config/${project.version}</bundle> <feature>brooklyn-osgi-launcher</feature> <feature>brooklyn-jsgui</feature> <feature>brooklyn-rest-resources</feature>
