From 4c14156542952b7fbeb8cde6decec207473cedc8 Mon Sep 17 00:00:00 2001
From: "octo-sts[bot]" <157150467+octo-sts@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:03:00 +0000
Subject: [PATCH 1/2] kserve-modelmesh/0.12.0-r6: fix GHSA-4g8c-wm8x-jfhw

---
 kserve-modelmesh.yaml              |  2 +-
 kserve-modelmesh/pombump-deps.yaml | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/kserve-modelmesh.yaml b/kserve-modelmesh.yaml
index 9aec5c0e566..5fcb6f7d695 100644
--- a/kserve-modelmesh.yaml
+++ b/kserve-modelmesh.yaml
@@ -1,7 +1,7 @@
 package:
   name: kserve-modelmesh
   version: 0.12.0
-  epoch: 6
+  epoch: 7
   description: The ModelMesh framework is a mature, general-purpose model serving management/routing layer designed for high-scale, high-density and frequently-changing model use cases.
   dependencies:
     runtime:
diff --git a/kserve-modelmesh/pombump-deps.yaml b/kserve-modelmesh/pombump-deps.yaml
index 0e247dffccd..a3f9641f333 100644
--- a/kserve-modelmesh/pombump-deps.yaml
+++ b/kserve-modelmesh/pombump-deps.yaml
@@ -1,10 +1,13 @@
 patches:
-  - groupId: com.google.protobuf
-    artifactId: protobuf-java
-    version: 3.25.5
-  - groupId: commons-io
-    artifactId: commons-io
-    version: 2.14.0
-  - groupId: ch.qos.logback
-    artifactId: logback-core
-    version: 1.5.13
+    - groupId: com.google.protobuf
+      artifactId: protobuf-java
+      version: 3.25.5
+    - groupId: commons-io
+      artifactId: commons-io
+      version: 2.14.0
+    - groupId: ch.qos.logback
+      artifactId: logback-core
+      version: 1.5.13
+    - groupId: io.netty
+      artifactId: netty-handler
+      version: 4.1.118.Final

From 4e4a93cdaa090c30b82f6a26b6de4bb071f19720 Mon Sep 17 00:00:00 2001
From: Kyle Steere <kyle.steere@chainguard.dev>
Date: Sat, 22 Feb 2025 16:01:17 -0600
Subject: [PATCH 2/2] fixed build failures caused by netty4

---
 kserve-modelmesh/pombump-deps.yaml       | 3 ---
 kserve-modelmesh/pombump-properties.yaml | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/kserve-modelmesh/pombump-deps.yaml b/kserve-modelmesh/pombump-deps.yaml
index a3f9641f333..548e53748b6 100644
--- a/kserve-modelmesh/pombump-deps.yaml
+++ b/kserve-modelmesh/pombump-deps.yaml
@@ -8,6 +8,3 @@ patches:
     - groupId: ch.qos.logback
       artifactId: logback-core
       version: 1.5.13
-    - groupId: io.netty
-      artifactId: netty-handler
-      version: 4.1.118.Final
diff --git a/kserve-modelmesh/pombump-properties.yaml b/kserve-modelmesh/pombump-properties.yaml
index c4b01852049..ee565013561 100644
--- a/kserve-modelmesh/pombump-properties.yaml
+++ b/kserve-modelmesh/pombump-properties.yaml
@@ -1,3 +1,3 @@
 properties:
   - property: netty-version
-    value: "4.1.115.Final"
+    value: 4.1.118.Final