From 3d8054acacf824e6aed04f63e88ee1d4bb4ebe9c Mon Sep 17 00:00:00 2001
From: Fabrizio Fortino <fabrizio.fortino@gmail.com>
Date: Tue, 19 Sep 2023 17:05:29 +0200
Subject: [PATCH 1/7] OAK-10449: bump zookeeper to v3.6.2 (aligned with solrj
 version)

---
 oak-solr-osgi/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oak-solr-osgi/pom.xml b/oak-solr-osgi/pom.xml
index c1c58b682d4..1abf1a4b744 100644
--- a/oak-solr-osgi/pom.xml
+++ b/oak-solr-osgi/pom.xml
@@ -152,7 +152,7 @@
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
-            <version>3.4.10</version>
+            <version>3.6.2</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

From 96102fa988682e79fe999c859cd35cf1a1ecd1f8 Mon Sep 17 00:00:00 2001
From: Fabrizio Fortino <fabrizio.fortino@gmail.com>
Date: Wed, 20 Sep 2023 10:54:02 +0200
Subject: [PATCH 2/7] OAK-10449: remove zookeeper dependency, already included
 from solrj

---
 oak-solr-osgi/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/oak-solr-osgi/pom.xml b/oak-solr-osgi/pom.xml
index 1abf1a4b744..7229fa62a9b 100644
--- a/oak-solr-osgi/pom.xml
+++ b/oak-solr-osgi/pom.xml
@@ -149,12 +149,6 @@
             <artifactId>httpmime</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>3.6.2</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>

From 4b393d310abe44ea573abb82b663af430e97c416 Mon Sep 17 00:00:00 2001
From: Fabrizio Fortino <fabrizio.fortino@gmail.com>
Date: Wed, 20 Sep 2023 11:46:31 +0200
Subject: [PATCH 3/7] Revert "OAK-10449: remove zookeeper dependency, already
 included from solrj"

This reverts commit 96102fa988682e79fe999c859cd35cf1a1ecd1f8.
---
 oak-solr-osgi/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/oak-solr-osgi/pom.xml b/oak-solr-osgi/pom.xml
index 7229fa62a9b..1abf1a4b744 100644
--- a/oak-solr-osgi/pom.xml
+++ b/oak-solr-osgi/pom.xml
@@ -149,6 +149,12 @@
             <artifactId>httpmime</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.zookeeper</groupId>
+            <artifactId>zookeeper</artifactId>
+            <version>3.6.2</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>

From 33d9982034d0cddbdd2b0eb0ae5f9402d356484c Mon Sep 17 00:00:00 2001
From: Fabrizio Fortino <fabrizio.fortino@gmail.com>
Date: Wed, 20 Sep 2023 14:58:41 +0200
Subject: [PATCH 4/7] OAK-10449: try adding jackson-annotations runtime
 dependency

---
 oak-solr-osgi/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/oak-solr-osgi/pom.xml b/oak-solr-osgi/pom.xml
index 1abf1a4b744..783527c3e61 100644
--- a/oak-solr-osgi/pom.xml
+++ b/oak-solr-osgi/pom.xml
@@ -161,6 +161,12 @@
             <version><!-- see OAK-8829-->2.9.10</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version><!-- see OAK-8829-->2.9.10</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-smile</artifactId>

From e15a40eba6e625ba8dc8c0157a1309fa5f5fd0c3 Mon Sep 17 00:00:00 2001
From: Fabrizio Fortino <fabrizio.fortino@gmail.com>
Date: Wed, 20 Sep 2023 15:42:47 +0200
Subject: [PATCH 5/7] OAK-10449: use zookeeper 3.4.14 + (audience-annotations,
 19K) to work osgi issues around

---
 oak-solr-osgi/pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/oak-solr-osgi/pom.xml b/oak-solr-osgi/pom.xml
index 783527c3e61..83e61c64085 100644
--- a/oak-solr-osgi/pom.xml
+++ b/oak-solr-osgi/pom.xml
@@ -152,7 +152,7 @@
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
-            <version>3.6.2</version>
+            <version>3.4.14</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -161,12 +161,6 @@
             <version><!-- see OAK-8829-->2.9.10</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version><!-- see OAK-8829-->2.9.10</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-smile</artifactId>
@@ -184,6 +178,12 @@
             <artifactId>commons-math3</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.yetus</groupId>
+            <artifactId>audience-annotations</artifactId>
+            <version>0.5.0</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
 </project>

From a5abcc9088658916238e55414b694b5ba1dda112 Mon Sep 17 00:00:00 2001
From: Fabrizio Fortino <fabrizio.fortino@gmail.com>
Date: Wed, 20 Sep 2023 18:01:27 +0200
Subject: [PATCH 6/7] OAK-10449: set yetus.audience with resolution:=optimal

---
 oak-solr-osgi/pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/oak-solr-osgi/pom.xml b/oak-solr-osgi/pom.xml
index 83e61c64085..a196dbc931f 100644
--- a/oak-solr-osgi/pom.xml
+++ b/oak-solr-osgi/pom.xml
@@ -48,6 +48,7 @@
                             org.apache.hadoop.*;resolution:=optional,
                             org.apache.regexp.*;resolution:=optional,
                             org.apache.log4j.*;resolution:=optional,
+                            org.apache.yetus.audience.*;resolution:=optional,
                             org.jboss.netty.*;resolution:=optional,
                             org.restlet.*;resolution:=optional,
                             org.joda.time.*;resolution:=optional,
@@ -178,12 +179,6 @@
             <artifactId>commons-math3</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.yetus</groupId>
-            <artifactId>audience-annotations</artifactId>
-            <version>0.5.0</version>
-            <scope>runtime</scope>
-        </dependency>
     </dependencies>
 
 </project>

From 56e9eadb013873ca7f127dff603b3d005f4fca28 Mon Sep 17 00:00:00 2001
From: Fabrizio Fortino <fabrizio.fortino@gmail.com>
Date: Wed, 20 Sep 2023 18:01:27 +0200
Subject: [PATCH 7/7] OAK-10449: set yetus.audience with resolution:=optional

---
 oak-solr-osgi/pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/oak-solr-osgi/pom.xml b/oak-solr-osgi/pom.xml
index 83e61c64085..a196dbc931f 100644
--- a/oak-solr-osgi/pom.xml
+++ b/oak-solr-osgi/pom.xml
@@ -48,6 +48,7 @@
                             org.apache.hadoop.*;resolution:=optional,
                             org.apache.regexp.*;resolution:=optional,
                             org.apache.log4j.*;resolution:=optional,
+                            org.apache.yetus.audience.*;resolution:=optional,
                             org.jboss.netty.*;resolution:=optional,
                             org.restlet.*;resolution:=optional,
                             org.joda.time.*;resolution:=optional,
@@ -178,12 +179,6 @@
             <artifactId>commons-math3</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.yetus</groupId>
-            <artifactId>audience-annotations</artifactId>
-            <version>0.5.0</version>
-            <scope>runtime</scope>
-        </dependency>
     </dependencies>
 
 </project>