[brooklyn-dist] 02/04: rejig jsgui order and switch javax.mail to jakarta.mail

[he...@apache.org]

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 1f8e2c671b42c8c26357053e8ec168a2685d2b77
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Thu Jan 6 17:44:17 2022 +0000

    rejig jsgui order and switch javax.mail to jakarta.mail
---
 karaf/features/src/main/feature/feature.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 5174781..a598d6b 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -27,7 +27,7 @@
         <feature>wrap</feature>
 
         <bundle start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>  <!-- from cxf but triggers jetty restart so load early -->
-        <feature>brooklyn-jsgui-prereqs</feature> <!-- provides jetty for pax-web-core which we want, and much more which doesn't hurt -->
+
         <feature>pax-web-core</feature> <!-- provides objectweb 8.0.1 for aries-proxy -->
         <feature>aries-proxy</feature> <!-- seems confused about objectweb; feature declares 9.0 but bundle wires optionally to 8.0.1 -->
 
@@ -53,6 +53,8 @@
         <feature>package</feature>
         <feature>service</feature>
         <feature>system</feature>
+
+        <feature>brooklyn-jsgui-prereqs</feature> <!-- provides jetty for pax-web-core which we want, and much more which doesn't hurt -->
     </feature>
 
     <feature name="brooklyn-startup-features" version="${project.version}" description="Bundles to load early">
@@ -63,8 +65,9 @@
         <!--        <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>-->
 
-        <!-- 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>
+        <!-- Register javax.mail along with pax-logging-service so it doesn't get refreshed later; now replaced by jakarta -->
+        <!-- <bundle dependency="true">mvn:javax.mail/mail/${javax.mail.version}</bundle> -->
+        <bundle start-level="10" dependency="true">mvn:jakarta.mail/jakarta.mail-api/${jakarta.mail.version}</bundle>
 
         <bundle>mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation-api.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}</bundle>  <!-- complementary to above, but split packages; excluded by karaf.features.xml as not needed, confuses things -->