Skip to content

Commit

Permalink
Merge pull request #217 from FundingCircle/circleci-config-updates
Browse files Browse the repository at this point in the history
Update dependencies in CircleCI build
  • Loading branch information
sgerrand authored Dec 3, 2019
2 parents d88e97a + 922803d commit a08db3a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,32 +32,32 @@ 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: confluentinc/cp-zookeeper:5.1.0
- image: circleci/clojure:lein-2.9.1
- 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
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
### 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
* 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]

Expand Down
16 changes: 8 additions & 8 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
Expand Down

0 comments on commit a08db3a

Please sign in to comment.