From 042735be0f2b8b8cbd7f71dc2ecdecb3b53de705 Mon Sep 17 00:00:00 2001
From: William Barnhart <williambbarnhart@gmail.com>
Date: Sun, 6 Aug 2023 22:40:23 -0400
Subject: [PATCH 01/14] Add newer Kafka versions to the pipeline

---
 .github/workflows/python-package.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 37875fb9f..3cd4b196f 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -127,6 +127,8 @@ jobs:
           - "2.4.0"
           - "2.5.0"
           - "2.6.0"
+          - "3.4.0"
+          - "3.5.0"
     steps:
       - name: Checkout the source code
         uses: actions/checkout@v3

From 30d90bbd4d546e13cfb31d8210e0c0e92a19f77f Mon Sep 17 00:00:00 2001
From: William Barnhart <williambbarnhart@gmail.com>
Date: Mon, 7 Aug 2023 09:51:33 -0400
Subject: [PATCH 02/14] Update build_integration.sh to define scala versions

---
 build_integration.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build_integration.sh b/build_integration.sh
index c020b0fe2..24bb504e9 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -20,6 +20,11 @@ pushd servers
         if [ ! -d "$kafka" ]; then
           git clone $KAFKA_SRC_GIT $kafka
         fi
+        if [ "$kafka" == "0.8.0" ]; then
+          SCALA_VERSION="2.8.0"
+        else if [ "$kafka" \> "2.4.0" ]; then
+          SCALA_VERSION="2.12"
+          KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}.tgz"
         pushd $kafka
           git pull
           ./gradlew -PscalaVersion=$SCALA_VERSION -Pversion=$kafka releaseTarGz -x signArchives
@@ -33,12 +38,6 @@ pushd servers
         echo "-------------------------------------"
         echo "Checking kafka binaries for ${kafka}"
         echo
-        if [ "$kafka" == "0.8.0" ]; then
-          KAFKA_ARTIFACT="kafka_2.8.0-${kafka}.tar.gz"
-        else if [ "$kafka" \> "2.4.0" ]; then
-          KAFKA_ARTIFACT="kafka_2.12-${kafka}.tgz"
-        else
-          KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}.tgz"
         fi
         fi
         if [ ! -f "../$kafka/kafka-bin/bin/kafka-run-class.sh" ]; then

From fb84118dfe12bb9863e2868f57a157b315c2144d Mon Sep 17 00:00:00 2001
From: William Barnhart <williambbarnhart@gmail.com>
Date: Mon, 7 Aug 2023 10:08:59 -0400
Subject: [PATCH 03/14] unindent KAFKA_ARTIFACT

---
 build_integration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_integration.sh b/build_integration.sh
index 24bb504e9..39a71b87a 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -24,7 +24,7 @@ pushd servers
           SCALA_VERSION="2.8.0"
         else if [ "$kafka" \> "2.4.0" ]; then
           SCALA_VERSION="2.12"
-          KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}.tgz"
+        KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}.tgz"
         pushd $kafka
           git pull
           ./gradlew -PscalaVersion=$SCALA_VERSION -Pversion=$kafka releaseTarGz -x signArchives

From 16b896931d1ac0e37e1534fd87689fca03c543d6 Mon Sep 17 00:00:00 2001
From: William Barnhart <williambbarnhart@gmail.com>
Date: Mon, 7 Aug 2023 10:16:28 -0400
Subject: [PATCH 04/14] forgot fi

---
 build_integration.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_integration.sh b/build_integration.sh
index 39a71b87a..589270a6a 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -24,6 +24,7 @@ pushd servers
           SCALA_VERSION="2.8.0"
         else if [ "$kafka" \> "2.4.0" ]; then
           SCALA_VERSION="2.12"
+        fi
         KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}.tgz"
         pushd $kafka
           git pull

From e691608d2230dc5a65a844da661aabd61f2c6c62 Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 10:53:21 -0400
Subject: [PATCH 05/14] fix build integration logic

