From 97554498ce71a29d81c85400bfd14cd8c62b52b7 Mon Sep 17 00:00:00 2001
From: henschi <to@h6l.de>
Date: Thu, 27 Mar 2025 14:15:49 +0100
Subject: [PATCH 1/5] upgrade ivy to 2.5.3 (CVE fixes)

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

diff --git a/build.xml b/build.xml
index 5e0196904..9bf2770db 100644
--- a/build.xml
+++ b/build.xml
@@ -60,7 +60,7 @@
   <target name="install-ivy" description="--> install ivy">
     <local name="ivy.download.dir"/><property name="ivy.download.dir" value="${basedir}/ivy" />
     <local name="ivy.download.file"/><property name="ivy.download.file" value="${ivy.download.dir}/ivy.jar" />
-    <local name="ivy.download.version"/><property name="ivy.install.version" value="2.5.0"/>
+    <local name="ivy.download.version"/><property name="ivy.install.version" value="2.5.3"/>
     <local name="ivy.debian.file"/><property name="ivy.debian.file" value="/usr/share/java/ivy.jar" />
 
     <!-- Check whether ivy is already available as a Debian package -->

From 7fc1995a24a94737a4c25da1fd9f992cb3c3fb45 Mon Sep 17 00:00:00 2001
From: henschi <to@h6l.de>
Date: Thu, 27 Mar 2025 14:53:29 +0100
Subject: [PATCH 2/5] remove ivy.jar in ant clean call

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

diff --git a/build.xml b/build.xml
index 9bf2770db..f159ea291 100644
--- a/build.xml
+++ b/build.xml
@@ -401,6 +401,7 @@
   <target name="clean" description="make clean">
     <delete dir="${release_main}" failonerror="false"/>
     <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="${src}" includes="**/*.class" />
       <fileset dir="${build}" includes="**/*.class" />

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/5] 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/5] 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/5] 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"/>