From a559a689a656fb93fdf382684cc4bc0dabb1430b Mon Sep 17 00:00:00 2001 From: perkss Date: Tue, 9 May 2023 19:39:05 +0100 Subject: [PATCH] Update to kafka 3.4.0 --- .github/workflows/clojure.yml | 6 ++--- kafka-producer-consumer-example/project.clj | 15 +++++------- .../integration/example_integration_test.clj | 6 ++--- kafka-streams-example/project.clj | 23 ++++++++----------- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/.github/workflows/clojure.yml b/.github/workflows/clojure.yml index 17a2ba5..c7e6aaf 100644 --- a/.github/workflows/clojure.yml +++ b/.github/workflows/clojure.yml @@ -2,9 +2,9 @@ name: Clojure CI on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: @@ -18,4 +18,4 @@ jobs: run: lein deps && lein test - name: Install dependencies and run tests working-directory: ./kafka-streams-example - run: lein deps && lein test \ No newline at end of file + run: lein deps && lein test diff --git a/kafka-producer-consumer-example/project.clj b/kafka-producer-consumer-example/project.clj index 74dfeb7..7730ed5 100644 --- a/kafka-producer-consumer-example/project.clj +++ b/kafka-producer-consumer-example/project.clj @@ -2,15 +2,12 @@ :description "Example Kafka Producer and Consumer using Plain Java Interop" :url "https://perkss.github.io/#/clojure/KafkaClojure#text-body" :dependencies [[environ "1.1.0"] - [org.clojure/clojure "1.10.1"] - [org.apache.kafka/kafka-clients "3.0.0"] - [org.apache.kafka/kafka_2.12 "3.0.0"] - [org.clojure/tools.logging "0.4.0"] - [org.slf4j/slf4j-log4j12 "1.7.1"] - [log4j/log4j "1.2.17" :exclusions [javax.mail/mail - javax.jms/jms - com.sun.jmdk/jmxtools - com.sun.jmx/jmxri]] + [org.clojure/clojure "1.11.1"] + [org.apache.kafka/kafka-clients "3.4.0"] + [org.apache.kafka/kafka_2.12 "3.4.0"] + [org.clojure/tools.logging "1.2.4"] + [org.slf4j/slf4j-log4j12 "2.0.7"] + [org.apache.logging.log4j/log4j-core "2.20.0"] [org.testcontainers/testcontainers "1.15.3"] [org.testcontainers/kafka "1.15.3"]] :main ^:skip-aot kafka-example.core diff --git a/kafka-producer-consumer-example/test/kafka_example/integration/example_integration_test.clj b/kafka-producer-consumer-example/test/kafka_example/integration/example_integration_test.clj index 0b80d5b..6d7a4f3 100644 --- a/kafka-producer-consumer-example/test/kafka_example/integration/example_integration_test.clj +++ b/kafka-producer-consumer-example/test/kafka_example/integration/example_integration_test.clj @@ -1,6 +1,6 @@ (ns kafka-example.integration.example-integration-test - (:require [clojure.test :refer :all] - [kafka-example.core :refer :all]) + (:require [clojure.test :refer [deftest testing is]] + [kafka-example.core :refer [build-consumer build-producer run-application consumer-subscribe]]) (:import (org.testcontainers.containers KafkaContainer) (org.apache.kafka.clients.producer ProducerRecord) (org.testcontainers.utility DockerImageName))) @@ -21,4 +21,4 @@ records (.poll test-consumer 10000)] (is (= producer-topic (.topic sent-result))) (doseq [record records] - (is (= (format "Processed Value: %s" input-data) (.value record))))))) \ No newline at end of file + (is (= (format "Processed Value: %s" input-data) (.value record))))))) diff --git a/kafka-streams-example/project.clj b/kafka-streams-example/project.clj index 29c0869..bb29495 100644 --- a/kafka-streams-example/project.clj +++ b/kafka-streams-example/project.clj @@ -1,20 +1,17 @@ (defproject kafka-streams-example "0.1.0-SNAPSHOT" :description "Kafka Streams Example" :url "https://perkss.github.io/#/clojure/KafkaClojure#text-body" - :dependencies [[org.clojure/clojure "1.10.1"] + :dependencies [[org.clojure/clojure "1.11.1"] [org.clojure/data.json "0.2.6"] - [org.apache.kafka/kafka-streams "3.0.0"] - [org.apache.kafka/kafka-clients "3.0.0"] - [org.apache.kafka/kafka-streams-test-utils "3.0.0"] - [org.apache.kafka/kafka-clients "3.0.0" :classifier "test"] - [io.confluent/kafka-streams-avro-serde "7.0.1"] - [org.clojure/tools.logging "0.4.0"] - [org.slf4j/slf4j-log4j12 "1.7.1"] - [log4j/log4j "1.2.17" :exclusions [javax.mail/mail - javax.jms/jms - com.sun.jmdk/jmxtools - com.sun.jmx/jmxri]] - [danlentz/clj-uuid "0.1.7"]] + [org.apache.kafka/kafka-streams "3.4.0"] + [org.apache.kafka/kafka-clients "3.4.0"] + [org.apache.kafka/kafka-streams-test-utils "3.4.0"] + [org.apache.kafka/kafka-clients "3.4.0" :classifier "test"] + [io.confluent/kafka-streams-avro-serde "7.3.3"] + [org.clojure/tools.logging "1.2.4"] + [org.slf4j/slf4j-log4j12 "2.0.7"] + [org.apache.logging.log4j/log4j-core "2.20.0"] + [danlentz/clj-uuid "0.1.9"]] :repositories [["confluent" {:url "https://packages.confluent.io/maven/"}]] :plugins [[lein-cljfmt "0.6.1"]]