---
 build_integration.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/build_integration.sh b/build_integration.sh
index 589270a6a..b62ab2b08 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-: ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.2 0.11.0.3 1.0.2 1.1.1 2.0.1 2.1.1 2.2.1 2.3.0 2.4.0 2.5.0"}
+: ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.2 0.11.0.3 1.0.2 1.1.1 2.0.1 2.1.1 2.2.1 2.3.0 2.4.0 2.5.0, 3.4.0 3.5.0"}
 : ${SCALA_VERSION:=2.11}
 : ${DIST_BASE_URL:=https://archive.apache.org/dist/kafka/}
 : ${KAFKA_SRC_GIT:=https://github.com/apache/kafka.git}
@@ -16,16 +16,16 @@ pushd servers
   mkdir -p dist
   pushd dist
     for kafka in $KAFKA_VERSION; do
+      if [ "$kafka" == "0.8.0" ]; then
+        SCALA_VERSION="2.8.0"
+      elif [ "$kafka" \> "2.4.0" ]; then
+        SCALA_VERSION="2.12"
+      fi
+      KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}.tgz"
       if [ "$kafka" == "trunk" ]; then
         if [ ! -d "$kafka" ]; then
           git clone $KAFKA_SRC_GIT $kafka
         fi
-        if [ "$kafka" == "0.8.0" ]; then
-          SCALA_VERSION="2.8.0"
-        else if [ "$kafka" \> "2.4.0" ]; then
-          SCALA_VERSION="2.12"
-        fi
-        KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}.tgz"
         pushd $kafka
           git pull
           ./gradlew -PscalaVersion=$SCALA_VERSION -Pversion=$kafka releaseTarGz -x signArchives
@@ -39,8 +39,6 @@ pushd servers
         echo "-------------------------------------"
         echo "Checking kafka binaries for ${kafka}"
         echo
-        fi
-        fi
         if [ ! -f "../$kafka/kafka-bin/bin/kafka-run-class.sh" ]; then
           if [ -f "${KAFKA_ARTIFACT}" ]; then
             echo "Using cached artifact: ${KAFKA_ARTIFACT}"
@@ -55,7 +53,8 @@ pushd servers
             fi
           fi
           echo
-          echo "Extracting kafka ${kafka} binaries"
+          echo "Extracting kafka ${kafka} binaries from ${KAFKA_ARTIFACT} into $(pwd)/${kafka}"
+          mkdir -p ../$kafka/
           tar xzvf ${KAFKA_ARTIFACT} -C ../$kafka/
           rm -rf ../$kafka/kafka-bin
           mv ../$kafka/${KAFKA_ARTIFACT/%.t*/} ../$kafka/kafka-bin

From 1515880b48d24721478d1bd1df46695d96110f53 Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 10:54:14 -0400
Subject: [PATCH 06/14] remove comma

---
 build_integration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_integration.sh b/build_integration.sh
