From 6d0b10fdab5e9b23744d3fb294f2177a738aa174 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <ranger@opennms.org>
Date: Wed, 26 Jul 2023 11:46:34 -0400
Subject: [PATCH] fix zookeeper loading (again)

---
 .../src/main/resources/features-core.xml       | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/container/features/src/main/resources/features-core.xml b/container/features/src/main/resources/features-core.xml
index fd8c890a01a3..5e80e818967e 100644
--- a/container/features/src/main/resources/features-core.xml
+++ b/container/features/src/main/resources/features-core.xml
@@ -22,15 +22,20 @@
         <bundle dependency="true">mvn:com.datastax.cassandra/cassandra-driver-core/${cassandraVersion}</bundle>
     </feature>
 
-    <feature name="guava" version="${guavaOsgiVersion}" description="Google :: Guava">
+    <feature name="guava-dependencies" version="${project.version}" description="Google :: Guava Common Dependencies">
         <feature prerequisite="true">wrap</feature>
-        <bundle start-level="30" dependency="true">mvn:com.google.guava/guava/${guavaVersion}</bundle>
         <bundle start-level="30" dependency="true">wrap:mvn:org.codehaus.mojo/animal-sniffer-annotations/1.14</bundle>
         <bundle start-level="30" dependency="true">wrap:mvn:com.google.errorprone/error_prone_annotations/2.10.0</bundle>
+        <bundle start-level="30" dependency="true">wrap:mvn:com.google.guava/failureaccess/1.0.1</bundle>
         <bundle start-level="30" dependency="true">wrap:mvn:org.checkerframework/checker-qual/2.0.0</bundle>
         <bundle start-level="30" dependency="true">wrap:mvn:com.google.j2objc/j2objc-annotations/1.1</bundle>
     </feature>
 
+    <feature name="guava" version="${guavaOsgiVersion}" description="Google :: Guava">
+        <feature prerequisite="true">guava-dependencies</feature>
+        <bundle start-level="30" dependency="true">mvn:com.google.guava/guava/${guavaVersion}</bundle>
+    </feature>
+
     <feature name="guava17" version="17.0" description="Google :: Guava">
         <bundle>mvn:com.google.guava/guava/17.0</bundle>
     </feature>
@@ -39,6 +44,11 @@
         <bundle>mvn:com.google.guava/guava/21.0</bundle>
     </feature>
 
+    <feature name="guava31" version="31.1" description="Google :: Guava">
+        <feature prerequisite="true">guava-dependencies</feature>
+        <bundle start-level="30">mvn:com.google.guava/guava/31.1-jre</bundle>
+    </feature>
+
     <feature name="jackson-core" version="${jackson2Version}" description="Jackson 2 :: Base">
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2Version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2Version}</bundle>
@@ -144,8 +154,10 @@
 
     <feature name="zookeeper-dependencies" version="${zookeeperVersion}" description="ZooKeeper Dependencies">
         <feature prerequisite="true">wrap</feature>
+        <feature prerequisite="true">guava31</feature>
         <feature version="[${jackson2Version},3)">jackson-core</feature>
-        <bundle>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeperVersion}</bundle>
+        <bundle>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeperVersion}$Bundle-SymbolicName=org.apache.zookeeper.zookeeper&amp;Bundle-Version=${zookeeperVersion}&amp;Export-Package=org.apache.zookeeper*;version="${zookeeperVersion}"</bundle>
+        <bundle>wrap:mvn:org.apache.zookeeper/zookeeper-jute/${zookeeperVersion}$Bundle-SymbolicName=org.apache.zookeeper.zookeeper.jute&amp;Bundle-Version=${zookeeperVersion}&amp;Export-Package=org.apache.*;version="${zookeeperVersion}"</bundle>
         <bundle>mvn:org.apache.curator/curator-client/${curatorVersion}</bundle>
         <bundle>mvn:org.apache.curator/curator-framework/${curatorVersion}</bundle>
         <bundle>mvn:org.apache.curator/curator-recipes/${curatorVersion}</bundle>