From b68440f7499b36ed1db4d8f23c37842ab897a3da Mon Sep 17 00:00:00 2001
From: Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com>
Date: Wed, 30 Oct 2024 18:44:02 -0400
Subject: [PATCH] CNDB-11508: CQLSHLIB tests update

---
 conf/jvm22-server.options      | 2 +-
 pylib/cassandra-cqlsh-tests.sh | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/conf/jvm22-server.options b/conf/jvm22-server.options
index 518b559d27b7..79b83707f0a6 100644
--- a/conf/jvm22-server.options
+++ b/conf/jvm22-server.options
@@ -81,7 +81,7 @@
 # Java 11 (and newer) GC logging options:
 # See description of https://bugs.openjdk.java.net/browse/JDK-8046148 for details about the syntax
 # The following is the equivalent to -XX:+PrintGCDetails -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=10M
-# -Xlog:gc=info,heap*=debug,age*=debug,safepoint=info,promotion*=debug:file=/var/log/cassandra/gc.log:time,uptime,pid,tid,level:filecount=10,filesize=10485760
+-Xlog:gc=info,heap*=debug,age*=debug,safepoint=info,promotion*=debug:file=/var/log/cassandra/gc.log:time,uptime,pid,tid,level:filecount=10,filesize=10485760
 
 # Notes for Java 8 migration:
 #
diff --git a/pylib/cassandra-cqlsh-tests.sh b/pylib/cassandra-cqlsh-tests.sh
index e581b619dbac..ccc3aff42774 100755
--- a/pylib/cassandra-cqlsh-tests.sh
+++ b/pylib/cassandra-cqlsh-tests.sh
@@ -43,7 +43,6 @@ export CCM_CONFIG_DIR="${TMPDIR}/.ccm"
 export NUM_TOKENS="16"
 export CASSANDRA_DIR=${WORKSPACE}
 
-# Kate, there was some conflict after CNDB-10190, check this later, for now I focused on the unit tests so ignore it...
 if [[ -z "${version}" ]]; then
   version=$(grep 'property\s*name=\"base.version\"' ${CASSANDRA_DIR}/build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
 fi
@@ -51,9 +50,6 @@ fi
 if [[ -z "${java_version}" ]]; then
   java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}' | sed 's/^1\.//g' | awk -F. '{print $1}')
 fi
-if [[ ${java_version} -ge 11 ]]; then
-  export CASSANDRA_USE_JDK11=true
-fi
 
 if [[ -z "${python_version}" ]]; then
   python_version="3.8"