index b62ab2b08..0d41fda34 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-: ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.2 0.11.0.3 1.0.2 1.1.1 2.0.1 2.1.1 2.2.1 2.3.0 2.4.0 2.5.0, 3.4.0 3.5.0"}
+: ${ALL_RELEASES:="0.8.2.2 0.9.0.1 0.10.1.1 0.10.2.2 0.11.0.3 1.0.2 1.1.1 2.0.1 2.1.1 2.2.1 2.3.0 2.4.0 2.5.0 3.4.0 3.5.0"}
 : ${SCALA_VERSION:=2.11}
 : ${DIST_BASE_URL:=https://archive.apache.org/dist/kafka/}
 : ${KAFKA_SRC_GIT:=https://github.com/apache/kafka.git}

From eb2ce38efab17c52f38f0b212867d32382bc8165 Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 10:59:35 -0400
Subject: [PATCH 07/14] set scala back to 2.11 if neither

---
 build_integration.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build_integration.sh b/build_integration.sh
index 0d41fda34..2c5bf4d95 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -20,6 +20,8 @@ pushd servers
         SCALA_VERSION="2.8.0"
       elif [ "$kafka" \> "2.4.0" ]; then
         SCALA_VERSION="2.12"
+      else
+        SCALA_VERSION="2.11"
       fi
       KAFKA_ARTIFACT="kafka_${SCALA_VERSION}-${kafka}.tgz"
       if [ "$kafka" == "trunk" ]; then

From a4e11b1bd3111c896184070b797857b6535921c5 Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 11:03:04 -0400
Subject: [PATCH 08/14] copy over resources if dne

---
 build_integration.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build_integration.sh b/build_integration.sh
index 2c5bf4d95..9686f1c37 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -59,11 +59,14 @@ pushd servers
           mkdir -p ../$kafka/
           tar xzvf ${KAFKA_ARTIFACT} -C ../$kafka/
           rm -rf ../$kafka/kafka-bin
-          mv ../$kafka/${KAFKA_ARTIFACT/%.t*/} ../$kafka/kafka-bin
+          mv ../$kafka/${kafka_artifact/%.t*/} ../$kafka/kafka-bin
           if [ ! -f "../$kafka/kafka-bin/bin/kafka-run-class.sh" ]; then
             echo "Extraction Failed ($kafka/kafka-bin/bin/kafka-run-class.sh does not exist)!"
             exit 1
           fi
+          if [ ! -d "../$kafka/resources" ]; then
+            cp ../$kafka/kafka-bin/config  ../$kafka/resources
+          fi
         else
           echo "$kafka is already installed in servers/$kafka/ -- skipping"
         fi

From 2653460ae8a92104822857614a76923b5a048d15 Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 11:20:15 -0400
Subject: [PATCH 09/14] copy resources in  build_integration.sh as needed

---
 build_integration.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build_integration.sh b/build_integration.sh
index 9686f1c37..90856cba4 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -59,19 +59,19 @@ pushd servers
           mkdir -p ../$kafka/
           tar xzvf ${KAFKA_ARTIFACT} -C ../$kafka/
           rm -rf ../$kafka/kafka-bin
-          mv ../$kafka/${kafka_artifact/%.t*/} ../$kafka/kafka-bin
+          mv ../$kafka/${KAFKA_ARTIFACT/%.t*/} ../$kafka/kafka-bin
           if [ ! -f "../$kafka/kafka-bin/bin/kafka-run-class.sh" ]; then
             echo "Extraction Failed ($kafka/kafka-bin/bin/kafka-run-class.sh does not exist)!"
             exit 1
           fi
-          if [ ! -d "../$kafka/resources" ]; then
-            cp ../$kafka/kafka-bin/config  ../$kafka/resources
-          fi
         else
           echo "$kafka is already installed in servers/$kafka/ -- skipping"
         fi
       fi
-      echo
+      if [ ! -d "../$kafka/resources" ]; then
+        echo "resources not defined -- copying from ${kafka}/kafka-bin/config"
+        cp -r ../$kafka/kafka-bin/config  ../$kafka/resources
+      fi
     done
   popd
 popd

From 61a1a8d17cbb373bec3f68fa8174bf0a9f4d8470 Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 12:06:16 -0400
Subject: [PATCH 10/14] copy resources from trunk

---
 build_integration.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_integration.sh b/build_integration.sh
index 90856cba4..1b4d441a3 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -69,8 +69,8 @@ pushd servers
         fi
       fi
       if [ ! -d "../$kafka/resources" ]; then
-        echo "resources not defined -- copying from ${kafka}/kafka-bin/config"
-        cp -r ../$kafka/kafka-bin/config  ../$kafka/resources
+        echo "resources not defined -- copying from trunk/resources"
+        cp -r ../trunk/resources  ../$kafka/
       fi
     done
   popd

From 6b03f92af70b48e0be95653ca5e42b8ebd571f73 Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 12:20:13 -0400
Subject: [PATCH 11/14] add default resources since kraft is on its way to
 replace

---
 build_integration.sh                          |   4 +-
 servers/.default/resources/kafka.properties   | 147 ++++++++++++++++++
 .../.default/resources/kafka_server_jaas.conf |   4 +
 servers/.default/resources/log4j.properties   |  25 +++
 .../.default/resources/zookeeper.properties   |  21 +++
 5 files changed, 199 insertions(+), 2 deletions(-)
 create mode 100644 servers/.default/resources/kafka.properties
 create mode 100644 servers/.default/resources/kafka_server_jaas.conf
 create mode 100644 servers/.default/resources/log4j.properties
 create mode 100644 servers/.default/resources/zookeeper.properties

diff --git a/build_integration.sh b/build_integration.sh
index 1b4d441a3..d581de5d6 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -69,8 +69,8 @@ pushd servers
         fi
       fi
       if [ ! -d "../$kafka/resources" ]; then
-        echo "resources not defined -- copying from trunk/resources"
-        cp -r ../trunk/resources  ../$kafka/
+        echo "resources not defined -- copying from default/resources"
+        cp -r ../default/resources  ../$kafka/
       fi
     done
   popd
diff --git a/servers/.default/resources/kafka.properties b/servers/.default/resources/kafka.properties
new file mode 100644
index 000000000..5775cfdc4
--- /dev/null
+++ b/servers/.default/resources/kafka.properties
@@ -0,0 +1,147 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# see kafka.server.KafkaConfig for additional details and defaults
+
+############################# Server Basics #############################
+
+# The id of the broker. This must be set to a unique integer for each broker.
+broker.id={broker_id}
+
+############################# Socket Server Settings #############################
+
+listeners={transport}://{host}:{port}
+security.inter.broker.protocol={transport}
+
+{sasl_config}
+
+ssl.keystore.location={ssl_dir}/kafka.server.keystore.jks
+ssl.keystore.password=foobar
+ssl.key.password=foobar
+ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
+ssl.truststore.password=foobar
+
+authorizer.class.name=kafka.security.auth.SimpleAclAuthorizer
+allow.everyone.if.no.acl.found=true
+
+# The port the socket server listens on
+#port=9092
+
+# Hostname the broker will bind to. If not set, the server will bind to all interfaces
+#host.name=localhost
+
+# Hostname the broker will advertise to producers and consumers. If not set, it uses the
+# value for "host.name" if configured.  Otherwise, it will use the value returned from
+# java.net.InetAddress.getCanonicalHostName().
+#advertised.host.name=<hostname routable by clients>
+
+# The port to publish to ZooKeeper for clients to use. If this is not set,
+# it will publish the same port that the broker binds to.
+#advertised.port=<port accessible by clients>
+
+# The number of threads handling network requests
+num.network.threads=3
+ 
+# The number of threads doing disk I/O
+num.io.threads=8
+
+# The send buffer (SO_SNDBUF) used by the socket server
+socket.send.buffer.bytes=102400
+
+# The receive buffer (SO_RCVBUF) used by the socket server
+socket.receive.buffer.bytes=102400
+
+# The maximum size of a request that the socket server will accept (protection against OOM)
+socket.request.max.bytes=104857600
+
+
+############################# Log Basics #############################
+
+# A comma seperated list of directories under which to store log files
+log.dirs={tmp_dir}/data
+
+# The default number of log partitions per topic. More partitions allow greater
+# parallelism for consumption, but this will also result in more files across
+# the brokers.
+num.partitions={partitions}
+default.replication.factor={replicas}
+
+## Short Replica Lag -- Drops failed brokers out of ISR
+replica.lag.time.max.ms=1000
+replica.socket.timeout.ms=1000
+
+############################# Log Flush Policy #############################
+
+# Messages are immediately written to the filesystem but by default we only fsync() to sync
+# the OS cache lazily. The following configurations control the flush of data to disk. 
+# There are a few important trade-offs here:
+#    1. Durability: Unflushed data may be lost if you are not using replication.
+#    2. Latency: Very large flush intervals may lead to latency spikes when the flush does occur as there will be a lot of data to flush.
+#    3. Throughput: The flush is generally the most expensive operation, and a small flush interval may lead to exceessive seeks. 
+# The settings below allow one to configure the flush policy to flush data after a period of time or
+# every N messages (or both). This can be done globally and overridden on a per-topic basis.
+
+# The number of messages to accept before forcing a flush of data to disk
+#log.flush.interval.messages=10000
+
+# The maximum amount of time a message can sit in a log before we force a flush
+#log.flush.interval.ms=1000
+
+############################# Log Retention Policy #############################
+
+# The following configurations control the disposal of log segments. The policy can
+# be set to delete segments after a period of time, or after a given size has accumulated.
+# A segment will be deleted whenever *either* of these criteria are met. Deletion always happens
+# from the end of the log.
+
+# The minimum age of a log file to be eligible for deletion
+log.retention.hours=168
+
+# A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
+# segments don't drop below log.retention.bytes.
+#log.retention.bytes=1073741824
+
+# The maximum size of a log segment file. When this size is reached a new log segment will be created.
+log.segment.bytes=1073741824
+
+# The interval at which log segments are checked to see if they can be deleted according 
+# to the retention policies
+log.retention.check.interval.ms=300000
+
+# By default the log cleaner is disabled and the log retention policy will default to just delete segments after their retention expires.
+# If log.cleaner.enable=true is set the cleaner will be enabled and individual logs can then be marked for log compaction.
+log.cleaner.enable=false
+
+# tune down offset topics to reduce setup time in tests
+offsets.commit.timeout.ms=500
+offsets.topic.num.partitions=2
+offsets.topic.replication.factor=1
+
+# Allow shorter session timeouts for tests
+group.min.session.timeout.ms=1000
+
+
+############################# Zookeeper #############################
+
+# Zookeeper connection string (see zookeeper docs for details).
+# This is a comma separated host:port pairs, each corresponding to a zk
+# server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002".
+# You can also append an optional chroot string to the urls to specify the
+# root directory for all kafka znodes.
+zookeeper.connect={zk_host}:{zk_port}/{zk_chroot}
+
+# Timeout in ms for connecting to zookeeper
+zookeeper.connection.timeout.ms=30000
+# We want to expire kafka broker sessions quickly when brokers die b/c we restart them quickly
+zookeeper.session.timeout.ms=500
diff --git a/servers/.default/resources/kafka_server_jaas.conf b/servers/.default/resources/kafka_server_jaas.conf
new file mode 100644
index 000000000..18efe4369
--- /dev/null
+++ b/servers/.default/resources/kafka_server_jaas.conf
@@ -0,0 +1,4 @@
+KafkaServer {{
+    {jaas_config}
+}};
+Client {{}};
\ No newline at end of file
diff --git a/servers/.default/resources/log4j.properties b/servers/.default/resources/log4j.properties
new file mode 100644
index 000000000..b0b76aa79
--- /dev/null
+++ b/servers/.default/resources/log4j.properties
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+log4j.rootLogger=INFO, stdout, logfile
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
+
+log4j.appender.logfile=org.apache.log4j.FileAppender
+log4j.appender.logfile.File=${kafka.logs.dir}/server.log
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logfile.layout.ConversionPattern=[%d] %p %m (%c)%n
diff --git a/servers/.default/resources/zookeeper.properties b/servers/.default/resources/zookeeper.properties
new file mode 100644
index 000000000..e3fd09742
--- /dev/null
+++ b/servers/.default/resources/zookeeper.properties
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# the directory where the snapshot is stored.
+dataDir={tmp_dir}
+# the port at which the clients will connect
+clientPort={port}
+clientPortAddress={host}
+# disable the per-ip limit on the number of connections since this is a non-production config
+maxClientCnxns=0

From 96375585e621782fe1a0dc0bf740d75f0cc2612d Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 12:27:03 -0400
Subject: [PATCH 12/14] fix typo

---
 build_integration.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_integration.sh b/build_integration.sh
index d581de5d6..e1705546f 100755
--- a/build_integration.sh
+++ b/build_integration.sh
@@ -69,8 +69,8 @@ pushd servers
         fi
       fi
       if [ ! -d "../$kafka/resources" ]; then
-        echo "resources not defined -- copying from default/resources"
-        cp -r ../default/resources  ../$kafka/
+        echo "resources not defined -- copying from .default/resources"
+        cp -r ../.default/resources  ../$kafka/
       fi
     done
   popd

From bef964957ddce80d2051d00d5532cb06d7c8a604 Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 12:52:27 -0400
Subject: [PATCH 13/14] rename to kafka.security.authorizer.AclAuthorizer

---
 servers/.default/resources/kafka.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers/.default/resources/kafka.properties b/servers/.default/resources/kafka.properties
index 5775cfdc4..04eb72c8a 100644
--- a/servers/.default/resources/kafka.properties
+++ b/servers/.default/resources/kafka.properties
@@ -32,7 +32,7 @@ ssl.key.password=foobar
 ssl.truststore.location={ssl_dir}/kafka.server.truststore.jks
 ssl.truststore.password=foobar
 
-authorizer.class.name=kafka.security.auth.SimpleAclAuthorizer
+authorizer.class.name=kafka.security.authorizer.AclAuthorizer
 allow.everyone.if.no.acl.found=true
 
 # The port the socket server listens on

From 74f0a82dbf4f74745cea8cd62f43f8e3a0121d66 Mon Sep 17 00:00:00 2001
From: William Barnhart <william.barnhart@he360.com>
Date: Mon, 7 Aug 2023 14:54:37 -0400
Subject: [PATCH 14/14] replace --zookeeper calls with --bootstrap-server

---
 test/fixtures.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/test/fixtures.py b/test/fixtures.py
index d9c072b86..0da762a77 100644
--- a/test/fixtures.py
+++ b/test/fixtures.py
@@ -346,10 +346,9 @@ def _add_scram_user(self):
         self.out("Adding SCRAM credentials for user {} to zookeeper.".format(self.broker_user))
         args = self.kafka_run_class_args(
             "kafka.admin.ConfigCommand",
-            "--zookeeper",
-            "%s:%d/%s" % (self.zookeeper.host,
-                       self.zookeeper.port,
-                       self.zk_chroot),
+            "--bootstrap-server",
+            "%s:%d" % (self.zookeeper.host,
+                       self.zookeeper.port),
             "--alter",
             "--entity-type", "users",
             "--entity-name", self.broker_user,
@@ -586,9 +585,8 @@ def _create_topic_via_admin_api(self, topic_name, num_partitions, replication_fa
 
     def _create_topic_via_cli(self, topic_name, num_partitions, replication_factor):
         args = self.kafka_run_class_args('kafka.admin.TopicCommand',
-                                         '--zookeeper', '%s:%s/%s' % (self.zookeeper.host,
-                                                                      self.zookeeper.port,
-                                                                      self.zk_chroot),
+                                         '--bootstrap-server', '%s:%d' % (self.zookeeper.host,
+                                                                          self.zookeeper.port),
                                          '--create',
                                          '--topic', topic_name,
                                          '--partitions', self.partitions \
@@ -610,9 +608,8 @@ def _create_topic_via_cli(self, topic_name, num_partitions, replication_factor):
 
     def get_topic_names(self):
         args = self.kafka_run_class_args('kafka.admin.TopicCommand',
-                                         '--zookeeper', '%s:%s/%s' % (self.zookeeper.host,
-                                                                      self.zookeeper.port,
-                                                                      self.zk_chroot),
+                                         '--bootstrap-server', '%s:%d' % (self.zookeeper.host,
+                                                                          self.zookeeper.port),
                                          '--list'
                                          )
         env = self.kafka_run_class_env()