From efb9d803625e9d43efd952d874c6f3187a009086 Mon Sep 17 00:00:00 2001
From: Otto Fowler <ottobackwards@gmail.com>
Date: Mon, 29 Apr 2024 12:19:32 -0400
Subject: [PATCH] Run CI E2E against latest its ( 6.0.3) (#85)

* try latest lts

* update copyrights
---
 CHANGES                                       |  2 +-
 CMakeLists.txt                                |  2 +-
 MAINTAINER                                    |  2 +-
 MAINTAINERS.md                                |  2 +-
 Makefile                                      |  2 +-
 NOTICE                                        |  2 +-
 README.md                                     |  2 +-
 VERSION                                       |  2 +-
 ci/lint.sh                                    |  2 +-
 cmake/FindLibRDKafka.cmake                    |  2 +-
 cmake/FindOpenSSL.cmake                       |  2 +-
 configure                                     |  2 +-
 configure.plugin                              |  2 +-
 docker/README.md                              |  2 +-
 .../containers/zeek/Dockerfile.ubuntu:20.04   |  2 +-
 docker/containers/zeek/Makefile               |  2 +-
 docker/docker-compose.yml                     |  2 +-
 docker/finish_end_to_end.sh                   |  2 +-
 docker/in_docker_scripts/build_plugin.sh      |  2 +-
 docker/in_docker_scripts/configure_plugin.sh  |  2 +-
 docker/in_docker_scripts/process_data_file.sh |  2 +-
 docker/run_end_to_end.sh                      |  2 +-
 docker/scripts/analyze_results.sh             |  2 +-
 docker/scripts/docker_execute_build_plugin.sh |  2 +-
 .../docker_execute_configure_plugin.sh        |  2 +-
 .../docker_execute_create_topic_in_kafka.sh   |  2 +-
 .../docker_execute_process_data_file.sh       |  2 +-
 docker/scripts/docker_execute_shell.sh        |  2 +-
 docker/scripts/docker_run_consume_kafka.sh    |  2 +-
 docker/scripts/docker_run_get_offset_kafka.sh |  2 +-
 docker/scripts/download_sample_pcaps.sh       |  2 +-
 docker/scripts/print_results.sh               |  2 +-
 docker/scripts/split_kafka_output_by_log.sh   |  2 +-
 scripts/Seiso/Kafka/__load__.zeek             |  2 +-
 scripts/Seiso/Kafka/logs-to-kafka.zeek        |  2 +-
 scripts/__load__.zeek                         |  2 +-
 scripts/init.zeek                             |  2 +-
 src/KafkaWriter.cc                            |  2 +-
 src/KafkaWriter.h                             |  2 +-
 src/Plugin.cc                                 |  2 +-
 src/Plugin.h                                  |  2 +-
 src/TaggedJSON.cc                             |  2 +-
 src/TaggedJSON.h                              |  2 +-
 src/events.bif                                |  2 +-
 src/kafka.bif                                 |  2 +-
 src/kafka_const.bif                           |  2 +-
 tasks.py                                      |  2 +-
 tests/Makefile                                |  2 +-
 tests/Scripts/diff-remove-timestamps          |  2 +-
 tests/Scripts/get-zeek-env                    |  2 +-
 tests/btest.cfg                               |  2 +-
 tests/kafka/l2s-l2e-no-overlap.zeek           |  2 +-
 tests/kafka/l2s-set-l2e-set.zeek              |  2 +-
 tests/kafka/l2s-set-l2e-unset.zeek            |  2 +-
 tests/kafka/l2s-unset-l2e-set.zeek            |  2 +-
 tests/kafka/l2s-unset-l2e-unset.zeek          |  2 +-
 tests/kafka/resolved-topic-config.zeek        |  2 +-
 tests/kafka/resolved-topic-default.zeek       |  2 +-
 .../resolved-topic-override-and-config.zeek   |  2 +-
 tests/kafka/resolved-topic-override-only.zeek |  2 +-
 tests/kafka/send-all-active-logs-l2e-set.zeek |  2 +-
 .../kafka/send-all-active-logs-l2e-unset.zeek |  2 +-
 .../send-all-active-logs-l2s-set-l2e-set.zeek |  2 +-
 ...end-all-active-logs-l2s-set-l2e-unset.zeek |  2 +-
 tests/kafka/show-plugin.zeek                  |  2 +-
 update-copyright.sh                           | 56 +++++++++----------
 66 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/CHANGES b/CHANGES
index e9b7059..fa6b75b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86fd29d..bb32d93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/MAINTAINER b/MAINTAINER
index cfe40c9..b1cb2e4 100644
--- a/MAINTAINER
+++ b/MAINTAINER
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index f9fde94..9417ab8 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2020-2023 Zeek-Kafka
+  Copyright 2020-2024 Zeek-Kafka
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/Makefile b/Makefile
index 8d1126e..4d383c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/NOTICE b/NOTICE
index 2d12b19..9deabd5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-   Copyright 2020-2023 Zeek-Kafka
+   Copyright 2020-2024 Zeek-Kafka
 
    The Initial Developer of this project, which was copied from, derived from,
    or inspired by Apache Metron, is The Apache Software Foundation
diff --git a/README.md b/README.md
index 99633f8..12c78d3 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2020-2023 Zeek-Kafka
+  Copyright 2020-2024 Zeek-Kafka
   Copyright 2015-2020 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/VERSION b/VERSION
index e917188..6241ff9 100644
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ci/lint.sh b/ci/lint.sh
index 709f988..b2e2e84 100755
--- a/ci/lint.sh
+++ b/ci/lint.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
diff --git a/cmake/FindLibRDKafka.cmake b/cmake/FindLibRDKafka.cmake
index 8e04750..3b6f8fe 100644
--- a/cmake/FindLibRDKafka.cmake
+++ b/cmake/FindLibRDKafka.cmake
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index e25ad16..ec67bf2 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/configure b/configure
index 03e09d3..bec8b2d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/configure.plugin b/configure.plugin
index 6765367..d34d7da 100644
--- a/configure.plugin
+++ b/configure.plugin
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/README.md b/docker/README.md
index a33c166..4d21f84 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2020-2023 Zeek-Kafka
+  Copyright 2020-2024 Zeek-Kafka
   Copyright 2015-2020 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/containers/zeek/Dockerfile.ubuntu:20.04 b/docker/containers/zeek/Dockerfile.ubuntu:20.04
index 0496717..b870eb1 100644
--- a/docker/containers/zeek/Dockerfile.ubuntu:20.04
+++ b/docker/containers/zeek/Dockerfile.ubuntu:20.04
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/containers/zeek/Makefile b/docker/containers/zeek/Makefile
index 7866c0b..cc4be18 100644
--- a/docker/containers/zeek/Makefile
+++ b/docker/containers/zeek/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 8f29234..785536c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -45,7 +45,7 @@ services:
         - zeek-kafka_zeek:latest
         - ${ZEEK_KAFKA_OS}
       args:
-        ZEEK_VERSION: "4.2.2"
+        ZEEK_VERSION: "6.0.3"
         LIBRDKAFKA_VERSION: "1.4.4"
     image: zeek-kafka_zeek:latest
     depends_on:
diff --git a/docker/finish_end_to_end.sh b/docker/finish_end_to_end.sh
index d2f3765..b467bba 100755
--- a/docker/finish_end_to_end.sh
+++ b/docker/finish_end_to_end.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/in_docker_scripts/build_plugin.sh b/docker/in_docker_scripts/build_plugin.sh
index 359a9a5..9c17db8 100755
--- a/docker/in_docker_scripts/build_plugin.sh
+++ b/docker/in_docker_scripts/build_plugin.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/in_docker_scripts/configure_plugin.sh b/docker/in_docker_scripts/configure_plugin.sh
index 51632f0..b337a6f 100755
--- a/docker/in_docker_scripts/configure_plugin.sh
+++ b/docker/in_docker_scripts/configure_plugin.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/in_docker_scripts/process_data_file.sh b/docker/in_docker_scripts/process_data_file.sh
index d40d67e..6a567f8 100755
--- a/docker/in_docker_scripts/process_data_file.sh
+++ b/docker/in_docker_scripts/process_data_file.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2010
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/run_end_to_end.sh b/docker/run_end_to_end.sh
index bb3fde9..ea6f68a 100755
--- a/docker/run_end_to_end.sh
+++ b/docker/run_end_to_end.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/analyze_results.sh b/docker/scripts/analyze_results.sh
index fc73768..07e0e9f 100755
--- a/docker/scripts/analyze_results.sh
+++ b/docker/scripts/analyze_results.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/docker_execute_build_plugin.sh b/docker/scripts/docker_execute_build_plugin.sh
index 0e54fbe..3641517 100755
--- a/docker/scripts/docker_execute_build_plugin.sh
+++ b/docker/scripts/docker_execute_build_plugin.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/docker_execute_configure_plugin.sh b/docker/scripts/docker_execute_configure_plugin.sh
index 5f18d49..4172e5e 100755
--- a/docker/scripts/docker_execute_configure_plugin.sh
+++ b/docker/scripts/docker_execute_configure_plugin.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/docker_execute_create_topic_in_kafka.sh b/docker/scripts/docker_execute_create_topic_in_kafka.sh
index 3ebd749..336ac7d 100755
--- a/docker/scripts/docker_execute_create_topic_in_kafka.sh
+++ b/docker/scripts/docker_execute_create_topic_in_kafka.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/docker_execute_process_data_file.sh b/docker/scripts/docker_execute_process_data_file.sh
index 807e4af..edad3f0 100755
--- a/docker/scripts/docker_execute_process_data_file.sh
+++ b/docker/scripts/docker_execute_process_data_file.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/docker_execute_shell.sh b/docker/scripts/docker_execute_shell.sh
index 1f22cec..86864c1 100755
--- a/docker/scripts/docker_execute_shell.sh
+++ b/docker/scripts/docker_execute_shell.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/docker_run_consume_kafka.sh b/docker/scripts/docker_run_consume_kafka.sh
index 65a9e64..f79e74d 100755
--- a/docker/scripts/docker_run_consume_kafka.sh
+++ b/docker/scripts/docker_run_consume_kafka.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/docker_run_get_offset_kafka.sh b/docker/scripts/docker_run_get_offset_kafka.sh
index c3c9560..00fe714 100755
--- a/docker/scripts/docker_run_get_offset_kafka.sh
+++ b/docker/scripts/docker_run_get_offset_kafka.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/download_sample_pcaps.sh b/docker/scripts/download_sample_pcaps.sh
index 7f3ab15..469627c 100755
--- a/docker/scripts/download_sample_pcaps.sh
+++ b/docker/scripts/download_sample_pcaps.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/print_results.sh b/docker/scripts/print_results.sh
index e922653..2489a84 100755
--- a/docker/scripts/print_results.sh
+++ b/docker/scripts/print_results.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/scripts/split_kafka_output_by_log.sh b/docker/scripts/split_kafka_output_by_log.sh
index f5d1ba4..88d3fd8 100755
--- a/docker/scripts/split_kafka_output_by_log.sh
+++ b/docker/scripts/split_kafka_output_by_log.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2143,SC1083,SC2002,SC2126
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/Seiso/Kafka/__load__.zeek b/scripts/Seiso/Kafka/__load__.zeek
index 3af00e2..f7ecc0a 100644
--- a/scripts/Seiso/Kafka/__load__.zeek
+++ b/scripts/Seiso/Kafka/__load__.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/Seiso/Kafka/logs-to-kafka.zeek b/scripts/Seiso/Kafka/logs-to-kafka.zeek
index 4decc5e..712ede7 100644
--- a/scripts/Seiso/Kafka/logs-to-kafka.zeek
+++ b/scripts/Seiso/Kafka/logs-to-kafka.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/__load__.zeek b/scripts/__load__.zeek
index 071fa0c..783aa67 100644
--- a/scripts/__load__.zeek
+++ b/scripts/__load__.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/init.zeek b/scripts/init.zeek
index 44962f0..00540a1 100644
--- a/scripts/init.zeek
+++ b/scripts/init.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/KafkaWriter.cc b/src/KafkaWriter.cc
index 6b36518..3a075b5 100644
--- a/src/KafkaWriter.cc
+++ b/src/KafkaWriter.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Zeek-Kafka
+ * Copyright 2020-2024 Zeek-Kafka
  * Copyright 2015-2020 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/KafkaWriter.h b/src/KafkaWriter.h
index 601c972..a9b6f3e 100644
--- a/src/KafkaWriter.h
+++ b/src/KafkaWriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Zeek-Kafka
+ * Copyright 2020-2024 Zeek-Kafka
  * Copyright 2015-2020 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/Plugin.cc b/src/Plugin.cc
index 5ec92b5..d5dc833 100644
--- a/src/Plugin.cc
+++ b/src/Plugin.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Zeek-Kafka
+ * Copyright 2020-2024 Zeek-Kafka
  * Copyright 2015-2020 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/Plugin.h b/src/Plugin.h
index 63f7275..db401d9 100644
--- a/src/Plugin.h
+++ b/src/Plugin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Zeek-Kafka
+ * Copyright 2020-2024 Zeek-Kafka
  * Copyright 2015-2020 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/TaggedJSON.cc b/src/TaggedJSON.cc
index a2487f9..a67d29b 100644
--- a/src/TaggedJSON.cc
+++ b/src/TaggedJSON.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Zeek-Kafka
+ * Copyright 2020-2024 Zeek-Kafka
  * Copyright 2015-2020 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/TaggedJSON.h b/src/TaggedJSON.h
index 6b633d1..eb6a99b 100644
--- a/src/TaggedJSON.h
+++ b/src/TaggedJSON.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 Zeek-Kafka
+ * Copyright 2020-2024 Zeek-Kafka
  * Copyright 2015-2020 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/events.bif b/src/events.bif
index 8cd400a..4e627be 100644
--- a/src/events.bif
+++ b/src/events.bif
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/kafka.bif b/src/kafka.bif
index 78aa746..a76c3ba 100644
--- a/src/kafka.bif
+++ b/src/kafka.bif
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/kafka_const.bif b/src/kafka_const.bif
index 6c2dcc1..78eb0ba 100644
--- a/src/kafka_const.bif
+++ b/src/kafka_const.bif
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tasks.py b/tasks.py
index 5e5407d..7309291 100755
--- a/tasks.py
+++ b/tasks.py
@@ -4,7 +4,7 @@
 """
 
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
diff --git a/tests/Makefile b/tests/Makefile
index 13d5bd7..796f2b4 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Scripts/diff-remove-timestamps b/tests/Scripts/diff-remove-timestamps
index f40dbbd..439955b 100755
--- a/tests/Scripts/diff-remove-timestamps
+++ b/tests/Scripts/diff-remove-timestamps
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Scripts/get-zeek-env b/tests/Scripts/get-zeek-env
index e754283..fcf4493 100755
--- a/tests/Scripts/get-zeek-env
+++ b/tests/Scripts/get-zeek-env
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/btest.cfg b/tests/btest.cfg
index 727e9bf..8f64368 100644
--- a/tests/btest.cfg
+++ b/tests/btest.cfg
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/l2s-l2e-no-overlap.zeek b/tests/kafka/l2s-l2e-no-overlap.zeek
index 6e03501..06b2d69 100644
--- a/tests/kafka/l2s-l2e-no-overlap.zeek
+++ b/tests/kafka/l2s-l2e-no-overlap.zeek
@@ -1,5 +1,5 @@
 # 
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/l2s-set-l2e-set.zeek b/tests/kafka/l2s-set-l2e-set.zeek
index 967b8e3..ba2cc9f 100644
--- a/tests/kafka/l2s-set-l2e-set.zeek
+++ b/tests/kafka/l2s-set-l2e-set.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/l2s-set-l2e-unset.zeek b/tests/kafka/l2s-set-l2e-unset.zeek
index 14e4c21..01c90ee 100644
--- a/tests/kafka/l2s-set-l2e-unset.zeek
+++ b/tests/kafka/l2s-set-l2e-unset.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/l2s-unset-l2e-set.zeek b/tests/kafka/l2s-unset-l2e-set.zeek
index c654986..2fb1ede 100644
--- a/tests/kafka/l2s-unset-l2e-set.zeek
+++ b/tests/kafka/l2s-unset-l2e-set.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/l2s-unset-l2e-unset.zeek b/tests/kafka/l2s-unset-l2e-unset.zeek
index 4b1b21a..f5106a8 100644
--- a/tests/kafka/l2s-unset-l2e-unset.zeek
+++ b/tests/kafka/l2s-unset-l2e-unset.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/resolved-topic-config.zeek b/tests/kafka/resolved-topic-config.zeek
index ac1de77..e951822 100644
--- a/tests/kafka/resolved-topic-config.zeek
+++ b/tests/kafka/resolved-topic-config.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/resolved-topic-default.zeek b/tests/kafka/resolved-topic-default.zeek
index 6843fab..9eee0c9 100644
--- a/tests/kafka/resolved-topic-default.zeek
+++ b/tests/kafka/resolved-topic-default.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/resolved-topic-override-and-config.zeek b/tests/kafka/resolved-topic-override-and-config.zeek
index 390bf57..8001006 100644
--- a/tests/kafka/resolved-topic-override-and-config.zeek
+++ b/tests/kafka/resolved-topic-override-and-config.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/resolved-topic-override-only.zeek b/tests/kafka/resolved-topic-override-only.zeek
index c54d5e7..5744df5 100644
--- a/tests/kafka/resolved-topic-override-only.zeek
+++ b/tests/kafka/resolved-topic-override-only.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/send-all-active-logs-l2e-set.zeek b/tests/kafka/send-all-active-logs-l2e-set.zeek
index 318d575..d4ffc61 100644
--- a/tests/kafka/send-all-active-logs-l2e-set.zeek
+++ b/tests/kafka/send-all-active-logs-l2e-set.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/send-all-active-logs-l2e-unset.zeek b/tests/kafka/send-all-active-logs-l2e-unset.zeek
index 0198a10..3cc5116 100644
--- a/tests/kafka/send-all-active-logs-l2e-unset.zeek
+++ b/tests/kafka/send-all-active-logs-l2e-unset.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/send-all-active-logs-l2s-set-l2e-set.zeek b/tests/kafka/send-all-active-logs-l2s-set-l2e-set.zeek
index a34eb51..b8bb535 100644
--- a/tests/kafka/send-all-active-logs-l2s-set-l2e-set.zeek
+++ b/tests/kafka/send-all-active-logs-l2s-set-l2e-set.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/send-all-active-logs-l2s-set-l2e-unset.zeek b/tests/kafka/send-all-active-logs-l2s-set-l2e-unset.zeek
index b5a0d90..8bb097d 100644
--- a/tests/kafka/send-all-active-logs-l2s-set-l2e-unset.zeek
+++ b/tests/kafka/send-all-active-logs-l2s-set-l2e-unset.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/kafka/show-plugin.zeek b/tests/kafka/show-plugin.zeek
index 8f2f47b..088330e 100644
--- a/tests/kafka/show-plugin.zeek
+++ b/tests/kafka/show-plugin.zeek
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/update-copyright.sh b/update-copyright.sh
index 2cfdfe7..32e7f39 100644
--- a/update-copyright.sh
+++ b/update-copyright.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2023 Zeek-Kafka
+#  Copyright 2020-2024 Zeek-Kafka
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -22,33 +22,33 @@ set -o pipefail
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 MISSING_COPYRIGHT=$(find "${DIR}" \( -path "${DIR}/.git" -or \
-    -path "${DIR}/.github" \) -prune -false -or \
-    \( -not -name ".*" \
-    -and -not -name "*.yml" \
-    -and -not -name "*.pcap" \
-    -and -not -name "*.pcapng" \
-    -and -not -name "COPYING" \
-    -and -not -name "Dockerfile" \
-    -and -not -name "Pipfile*" \
-    -and -not -name "output" \
-    -and -not -name "random.seed" \
-    -and -not -name "requirements*.txt" \
-    -and -not -name "setup.cfg" \
-    -and -not -name "zkg.meta" \
-    -type f \
-    \) \
-    -print0 |
-    xargs -0 grep --files-without-match "Copyright 2020-$(date +'%Y') Zeek-Kafka$" || true)
+	-path "${DIR}/.github" \) -prune -false -or \
+	\( -not -name ".*" \
+	-and -not -name "*.yml" \
+	-and -not -name "*.pcap" \
+	-and -not -name "*.pcapng" \
+	-and -not -name "COPYING" \
+	-and -not -name "Dockerfile" \
+	-and -not -name "Pipfile*" \
+	-and -not -name "output" \
+	-and -not -name "random.seed" \
+	-and -not -name "requirements*.txt" \
+	-and -not -name "setup.cfg" \
+	-and -not -name "zkg.meta" \
+	-type f \
+	\) \
+	-print0 |
+	xargs -0 grep --files-without-match "Copyright 2020-$(date +'%Y') Zeek-Kafka$" || true)
 
 if [[ "${MISSING_COPYRIGHT}" ]]; then
-    REPLACEMENT="Copyright 2020-$(date +'%Y')"
-    while IFS= read -r line; do
-        echo "Updating $line ..."
-        if [[ $OSTYPE == 'darwin'* ]]; then
-            sed -i "s/Copyright 2020-202[0-9]/$REPLACEMENT/" "${line}"
-        else
-            sed -i '' "s/Copyright 2020-202[0-9]/$REPLACEMENT/" "${line}"
-        fi
-    done <<<"${MISSING_COPYRIGHT}"
-    exit 1
+	REPLACEMENT="Copyright 2020-$(date +'%Y')"
+	while IFS= read -r line; do
+		echo "Updating $line ..."
+		if [[ $OSTYPE == 'darwin'* ]]; then
+			sed -i '' "s/Copyright 2020-202[0-9]/$REPLACEMENT/" "${line}"
+		else
+			sed -i "s/Copyright 2020-202[0-9]/$REPLACEMENT/" "${line}"
+		fi
+	done <<<"${MISSING_COPYRIGHT}"
+	exit 1
 fi