diff --git a/.build/cassandra-deps-template.xml b/.build/cassandra-deps-template.xml
index 4041a54195..4b69504b25 100644
--- a/.build/cassandra-deps-template.xml
+++ b/.build/cassandra-deps-template.xml
@@ -244,7 +244,7 @@
sigar
- org.eclipse.jdt.core.compiler
+ org.eclipse.jdt
ecj
diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index 53120c260d..af4a32d455 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -829,7 +829,7 @@
- org.eclipse.jdt.core.compiler
+ org.eclipse.jdt
ecj
${ecj.version}
diff --git a/CHANGES.txt b/CHANGES.txt
index 2fc9df8995..8f45c74136 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.0
+ * Upgrade ECJ to version 3.33.0 (CASSANDRA-18190)
* Fix ClassCastException from jdk GaloisCounterMode when using JDK17 provider (CASSANDRA-18180)
* Drop JDK8, add JDK17 (CASSANDRA-18255)
* Remove WaitingOnFreeMemtableSpace and DroppedMutations metrics (CASSANDRA-18298)
diff --git a/build.xml b/build.xml
index eb221855ad..ef5910f85e 100644
--- a/build.xml
+++ b/build.xml
@@ -143,7 +143,7 @@
-
+
diff --git a/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java b/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
index 132721e986..c84ab5668b 100644
--- a/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
+++ b/src/java/org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java
@@ -59,6 +59,8 @@ import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
+import org.eclipse.jdt.internal.compiler.lookup.ModuleBinding;
import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
public final class JavaBasedUDFunction extends UDFunction
@@ -138,9 +140,9 @@ public final class JavaBasedUDFunction extends UDFunction
settings.put(CompilerOptions.OPTION_ReportDeprecation,
CompilerOptions.IGNORE);
settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+ CompilerOptions.VERSION_11);
settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_1_8);
+ CompilerOptions.VERSION_11);
compilerOptions = new CompilerOptions(settings);
compilerOptions.parseLiteralExpressionsAsConstants = true;
@@ -538,6 +540,30 @@ public final class JavaBasedUDFunction extends UDFunction
return false;
}
+ @Override
+ public ModuleBinding module(LookupEnvironment environment)
+ {
+ return environment.getModule(this.getModuleName());
+ }
+
+ @Override
+ public char[] getModuleName()
+ {
+ return null;
+ }
+
+ @Override
+ public String getDestinationPath()
+ {
+ return null;
+ }
+
+ @Override
+ public String getExternalAnnotationPath(String qualifiedTypeName)
+ {
+ return null;
+ }
+
// ICompilerRequestor
@Override