From f94b2e33d87edb49dbf3a0984f02cde4c6daefc0 Mon Sep 17 00:00:00 2001
From: Batuhan Apaydin <batuhan.apaydin@chainguard.dev>
Date: Sun, 5 Nov 2023 00:56:08 +0300
Subject: [PATCH] upgrade the jetty version

Signed-off-by: Batuhan Apaydin <batuhan.apaydin@chainguard.dev>
---
 zookeeper-3.8.yaml                            |  6 ++++-
 zookeeper-3.8/upgrade-the-jetty-version.patch | 26 +++++++++++++++++++
 zookeeper-3.9.yaml                            |  6 ++++-
 zookeeper-3.9/upgrade-the-jetty-version.patch | 26 +++++++++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 zookeeper-3.8/upgrade-the-jetty-version.patch
 create mode 100644 zookeeper-3.9/upgrade-the-jetty-version.patch

diff --git a/zookeeper-3.8.yaml b/zookeeper-3.8.yaml
index 77ba7de1692..78d5b04e6da 100644
--- a/zookeeper-3.8.yaml
+++ b/zookeeper-3.8.yaml
@@ -1,7 +1,7 @@
 package:
   name: zookeeper-3.8
   version: 3.8.3.0
-  epoch: 5
+  epoch: 6
   description: Distributed, highly available, robust, fault-tolerant system for distributed coordination
   copyright:
     - license: Apache-2.0
@@ -40,6 +40,10 @@ pipeline:
       tag: release-${{vars.mangled-package-version}}
       expected-commit: 6ad6d364c7c0bcf0de452d54ebefa3058098ab56
 
+  - uses: patch
+    with:
+      patches: upgrade-the-jetty-version.patch
+
   - runs: |
       export LANG=en_US.UTF-8
       export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
diff --git a/zookeeper-3.8/upgrade-the-jetty-version.patch b/zookeeper-3.8/upgrade-the-jetty-version.patch
new file mode 100644
index 00000000000..40f961b71fc
--- /dev/null
+++ b/zookeeper-3.8/upgrade-the-jetty-version.patch
@@ -0,0 +1,26 @@
+From 28fd3caaac712914004c18eb27c8deb4000e4b28 Mon Sep 17 00:00:00 2001
+From: Batuhan Apaydin <batuhan.apaydin@chainguard.dev>
+Date: Sat, 4 Nov 2023 23:52:54 +0300
+Subject: [PATCH] upgrade the jetty version
+
+Signed-off-by: Batuhan Apaydin <batuhan.apaydin@chainguard.dev>
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index 6158b7f4e..d8444cdea 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -560,7 +560,7 @@
+     <hamcrest.version>2.2</hamcrest.version>
+     <commons-cli.version>1.5.0</commons-cli.version>
+     <netty.version>4.1.94.Final</netty.version>
+-    <jetty.version>9.4.52.v20230823</jetty.version>
++    <jetty.version>9.4.53.v20231009</jetty.version>
+     <jackson.version>2.15.2</jackson.version>
+     <jline.version>2.14.6</jline.version>
+     <snappy.version>1.1.10.5</snappy.version>
+-- 
+2.39.3 (Apple Git-145)
+
diff --git a/zookeeper-3.9.yaml b/zookeeper-3.9.yaml
index d1aeba1f8eb..5ab7fc8abd2 100644
--- a/zookeeper-3.9.yaml
+++ b/zookeeper-3.9.yaml
@@ -1,7 +1,7 @@
 package:
   name: zookeeper-3.9
   version: 3.9.1.0
-  epoch: 5
+  epoch: 6
   description: Distributed, highly available, robust, fault-tolerant system for distributed coordination
   copyright:
     - license: Apache-2.0
@@ -40,6 +40,10 @@ pipeline:
       tag: release-${{vars.mangled-package-version}}
       expected-commit: 1398af177833412e9ead6b9bb737dc9fd7418a45
 
+  - uses: patch
+    with:
+      patches: upgrade-the-jetty-version.patch
+
   - runs: |
       export LANG=en_US.UTF-8
       export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
diff --git a/zookeeper-3.9/upgrade-the-jetty-version.patch b/zookeeper-3.9/upgrade-the-jetty-version.patch
new file mode 100644
index 00000000000..40f961b71fc
--- /dev/null
+++ b/zookeeper-3.9/upgrade-the-jetty-version.patch
@@ -0,0 +1,26 @@
+From 28fd3caaac712914004c18eb27c8deb4000e4b28 Mon Sep 17 00:00:00 2001
+From: Batuhan Apaydin <batuhan.apaydin@chainguard.dev>
+Date: Sat, 4 Nov 2023 23:52:54 +0300
+Subject: [PATCH] upgrade the jetty version
+
+Signed-off-by: Batuhan Apaydin <batuhan.apaydin@chainguard.dev>
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index 6158b7f4e..d8444cdea 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -560,7 +560,7 @@
+     <hamcrest.version>2.2</hamcrest.version>
+     <commons-cli.version>1.5.0</commons-cli.version>
+     <netty.version>4.1.94.Final</netty.version>
+-    <jetty.version>9.4.52.v20230823</jetty.version>
++    <jetty.version>9.4.53.v20231009</jetty.version>
+     <jackson.version>2.15.2</jackson.version>
+     <jline.version>2.14.6</jline.version>
+     <snappy.version>1.1.10.5</snappy.version>
+-- 
+2.39.3 (Apple Git-145)
+