From 41f4c4a67e28bc63c6f95e419eeb677b3dcaea5f Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Fri, 8 Dec 2023 10:55:46 +0100 Subject: [PATCH 1/5] demo updates --- demo/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml index 8cf4bb8..f46a091 100644 --- a/demo/docker-compose.yml +++ b/demo/docker-compose.yml @@ -83,7 +83,7 @@ services: command: /opt/bitnami/kafka/bin/connect-distributed.sh /tmp/connect-distributed-2.properties redpanda-console: - image: docker.io/redpandadata/console:v2.2.4 + image: docker.io/redpandadata/console:v2.3.8 ports: - '8080:8080' environment: From 067fde7dbdc9100b52b0d40f2e6b92004e45531f Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Thu, 4 Jan 2024 15:22:25 +0100 Subject: [PATCH 2/5] CI: java 21 --- .circleci/continue_config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 4462f23..4754b9f 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -10,16 +10,16 @@ executors: j17: docker: - image: 'cimg/openjdk:17.0' - j20: + j21: docker: - - image: 'cimg/openjdk:20.0' + - image: 'cimg/openjdk:21.0' jobs: test-standalone: parameters: jdk: type: 'string' - default: 'j20' + default: 'j21' arango-version: type: 'string' default: 'latest' @@ -130,7 +130,7 @@ jobs: parameters: jdk: type: 'string' - default: 'j20' + default: 'j21' topology: type: 'string' default: 'cluster' @@ -144,7 +144,7 @@ jobs: STARTER_MODE: <> DOCKER_IMAGE: docker.io/arangodb/arangodb:<> ARANGO_ENDPOINTS: <> - TOXIPROXY_VERSION: v2.5.0 + TOXIPROXY_VERSION: v2.7.0 executor: <> steps: - checkout From dfceda9a24a107b7487a53cf3cdbaed6b794fabe Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Thu, 4 Jan 2024 20:25:41 +0100 Subject: [PATCH 3/5] run integration tests using jars --- docker/start_kafka_connect.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/start_kafka_connect.sh b/docker/start_kafka_connect.sh index 77ceb4a..8352352 100755 --- a/docker/start_kafka_connect.sh +++ b/docker/start_kafka_connect.sh @@ -10,9 +10,12 @@ docker pull $DOCKER_IMAGE KAFKA_BOOTSTRAP_SERVERS=kafka-1:9092,kafka-2:9092,kafka-3:9092 LOCATION=$(pwd)/$(dirname "$0") +mkdir -p "$LOCATION"/../target/jars +cp "$LOCATION"/../target/*.jar "$LOCATION"/../target/jars + # data volume 1 docker create -v /tmp --name kafka-connect-data-1 alpine:3 /bin/true -docker cp "$LOCATION"/../target kafka-connect-data-1:/tmp/kafka-connect-arangodb +docker cp "$LOCATION/../target/jars" kafka-connect-data-1:/tmp/kafka-connect-arangodb docker cp "$LOCATION"/../src/test/resources/test.truststore kafka-connect-data-1:/tmp docker cp "$LOCATION"/connect/connect-distributed-1.properties kafka-connect-data-1:/tmp @@ -27,7 +30,7 @@ docker run -d \ # data volume 2 docker create -v /tmp --name kafka-connect-data-2 alpine:3 /bin/true -docker cp "$LOCATION"/../target kafka-connect-data-2:/tmp/kafka-connect-arangodb +docker cp "$LOCATION/../target/jars" kafka-connect-data-2:/tmp/kafka-connect-arangodb docker cp "$LOCATION"/../src/test/resources/test.truststore kafka-connect-data-2:/tmp docker cp "$LOCATION"/connect/connect-distributed-2.properties kafka-connect-data-2:/tmp From 32cc9307d6cdde314c2fafe89ff68dc72df95719 Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Thu, 4 Jan 2024 22:54:38 +0100 Subject: [PATCH 4/5] shaded driver --- pom.xml | 24 +++---------------- .../spi/ClusterKafkaConnectDeployment.java | 4 ++-- .../target/protocol/ProtocolTargets.java | 2 +- src/test/resources/logback-test.xml | 3 ++- 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index 52da06b..ea74f01 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ UTF-8 3.6.0 7.5.2 - 7.3.0 + 7.4.0 2.13.5 1.7.36 @@ -93,30 +93,12 @@ com.arangodb - arangodb-java-driver + arangodb-java-driver-shaded ${arangodb.version} - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - org.slf4j - slf4j-api - - com.arangodb - vst-protocol + jackson-serde-json ${arangodb.version} diff --git a/src/connect-distributed/java/spi/ClusterKafkaConnectDeployment.java b/src/connect-distributed/java/spi/ClusterKafkaConnectDeployment.java index 3e32998..f5680b4 100644 --- a/src/connect-distributed/java/spi/ClusterKafkaConnectDeployment.java +++ b/src/connect-distributed/java/spi/ClusterKafkaConnectDeployment.java @@ -36,12 +36,12 @@ public class ClusterKafkaConnectDeployment extends KafkaConnectDeployment { public ClusterKafkaConnectDeployment() { kafkaBootstrapServers = KafkaDeployment.getKafkaBootstrapServers(); LOG.info("Using kafka.bootstrap.servers: {}", kafkaBootstrapServers); - Objects.requireNonNull(kafkaBootstrapServers); + Objects.requireNonNull(kafkaBootstrapServers, "Required system property: kafka.bootstrap.servers"); assert !kafkaBootstrapServers.isEmpty(); kafkaConnectHost = getKafkaConnectHost(); LOG.info("Using kafka.connect.host: {}", kafkaConnectHost); - Objects.requireNonNull(kafkaConnectHost); + Objects.requireNonNull(kafkaConnectHost, "Required system property: kafka.connect.host"); assert !kafkaConnectHost.isEmpty(); } diff --git a/src/test/java/com/arangodb/kafka/target/protocol/ProtocolTargets.java b/src/test/java/com/arangodb/kafka/target/protocol/ProtocolTargets.java index 0f8ad75..a0becb6 100644 --- a/src/test/java/com/arangodb/kafka/target/protocol/ProtocolTargets.java +++ b/src/test/java/com/arangodb/kafka/target/protocol/ProtocolTargets.java @@ -4,7 +4,7 @@ import com.arangodb.kafka.target.TestTarget; public enum ProtocolTargets implements TargetHolder { -// VstTarget(VstTarget.class), + VstTarget(VstTarget.class), Http1JsonTarget(Http1JsonTarget.class), Http1VpackTarget(Http1VpackTarget.class), Http2JsonTarget(Http2JsonTarget.class), diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 5b52270..58214e5 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -13,6 +13,7 @@ - + + From b8e6beeb598c6929191d39002e47939793561d1b Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Thu, 4 Jan 2024 23:52:33 +0100 Subject: [PATCH 5/5] merge META-INF/services in jar bundle --- pom.xml | 6 +++--- src/main/assembly/jar-with-dependencies.xml | 22 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/main/assembly/jar-with-dependencies.xml diff --git a/pom.xml b/pom.xml index ea74f01..524d3f0 100644 --- a/pom.xml +++ b/pom.xml @@ -409,9 +409,9 @@ single - - jar-with-dependencies - + + src/main/assembly/jar-with-dependencies.xml + false diff --git a/src/main/assembly/jar-with-dependencies.xml b/src/main/assembly/jar-with-dependencies.xml new file mode 100644 index 0000000..9bfdf63 --- /dev/null +++ b/src/main/assembly/jar-with-dependencies.xml @@ -0,0 +1,22 @@ + + merge-services + + jar + + false + + + metaInf-services + + + + + / + true + true + runtime + + +