From 0a75c48ce36afd42a6b2a519583b75f6fe69e3a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 17:23:37 +0000
Subject: [PATCH 1/4] Bump org.apache.solr:solr-core from 8.11.3 to 9.8.0 in
 /pulsar-io/solr

Bumps org.apache.solr:solr-core from 8.11.3 to 9.8.0.

---
updated-dependencies:
- dependency-name: org.apache.solr:solr-core
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pulsar-io/solr/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pulsar-io/solr/pom.xml b/pulsar-io/solr/pom.xml
index 03582fab49d28..bb55ec62b49fd 100644
--- a/pulsar-io/solr/pom.xml
+++ b/pulsar-io/solr/pom.xml
@@ -29,7 +29,7 @@
     </parent>
 
     <properties>
-        <solr.version>8.11.3</solr.version>
+        <solr.version>9.8.0</solr.version>
     </properties>
 
     <artifactId>pulsar-io-solr</artifactId>

From f70f4ec756bba9fdb4b619173fd1b2d1bc7ad490 Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Tue, 11 Feb 2025 13:45:46 -0800
Subject: [PATCH 2/4] Fixed test

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

diff --git a/pulsar-io/solr/pom.xml b/pulsar-io/solr/pom.xml
index bb55ec62b49fd..fa7cc77c1ad01 100644
--- a/pulsar-io/solr/pom.xml
+++ b/pulsar-io/solr/pom.xml
@@ -61,6 +61,12 @@
             <artifactId>solr-solrj</artifactId>
             <version>${solr.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-test-framework</artifactId>
+            <version>${solr.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-core</artifactId>

From 704990ab2a77e61fbbb75ddde82dd02016c54792 Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Wed, 12 Feb 2025 10:20:55 -0800
Subject: [PATCH 3/4] Fixed import name

---
 .../src/test/java/org/apache/pulsar/io/solr/SolrServerUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrServerUtil.java b/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrServerUtil.java
index cc59c6dce6bf6..270abc8da2439 100644
--- a/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrServerUtil.java
+++ b/pulsar-io/solr/src/test/java/org/apache/pulsar/io/solr/SolrServerUtil.java
@@ -20,7 +20,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.apache.solr.client.solrj.embedded.JettySolrRunner;
+import org.apache.solr.embedded.JettySolrRunner;
 
 import java.io.File;
 

From 23e0bb36c649dcfd77921525d4a2f821c6a79ce8 Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Wed, 12 Feb 2025 13:23:19 -0800
Subject: [PATCH 4/4] Fixed test jetty version

---
 pulsar-io/solr/pom.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pulsar-io/solr/pom.xml b/pulsar-io/solr/pom.xml
index fa7cc77c1ad01..7ea16bf417a82 100644
--- a/pulsar-io/solr/pom.xml
+++ b/pulsar-io/solr/pom.xml
@@ -35,6 +35,23 @@
     <artifactId>pulsar-io-solr</artifactId>
     <name>Pulsar IO :: Solr</name>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-bom</artifactId>
+                <version>10.0.22</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
+                <version>10.0.22</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>