tweaks for bump to CXF + karaf versions
geronimo jaspi now required
diff --git a/karaf/apache-brooklyn/pom.xml b/karaf/apache-brooklyn/pom.xml
index 190e35c..1843650 100755
--- a/karaf/apache-brooklyn/pom.xml
+++ b/karaf/apache-brooklyn/pom.xml
@@ -64,12 +64,6 @@
<classifier>features</classifier>
</dependency>
- <dependency>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-library-catalog</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- not needed if coming from jre, and doesn't work if not from jre
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -120,7 +114,7 @@
<configuration>
<framework>framework</framework>
<installedFeatures>
- <feature>wrapper</feature> <!-- https://karaf.apache.org/manual/latest/wrapper -->
+ <feature>wrapper</feature>
</installedFeatures>
<startupFeatures>
<feature>eventadmin</feature>
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index f32c7a4..a2af08e 100644
--- a/karaf/features/pom.xml
+++ b/karaf/features/pom.xml
@@ -33,6 +33,10 @@
<description>Defines Karaf features for Karaf runtime</description>
<packaging>kar</packaging>
+ <properties>
+ <geronimo-jaspi.version>2.0.0</geronimo-jaspi.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.brooklyn.ui</groupId>
@@ -63,6 +67,12 @@
<type>kar</type>
<scope>runtime</scope>
</dependency>
+
+ <dependency> <!-- needed since eclipse jetty 9.4.49.v20220914 -->
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-jaspi</artifactId>
+ <version>2.0.0</version>
+ </dependency>
</dependencies>
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index c1c2a8c..7fdc18b 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -91,9 +91,14 @@
<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 -->
+ <bundle>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.5</bundle> <!-- needed for websocket, to avoid osgi-extender error -->
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle> <!-- between pax-web 7.3.23 and 7.3.27 removed from pax, but needed for jetty websocket -->
+ <feature>brooklyn-standard-karaf</feature>
<feature>pax-jetty</feature> <!-- jaas bundle -->
<feature>war</feature>
+ <bundle>mvn:org.apache.geronimo.components/geronimo-jaspi/2.0.0</bundle> <!-- needed since eclipse jetty 9.4.49.v20220914 -->
+
<!-- we update the versions of these bundles; as per the org.apache.karaf.features.xml file in this project,
these need to be declared here -->
<bundle>mvn:org.eclipse.jetty.websocket/javax-websocket-client-impl/${jetty.version}</bundle>
diff --git a/karaf/features/src/main/resources/resources/etc/custom.properties b/karaf/features/src/main/resources/resources/etc/custom.properties
index eb04c66..2990b66 100644
--- a/karaf/features/src/main/resources/resources/etc/custom.properties
+++ b/karaf/features/src/main/resources/resources/etc/custom.properties
@@ -25,6 +25,10 @@
# Brooklyn used to bundle Apache Felix, so force felix
karaf.framework=felix
+# Now set by karaf, make sure we set it also
+karaf.systemBundlesStartLevel=50
+
+
# javax.annotation -- excluded, so we use jakarta (but processing sub-package is still needed)
# javax.xml.bind -- could come from jakarta.xml.bind-api
