From 82a815409a19bc00d9f9afd4e5cf246e4b22df79 Mon Sep 17 00:00:00 2001 From: Sasha Gerrand Date: Tue, 3 Dec 2019 14:04:14 +0000 Subject: [PATCH 1/5] Update Leiningen image to v2.9.1 --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 348537f8..2459e0a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,17 +32,17 @@ references: build_config: &build_config docker: - - image: circleci/clojure:lein-2.8.1 + - image: circleci/clojure:lein-2.9.1 working_directory: /home/circleci/jackdaw deploy_config: &deploy_config docker: - - image: circleci/clojure:lein-2.8.1 + - image: circleci/clojure:lein-2.9.1 working_directory: /home/circleci/jackdaw test_config: &test_config docker: - - image: circleci/clojure:lein-2.8.1 + - image: circleci/clojure:lein-2.9.1 - image: confluentinc/cp-zookeeper:5.1.0 environment: ZOOKEEPER_CLIENT_PORT: 2181 From 0c7857a5cd18696bc344b081032d82f697657cae Mon Sep 17 00:00:00 2001 From: Sasha Gerrand Date: Tue, 3 Dec 2019 14:07:15 +0000 Subject: [PATCH 2/5] Confluent Platform v5.3.1 Updates the various components from Confluent's Platform to version 5.3.1, the latest generally available version. --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2459e0a1..f086746c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,21 +43,21 @@ references: test_config: &test_config docker: - image: circleci/clojure:lein-2.9.1 - - image: confluentinc/cp-zookeeper:5.1.0 + - image: confluentinc/cp-zookeeper:5.3.1 environment: ZOOKEEPER_CLIENT_PORT: 2181 - - image: confluentinc/cp-kafka:5.1.0 + - image: confluentinc/cp-kafka:5.3.1 environment: KAFKA_BROKER_ID: 1 KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1 KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092 KAFKA_ZOOKEEPER_CONNECT: localhost:2181 - - image: confluentinc/cp-schema-registry:5.1.0 + - image: confluentinc/cp-schema-registry:5.3.1 environment: SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: localhost:2181 SCHEMA_REGISTRY_HOST_NAME: localhost SCHEMA_REGISTRY_LISTENERS: http://localhost:8081 - - image: confluentinc/cp-kafka-rest:5.1.0 + - image: confluentinc/cp-kafka-rest:5.3.1 environment: KAFKA_REST_ZOOKEEPER_CONNECT: localhost:2181 KAFKA_REST_LISTENERS: http://0.0.0.0:8082 From ddf58a3ecf47e596ca5ca7447991bcb5cf1eb30c Mon Sep 17 00:00:00 2001 From: Sasha Gerrand Date: Tue, 3 Dec 2019 14:17:22 +0000 Subject: [PATCH 3/5] Update Maven dependencies for CP v5.3.1 --- project.clj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/project.clj b/project.clj index 0148b3a5..22c2c7c2 100644 --- a/project.clj +++ b/project.clj @@ -15,13 +15,13 @@ ;; off with the kafka version. ;; See https://docs.confluent.io/current/release-notes.html - [io.confluent/kafka-schema-registry-client "5.3.0" + [io.confluent/kafka-schema-registry-client "5.3.1" :exclusions [com.fasterxml.jackson.core/jackson-databind]] - [io.confluent/kafka-avro-serializer "5.3.0"] - [org.apache.kafka/kafka-clients "2.3.0"] - [org.apache.kafka/kafka-streams "2.3.0"] - [org.apache.kafka/kafka_2.11 "2.3.0"] - [org.apache.kafka/kafka-streams-test-utils "2.3.0"] + [io.confluent/kafka-avro-serializer "5.3.1"] + [org.apache.kafka/kafka-clients "2.3.1"] + [org.apache.kafka/kafka-streams "2.3.1"] + [org.apache.kafka/kafka_2.11 "2.3.1"] + [org.apache.kafka/kafka-streams-test-utils "2.3.1"] [org.clojure/clojure "1.10.1" :scope "provided"] [org.clojure/data.json "0.2.6"] [org.clojure/data.fressian "0.2.1"] @@ -71,8 +71,8 @@ :resource-paths ["test/resources"] :injections [(require 'io.aviso.logging.setup)] :dependencies [[io.aviso/logging "0.3.2"] - [org.apache.kafka/kafka-streams-test-utils "2.3.0"] - [org.apache.kafka/kafka-clients "2.3.0" :classifier "test"] + [org.apache.kafka/kafka-streams-test-utils "2.3.1"] + [org.apache.kafka/kafka-clients "2.3.1" :classifier "test"] [org.clojure/test.check "0.9.0"] [lambdaisland/kaocha "0.0-529"] [lambdaisland/kaocha-cloverage "0.0-32"] From 6adc6c4f3803f4097e415b5d50877ed41495a4f8 Mon Sep 17 00:00:00 2001 From: Sasha Gerrand Date: Tue, 3 Dec 2019 14:42:58 +0000 Subject: [PATCH 4/5] Added changelog entry for version updates --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea83a2bf..04135783 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ * Fressian Serde via clojure.data.fressian * More clear error from the command runner #214 * Documentation about Jackdaw Admin API + * Upgraded in #217: + * Kafka client version to 2.3.1: https://kafka.apache.org/23/documentation.html#upgrade_230_notable + * Confluent Platform components version to 5.3.1: https://docs.confluent.io/5.3.1/release-notes/index.html#cp-5-3-1-release-notes ## [0.6.9] - [2019-10-16] From 922803d5b656ded9fb368944821f16bf0296386b Mon Sep 17 00:00:00 2001 From: Sasha Gerrand Date: Tue, 3 Dec 2019 15:23:57 +0000 Subject: [PATCH 5/5] Use clearer language --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04135783..3b16ec76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Added * Fressian Serde via clojure.data.fressian - * More clear error from the command runner #214 + * Clearer error from the command runner #214 * Documentation about Jackdaw Admin API * Upgraded in #217: * Kafka client version to 2.3.1: https://kafka.apache.org/23/documentation.html#upgrade_230_notable