From 7532761506005f07384ee809b53d553a4d569209 Mon Sep 17 00:00:00 2001
From: Henschi <to@h6l.de>
Date: Sat, 29 Mar 2025 19:47:06 +0100
Subject: [PATCH 1/6] clean libt directory in ant call clean

---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index f159ea291..d99715406 100644
--- a/build.xml
+++ b/build.xml
@@ -403,6 +403,7 @@
     <delete failonerror="false">
       <fileset dir="${basedir}/ivy" includes="**/*.jar" />
       <fileset dir="${lib}" includes="**/*.jar" excludes="org.restlet.jar" /> <!-- we cannot find the org.restlet.jar in maven -->
+      <fileset dir="${libt}" includes="**/*.jar" />
       <fileset dir="${src}" includes="**/*.class" />
       <fileset dir="${build}" includes="**/*.class" />
       <fileset dir="test/" includes="**/*.class" />

From ac11d27659882fceabc89172611ac072a0540c3a Mon Sep 17 00:00:00 2001
From: Henschi <to@h6l.de>
Date: Sat, 29 Mar 2025 19:49:29 +0100
Subject: [PATCH 2/6] upgrade junit to 4.13.2 and use the appropriate hamcrest
 version 1.3

---
 ivy.xml         | 6 ++----
 libt/.gitignore | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 54a6a62e5..0aea1fb41 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -100,10 +100,8 @@
       <dependency org="org.tukaani" name="xz" rev="1.8"/>
       <dependency org="oro" name="oro" rev="2.0.8"/>
 
-      <dependency org="junit" name="junit" rev="4.13" conf="test->default"/>
-      <dependency org="org.hamcrest" name="hamcrest" rev="2.2" conf="test->default"/>
-      <dependency org="org.hamcrest" name="hamcrest-core" rev="2.2" conf="test->default"/>
-      <dependency org="org.hamcrest" name="hamcrest-library" rev="2.2" conf="test->default"/>
+      <dependency org="junit" name="junit" rev="4.13.2" conf="test->default"/>
+      <dependency org="org.hamcrest" name="hamcrest-core" rev="1.3" conf="test->default"/>
       <dependency org="com.github.luben" name="zstd-jni" rev="1.5.5-6"></dependency>
       <dependency org="ai.djl" name ="api" rev="0.27.0"></dependency>
     </dependencies>
diff --git a/libt/.gitignore b/libt/.gitignore
index 18990a45e..8a1453ab9 100644
--- a/libt/.gitignore
+++ b/libt/.gitignore
@@ -1,4 +1,2 @@
-hamcrest-2.2.jar
-hamcrest-core-2.2.jar
-hamcrest-library-2.2.jar
-junit-4.13.jar
\ No newline at end of file
+hamcrest-core-1.3.jar
+junit-4.13.2.jar

From ebee86efa3a1c27e905f2613dc5680d81fe4eb9d Mon Sep 17 00:00:00 2001
From: Henschi <to@h6l.de>
Date: Sun, 30 Mar 2025 14:42:26 +0200
Subject: [PATCH 3/6] update zookeeper to 3.7.0 to use the correct version for
 Solr 9.0

---
 ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ivy.xml b/ivy.xml
index 54a6a62e5..3359262d9 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -66,7 +66,7 @@
       <dependency org="org.apache.solr" name="solr-core" rev="9.0.0" conf="compile->master"/>
       <dependency org="org.apache.solr" name="solr-scripting" rev="9.0.0" conf="compile->master"/>
       <dependency org="org.apache.solr" name="solr-solrj" rev="9.0.0" conf="compile->master" />
-      <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.6.2" conf="compile->master" />
+      <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.7.0" conf="compile->master" />
       <dependency org="org.bitlet" name="weupnp" rev="0.1.4"  />
       <dependency org="org.bouncycastle" name="bcmail-jdk18on" rev="1.79" />
       <dependency org="org.codehaus.woodstox" name="woodstox-core-asl" rev="4.4.1">

From 5c4c529faeec86d0fa00a17d72a0e2479f931e75 Mon Sep 17 00:00:00 2001
From: Henschi <to@h6l.de>
Date: Sun, 30 Mar 2025 17:29:00 +0200
Subject: [PATCH 4/6] update woodstox-core (including the renaming) to 6.2.8 to
 use the correct version for Solr 9.0

---
 ivy.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 54a6a62e5..888896833 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -69,9 +69,7 @@
       <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.6.2" conf="compile->master" />
       <dependency org="org.bitlet" name="weupnp" rev="0.1.4"  />
       <dependency org="org.bouncycastle" name="bcmail-jdk18on" rev="1.79" />
