From 34f3ad497b12b0316e24116a275f3aca56bb23bc Mon Sep 17 00:00:00 2001
From: Jan Werner <jwerner@confluent.io>
Date: Mon, 11 Nov 2024 12:29:30 -0500
Subject: [PATCH 1/3] update java to version 17 and avro

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4df1cb61ccc..dd9919806e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
     <properties>
         <!--jacoco prepare-agent needs argLine defined to set this variable. if we don't have a default set then maven gets angry.-->
         <argLine></argLine>
-        <avro.version>1.11.4</avro.version>
+        <avro.version>1.12.0</avro.version>
         <classgraph.version>4.8.138</classgraph.version>
         <commons-io.version>2.16.0</commons-io.version>
         <aws-java-sdk.version>1.12.701</aws-java-sdk.version>
@@ -61,7 +61,7 @@
         <exec-maven-plugin.version>1.5.0</exec-maven-plugin.version>
         <spotbugs.version>4.7.1</spotbugs.version>
         <spotbugs.maven.plugin.version>4.7.1.0</spotbugs.maven.plugin.version>
-        <java.version>8</java.version>
+        <java.version>17</java.version>
         <jackson.version>2.16.0</jackson.version>
         <jetty.version>9.4.56.v20240826</jetty.version>
         <jose4j.version>0.9.5</jose4j.version>

From 34310351b8c50eca7073244495192300907683d2 Mon Sep 17 00:00:00 2001
From: Jan Werner <jwerner@confluent.io>
Date: Tue, 12 Nov 2024 07:53:51 -0500
Subject: [PATCH 2/3] revert bouncycastle bctls due to downstream failues

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

diff --git a/pom.xml b/pom.xml
index dd9919806e3..6e72402a95e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
         <!-- BC should be upated to version 2.0 in Q1 2025, bcutil-fips is 2.0 only, so no change there -->
         <bouncycastle.fips.version>1.0.2.4</bouncycastle.fips.version>
         <bouncycastle.bcutil-fips.version>2.0.3</bouncycastle.bcutil-fips.version>
-        <bouncycastle.tls-fips.version>1.0.19</bouncycastle.tls-fips.version>
+        <bouncycastle.tls-fips.version>1.0.13</bouncycastle.tls-fips.version>
         <bouncycastle.bcpkix-fips.version>1.0.7</bouncycastle.bcpkix-fips.version>
         <jmx_prometheus_javaagent.version>0.18.0</jmx_prometheus_javaagent.version>
         <jolokia-jvm.version>1.7.1</jolokia-jvm.version>

From 6a98be707a3735663a4fa257afcc3d3d5ea40633 Mon Sep 17 00:00:00 2001
From: Jan Werner <jwerner@confluent.io>
Date: Mon, 18 Nov 2024 11:49:21 -0500
Subject: [PATCH 3/3] update netty to 4.1.115

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

diff --git a/pom.xml b/pom.xml
index 6e72402a95e..8ea1ee66900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
         <mockito-all.version>1.10.19</mockito-all.version>
         <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
         <jaxb.version>2.3.0</jaxb.version>
-        <netty.version>4.1.113.Final</netty.version>
+        <netty.version>4.1.115.Final</netty.version>
         <hamcrest.version>1.3</hamcrest.version>
         <!-- okio version to match ce-kafka 7.8.x -->
         <okio.version>3.7.0</okio.version>