From 7d1b2b5f17c6c19848d3e3977cd88c6c12f856a9 Mon Sep 17 00:00:00 2001
From: "octo-sts[bot]" <157150467+octo-sts@users.noreply.github.com>
Date: Mon, 17 Feb 2025 22:34:14 +0000
Subject: [PATCH 1/6] wildfly/35.0.1-r0: fix GHSA-389x-839f-4rhx

---
 wildfly.yaml              | 4 +++-
 wildfly/pombump-deps.yaml | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 wildfly/pombump-deps.yaml

diff --git a/wildfly.yaml b/wildfly.yaml
index 05419b886a6..083171a3ad7 100644
--- a/wildfly.yaml
+++ b/wildfly.yaml
@@ -1,7 +1,7 @@
 package:
   name: wildfly
   version: 35.0.1
-  epoch: 0
+  epoch: 1
   description: WildFly Application Server
   copyright:
     - license: Apache-2.0
@@ -30,6 +30,8 @@ pipeline:
       tag: ${{package.version}}.Final
       expected-commit: 1ffef94b7a7ababb767b0dd20f7c0d754388ad12
 
+  - uses: maven/pombump
+
 subpackages:
   - range: openjdk-versions
     name: ${{package.name}}-openjdk-${{range.key}}
diff --git a/wildfly/pombump-deps.yaml b/wildfly/pombump-deps.yaml
new file mode 100644
index 00000000000..e6ddd4c88d8
--- /dev/null
+++ b/wildfly/pombump-deps.yaml
@@ -0,0 +1,4 @@
+patches:
+    - groupId: io.netty
+      artifactId: netty-common
+      version: 4.1.118

From 1b90c03aadc1a50e887934b50b44229a9efaa86e Mon Sep 17 00:00:00 2001
From: hbh7 <amber.arcadia@chainguard.dev>
Date: Tue, 18 Feb 2025 16:04:25 -0500
Subject: [PATCH 2/6] Fix netty version

Signed-off-by: hbh7 <amber.arcadia@chainguard.dev>
---
 wildfly/pombump-deps.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wildfly/pombump-deps.yaml b/wildfly/pombump-deps.yaml
index bc47318aecb..14e25085bd3 100644
--- a/wildfly/pombump-deps.yaml
+++ b/wildfly/pombump-deps.yaml
@@ -1,7 +1,7 @@
 patches:
     - groupId: io.netty
       artifactId: netty-common
-      version: 4.1.118
+      version: 4.1.118.Final
     - groupId: commons-io
       artifactId: commons-io
       version: 2.14.0

From 3839a52923931c355ee22c08412fb5836a63889e Mon Sep 17 00:00:00 2001
From: Amber Arcadia <amber.arcadia@chainguard.dev>
Date: Wed, 19 Feb 2025 22:22:36 +0000
Subject: [PATCH 3/6] Fixed netty version

---
 wildfly.yaml                    | 2 +-
 wildfly/pombump-properties.yaml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 wildfly/pombump-properties.yaml

diff --git a/wildfly.yaml b/wildfly.yaml
index 2f99ea043e7..17a86bbc724 100644
--- a/wildfly.yaml
+++ b/wildfly.yaml
@@ -1,7 +1,7 @@
 package:
   name: wildfly
   version: 35.0.1
-  epoch: 11
+  epoch: 12
   description: WildFly Application Server
   copyright:
     - license: Apache-2.0
diff --git a/wildfly/pombump-properties.yaml b/wildfly/pombump-properties.yaml
new file mode 100644
index 00000000000..544be7ec2eb
--- /dev/null
+++ b/wildfly/pombump-properties.yaml
@@ -0,0 +1,3 @@
+properties:
+  - property: legacy.version.io.netty
+    value: "4.1.118.Final"

From 9c6e5c330ff6aec8f677d26b52dc0c81e2fd2174 Mon Sep 17 00:00:00 2001
From: Amber Arcadia <amber.arcadia@chainguard.dev>
Date: Thu, 20 Feb 2025 16:58:08 +0000
Subject: [PATCH 4/6] Added second netty bump to fix CVE

---
 wildfly/pombump-properties.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wildfly/pombump-properties.yaml b/wildfly/pombump-properties.yaml
index 544be7ec2eb..ab07e2b23ef 100644
--- a/wildfly/pombump-properties.yaml
+++ b/wildfly/pombump-properties.yaml
@@ -1,3 +1,5 @@
 properties:
   - property: legacy.version.io.netty
     value: "4.1.118.Final"
+  - property: version.io.netty
+    value: "4.1.118.Final"

From 00de14bace12cba47ab77de86afc5f15430dc0dd Mon Sep 17 00:00:00 2001
From: Amber Arcadia <amber.arcadia@chainguard.dev>
Date: Thu, 20 Feb 2025 17:48:26 +0000
Subject: [PATCH 5/6] Remove obsolete commons-io bump

---
 wildfly/pombump-deps.yaml | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 wildfly/pombump-deps.yaml

diff --git a/wildfly/pombump-deps.yaml b/wildfly/pombump-deps.yaml
deleted file mode 100644
index 91bac87da11..00000000000
--- a/wildfly/pombump-deps.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-patches:
-    - groupId: commons-io
-      artifactId: commons-io
-      version: 2.14.0

From 2fdd28d79e5f8aa5b48b9e3764b2ae0d22e261e8 Mon Sep 17 00:00:00 2001
From: Amber Arcadia <amber.arcadia@chainguard.dev>
Date: Thu, 20 Feb 2025 18:23:00 +0000
Subject: [PATCH 6/6] Bumped velocity to resolve commons-io CVE

---
 wildfly/pombump-properties.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/wildfly/pombump-properties.yaml b/wildfly/pombump-properties.yaml
index ab07e2b23ef..4e74a388391 100644
--- a/wildfly/pombump-properties.yaml
+++ b/wildfly/pombump-properties.yaml
@@ -3,3 +3,5 @@ properties:
     value: "4.1.118.Final"
   - property: version.io.netty
     value: "4.1.118.Final"
+  - property: version.org.apache.velocity
+    value: "2.4.1"