From 7dd736532f77bc8083509c292cf9c5b8f6f8f10e Mon Sep 17 00:00:00 2001 From: Dave Kichler Date: Fri, 13 Sep 2024 12:10:29 -0400 Subject: [PATCH 1/6] Trying to move to Java 21 - a few test failures --- pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 83c4195..3c718e2 100644 --- a/pom.xml +++ b/pom.xml @@ -78,8 +78,8 @@ UTF-8 - 1.8 - 1.8 + 21 + 21 3.4.0 @@ -186,8 +186,7 @@ 3.8.0 - 1.8 - 1.8 + 21 **/kafka_${tests.excluded}/*.java @@ -291,7 +290,7 @@ ${javadoc.version} public - 8 + 21 From ed16d335ce0b1e06e1d7a7bace25c4683f0243e1 Mon Sep 17 00:00:00 2001 From: Dave Kichler Date: Fri, 13 Sep 2024 13:54:48 -0400 Subject: [PATCH 2/6] Upgrading Apache curator eliminates exceptions thrown due to ancient reflection code, also upgrade JUnit 5 to the latest --- .../java/com/salesforce/kafka/test/ZookeeperTestServer.java | 5 ++--- .../java/com/salesforce/kafka/test/KafkaTestServerTest.java | 5 +++-- pom.xml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kafka-junit-core/src/main/java/com/salesforce/kafka/test/ZookeeperTestServer.java b/kafka-junit-core/src/main/java/com/salesforce/kafka/test/ZookeeperTestServer.java index ba4eba3..dd9dfe7 100644 --- a/kafka-junit-core/src/main/java/com/salesforce/kafka/test/ZookeeperTestServer.java +++ b/kafka-junit-core/src/main/java/com/salesforce/kafka/test/ZookeeperTestServer.java @@ -73,8 +73,7 @@ public void start() { false, //deleteDataDirectoryOnClose -1, //serverId -1, //tickTime - 1000, //maxClientCnxns - customProperties + 1000 //maxClientCnxns ); // Create instance @@ -154,4 +153,4 @@ public String getConnectString() { } return zkServer.getConnectString(); } -} \ No newline at end of file +} diff --git a/kafka-junit-core/src/test/java/com/salesforce/kafka/test/KafkaTestServerTest.java b/kafka-junit-core/src/test/java/com/salesforce/kafka/test/KafkaTestServerTest.java index f73bc16..7a80c56 100644 --- a/kafka-junit-core/src/test/java/com/salesforce/kafka/test/KafkaTestServerTest.java +++ b/kafka-junit-core/src/test/java/com/salesforce/kafka/test/KafkaTestServerTest.java @@ -212,7 +212,7 @@ void testOverrideBrokerProperties() throws Exception { // Define our override property final Properties overrideProperties = getDefaultBrokerOverrideProperties(); overrideProperties.put("broker.id", String.valueOf(expectedBrokerId)); - + // Create our test server instance passing override properties. try (final KafkaTestServer kafkaTestServer = new KafkaTestServer(overrideProperties)) { // Lets try to be sneaky and change our local property after calling the constructor. @@ -319,6 +319,7 @@ void testRestartingBroker() throws Exception { // Start instance back up kafkaTestServer.start(); + Thread.sleep(2000); // Attempt to consume messages after restarting service. records = kafkaTestUtils.consumeAllRecordsFromTopic(topicName); Assertions.assertNotNull(records); @@ -463,4 +464,4 @@ private Properties getDefaultBrokerOverrideProperties() { overrideProperties.setProperty("controlled.shutdown.retry.backoff.ms", "100"); return overrideProperties; } -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index 3c718e2..d2c620e 100644 --- a/pom.xml +++ b/pom.xml @@ -86,14 +86,14 @@ kafka_2.12 - 2.12.0 + 5.7.0 1.7.36 4.13.2 - 5.9.2 + 5.11.0 1.3.2 From 072b0c14f1728b996eb400a812a03db8c5ebfac6 Mon Sep 17 00:00:00 2001 From: Dave Kichler Date: Fri, 13 Sep 2024 14:22:07 -0400 Subject: [PATCH 3/6] Updating to the latest Kafka version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d2c620e..25300d2 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ 21 - 3.4.0 + 3.8.0 kafka_2.12 From 84cd98372bc0770511a81ae369041a3bc329c0fc Mon Sep 17 00:00:00 2001 From: Dave Kichler Date: Fri, 13 Sep 2024 14:37:08 -0400 Subject: [PATCH 4/6] Upgrading Scala version used in Kafka version reference --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25300d2..320b529 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 3.8.0 - kafka_2.12 + kafka_2.13 5.7.0 From 26f27c4841cedd31a69daec45cef41ceabce2cd8 Mon Sep 17 00:00:00 2001 From: Dave Kichler Date: Fri, 13 Sep 2024 14:56:50 -0400 Subject: [PATCH 5/6] Updating README and Github actions to cover the new Java and Kafka versions --- .github/workflows/main.yml | 42 +++++++++++++------ README.md | 3 +- .../kafka/test/KafkaTestServerTest.java | 5 +-- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 10d54fc..829e7e0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,43 +47,59 @@ jobs: exclude_kafka_tests: 0_11_0_x - kafka_version: 2.4.1 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x - kafka_version: 2.5.1 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x - kafka_version: 2.6.3 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x - kafka_version: 2.7.2 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x - kafka_version: 2.8.2 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x - kafka_version: 3.0.2 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x - kafka_version: 3.1.2 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x - kafka_version: 3.2.3 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x - kafka_version: 3.3.2 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x - kafka_version: 3.4.0 - kafka_scala_version: kafka_2.12 + kafka_scala_version: kafka_2.13 + exclude_kafka_tests: 0_11_0_x + + - kafka_version: 3.5.0 + kafka_scala_version: kafka_2.13 + exclude_kafka_tests: 0_11_0_x + + - kafka_version: 3.6.0 + kafka_scala_version: kafka_2.13 + exclude_kafka_tests: 0_11_0_x + + - kafka_version: 3.7.0 + kafka_scala_version: kafka_2.13 + exclude_kafka_tests: 0_11_0_x + + - kafka_version: 3.8.0 + kafka_scala_version: kafka_2.13 exclude_kafka_tests: 0_11_0_x # Steps represent a sequence of tasks that will be executed as part of the job @@ -91,11 +107,11 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 - ## Run tests against Open JDK8 + ## Run tests against Open JDK21 - uses: actions/setup-java@v2 with: distribution: adopt - java-version: 8 + java-version: 21 ## Cache maven dependencies - name: Cache local Maven repository @@ -105,7 +121,7 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - + ## Generate dummy SSL Certificates used in tests - name: Generate Certificates for Tests run: script/generateCertificatesForTests.sh diff --git a/README.md b/README.md index ce47cfc..4b886f7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ one or more "real" kafka brokers. No longer do you need to setup and coordinate ## Features - Support for JUnit 4 and JUnit 5. -- Support for all Kafka versions from 0.11.0.x through 3.4.x +- Support for all Kafka versions from 0.11.0.x through 3.8.x - Support for running either single broker cluster, or multi-broker clusters. - Support for PLAINTEXT, SASL_PLAINTEXT, SASL_SSL, and SSL listeners. @@ -73,4 +73,3 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## License BSD 3-Clause [View License](LICENSE.txt). - \ No newline at end of file diff --git a/kafka-junit-core/src/test/java/com/salesforce/kafka/test/KafkaTestServerTest.java b/kafka-junit-core/src/test/java/com/salesforce/kafka/test/KafkaTestServerTest.java index 7a80c56..f73bc16 100644 --- a/kafka-junit-core/src/test/java/com/salesforce/kafka/test/KafkaTestServerTest.java +++ b/kafka-junit-core/src/test/java/com/salesforce/kafka/test/KafkaTestServerTest.java @@ -212,7 +212,7 @@ void testOverrideBrokerProperties() throws Exception { // Define our override property final Properties overrideProperties = getDefaultBrokerOverrideProperties(); overrideProperties.put("broker.id", String.valueOf(expectedBrokerId)); - + // Create our test server instance passing override properties. try (final KafkaTestServer kafkaTestServer = new KafkaTestServer(overrideProperties)) { // Lets try to be sneaky and change our local property after calling the constructor. @@ -319,7 +319,6 @@ void testRestartingBroker() throws Exception { // Start instance back up kafkaTestServer.start(); - Thread.sleep(2000); // Attempt to consume messages after restarting service. records = kafkaTestUtils.consumeAllRecordsFromTopic(topicName); Assertions.assertNotNull(records); @@ -464,4 +463,4 @@ private Properties getDefaultBrokerOverrideProperties() { overrideProperties.setProperty("controlled.shutdown.retry.backoff.ms", "100"); return overrideProperties; } -} +} \ No newline at end of file From 45806bf4387ec632a12d393c5322f77d80b2d04a Mon Sep 17 00:00:00 2001 From: Dave Kichler Date: Fri, 13 Sep 2024 16:21:44 -0400 Subject: [PATCH 6/6] Upgrading Maven plugin versions, describing changes in CHANGELOG --- CHANGELOG.md | 6 ++++++ pom.xml | 18 +++++++----------- script/checkstyle-ruleset.xml | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3663c2..546f912 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## 3.2.6 (UNRELEASED) +- Add support for JDK21 +- Add official support for Kafka versions 3.5.x through 3.8.x +- Kafka Scala version from kafka_2.12 to kafka_2.13 +- JUnit5 from 5.9.2 to 5.11.0 +- Apache Curator from 2.12.0 to 5.7.0 + ## 3.2.5 (02/21/2023) - Add official support for Kafka versions 3.0.x through 3.4.x - [gquintana](https://github.com/gquintana) added the following method to `KafkaTestUtils` to allow for additional control over the records being produced. diff --git a/pom.xml b/pom.xml index 320b529..2754310 100644 --- a/pom.xml +++ b/pom.xml @@ -70,16 +70,15 @@ https://github.com/salesforce/kafka-junit/tree/master - + - 3.3.9 + 3.9.9 UTF-8 21 - 21 3.8.0 @@ -102,8 +101,8 @@ script/checkstyle-ruleset.xml - 3.1.0 - 3.3.0 + 3.5.0 + 3.10.0 2.22.2 @@ -183,9 +182,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.13.0 - + 21 @@ -273,7 +272,7 @@ com.puppycrawl.tools checkstyle - 8.29 + 10.18.1 @@ -336,9 +335,6 @@ jar - - 8 - diff --git a/script/checkstyle-ruleset.xml b/script/checkstyle-ruleset.xml index 4ced0c7..49bfbac 100755 --- a/script/checkstyle-ruleset.xml +++ b/script/checkstyle-ruleset.xml @@ -177,7 +177,7 @@ - +