-      <dependency org="org.codehaus.woodstox" name="woodstox-core-asl" rev="4.4.1">
-        <exclude module="stax-api" />
-      </dependency>
+      <dependency org="com.fasterxml.woodstox" name="woodstox-core" rev="6.2.8" />
       <dependency org="org.eclipse.jetty" name="jetty-client" rev="9.4.56.v20240826" />
       <dependency org="org.eclipse.jetty" name="jetty-deploy" rev="9.4.56.v20240826" conf="compile->master" />
       <dependency org="org.eclipse.jetty" name="jetty-jmx" rev="9.4.56.v20240826" conf="compile->master"/>

From 1e6508b6b178d63e2ba4b8664265a274f0f13f92 Mon Sep 17 00:00:00 2001
From: Henschi <to@h6l.de>
Date: Sun, 30 Mar 2025 17:50:09 +0200
Subject: [PATCH 5/6] update metrics-core to 4.1.5 to use the correct version
 for Solr 9.0

---
 ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ivy.xml b/ivy.xml
index 54a6a62e5..5e856b5c8 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -25,7 +25,7 @@
       <dependency org="commons-codec" name="commons-codec" rev="1.15" />
       <dependency org="commons-io" name="commons-io" rev="2.17.0" />
       <dependency org="commons-logging" name="commons-logging" rev="1.2" />
-      <dependency org="io.dropwizard.metrics" name="metrics-core" rev="3.2.2"/>
+      <dependency org="io.dropwizard.metrics" name="metrics-core" rev="4.1.5"/>
       <dependency org="io.dropwizard.metrics" name="metrics-jmx" rev="4.1.5" conf="compile->master"/>
       <dependency org="io.opentracing" name="opentracing-noop" rev="0.33.0"/>
       <dependency org="io.opentracing" name="opentracing-util" rev="0.33.0"/>

From 2b7c4ec5772236a6cf0e3f2fd71dd692e6b5676c Mon Sep 17 00:00:00 2001
From: Burkhard <11603289+reger24@users.noreply.github.com>
Date: Mon, 31 Mar 2025 21:08:13 +0200
Subject: [PATCH 6/6] fic Merge pull request #689 from henschi/jetty9.4.57
 ivy.xml conflicts

---
 ivy.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index fadbbc192..e56cf4b0e 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -70,15 +70,15 @@
       <dependency org="org.bitlet" name="weupnp" rev="0.1.4"  />
       <dependency org="org.bouncycastle" name="bcmail-jdk18on" rev="1.79" />
       <dependency org="com.fasterxml.woodstox" name="woodstox-core" rev="6.2.8" />
-      <dependency org="org.eclipse.jetty" name="jetty-client" rev="9.4.56.v20240826" />
-      <dependency org="org.eclipse.jetty" name="jetty-deploy" rev="9.4.56.v20240826" conf="compile->master" />
-      <dependency org="org.eclipse.jetty" name="jetty-jmx" rev="9.4.56.v20240826" conf="compile->master"/>
-      <dependency org="org.eclipse.jetty" name="jetty-http" rev="9.4.56.v20240826"/>
-      <dependency org="org.eclipse.jetty" name="jetty-proxy" rev="9.4.56.v20240826"/>
-      <dependency org="org.eclipse.jetty" name="jetty-security" rev="9.4.56.v20240826"/>
-      <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.56.v20240826"/>
-      <dependency org="org.eclipse.jetty" name="jetty-servlets" rev="9.4.56.v20240826"/>
-      <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.4.56.v20240826">
+      <dependency org="org.eclipse.jetty" name="jetty-client" rev="9.4.57.v20241219" />
+      <dependency org="org.eclipse.jetty" name="jetty-deploy" rev="9.4.57.v20241219" conf="compile->master" />
+      <dependency org="org.eclipse.jetty" name="jetty-jmx" rev="9.4.57.v20241219" conf="compile->master"/>
+      <dependency org="org.eclipse.jetty" name="jetty-http" rev="9.4.57.v20241219"/>
+      <dependency org="org.eclipse.jetty" name="jetty-proxy" rev="9.4.57.v20241219"/>
+      <dependency org="org.eclipse.jetty" name="jetty-security" rev="9.4.57.v20241219"/>
+      <dependency org="org.eclipse.jetty" name="jetty-server" rev="9.4.57.v20241219"/>
+      <dependency org="org.eclipse.jetty" name="jetty-servlets" rev="9.4.57.v20241219"/>
+      <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="9.4.57.v20241219">
         <exclude module="jetty-util-ajax" />
       </dependency>
       <dependency org="org.eclipse.jetty" name="jetty-util" rev="9.4.57.v20241219"  />