From 3846e52af8d60a7ffbc9fe7083e0ef49bf2f3e3c Mon Sep 17 00:00:00 2001
From: Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com>
Date: Wed, 25 Sep 2024 08:28:07 -0400
Subject: [PATCH] CNDB-11028: Port CASSANDRA-18190, this fixes the tests for
 now, but maybe we still want to check newer version for JDK22 specifically.
 Though this is the last ecj version to support JDK11. Upgrade: - ecj plus fix
 the java udf functions for JDK11+ - snakeyaml - it was already bumped in CNDB
 for security vulnerability - test dependencies:    jacoco, byteman - higher
 version than CNDB but it is needed for catching up on JDK22 in tests   
 findbugs - aligned with CNDB version but we probably want at some point to
 get to major version upgrade; not a priority for now    jmh, bytebuddy -
 bumped to latest versions as they are known for not working on newer JDK
 versions

---
 .build/parent-pom-template.xml                              | 6 +++---
 build.xml                                                   | 2 +-
 .../cassandra/cql3/functions/JavaBasedUDFunction.java       | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index b6f4b63e229f..4e9fb1bc791b 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -36,8 +36,8 @@
     </license>
   </licenses>
   <properties>
-    <bytebuddy.version>1.12.13</bytebuddy.version>
-    <byteman.version>4.0.20</byteman.version>
+    <bytebuddy.version>1.14.17</bytebuddy.version>
+    <byteman.version>4.0.23</byteman.version>
     <ohc.version>0.5.1</ohc.version>
 
     <!-- These are referenced in build.xml, so need to be propagated from there -->
@@ -930,7 +930,7 @@
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
-        <version>2.0.2</version>
+        <version>3.0.0</version>
       </dependency>
       <dependency>
         <groupId>com.clearspring.analytics</groupId>
diff --git a/build.xml b/build.xml
index 1cc9f378edc5..989f17226e5c 100644
--- a/build.xml
+++ b/build.xml
@@ -148,7 +148,7 @@
     </condition>
 
     <!-- https://www.eclemma.org/jacoco/ -->
-    <property name="jacoco.version" value="0.8.8"/>
+    <property name="jacoco.version" value="0.8.12"/>
     <property name="jacoco.export.dir" value="${build.dir}/jacoco/" />
     <property name="jacoco.partials.dir" value="${jacoco.export.dir}/partials" />
     <property name="jacoco.partialexecfile" value="${jacoco.partials.dir}/partial.exec" />
diff --git a/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java b/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
index e51b9cbfc6dc..03092f308c56 100644
--- a/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
+++ b/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
@@ -40,6 +40,8 @@
 import com.google.common.io.ByteStreams;
 
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
+import org.eclipse.jdt.internal.compiler.lookup.ModuleBinding;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;