This is an automated email from the ASF dual-hosted git repository.
yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new eeebae1bda6 Add Kafka 3 to and remove Kafka 0.x and 1.x from
compatibility test (#32981)
eeebae1bda6 is described below
commit eeebae1bda6b211463e53a4e4ca469bfa9763399
Author: Yi Hu <[email protected]>
AuthorDate: Wed Nov 6 12:54:08 2024 -0500
Add Kafka 3 to and remove Kafka 0.x and 1.x from compatibility test (#32981)
* Add Kafka 3.1.2 IT target
Signed-off-by: Jeffrey Kinard <[email protected]>
* Remove kafka 0.x and 1.x from compatibilty test
---------
Signed-off-by: Jeffrey Kinard <[email protected]>
Co-authored-by: Jeffrey Kinard <[email protected]>
---
sdks/java/io/kafka/build.gradle | 7 +------
sdks/java/io/kafka/kafka-01103/build.gradle | 24 ------------------------
sdks/java/io/kafka/kafka-100/build.gradle | 24 ------------------------
sdks/java/io/kafka/kafka-111/build.gradle | 24 ------------------------
settings.gradle.kts | 8 ++------
5 files changed, 3 insertions(+), 84 deletions(-)
diff --git a/sdks/java/io/kafka/build.gradle b/sdks/java/io/kafka/build.gradle
index ec4654bd88d..c2f056b0b7c 100644
--- a/sdks/java/io/kafka/build.gradle
+++ b/sdks/java/io/kafka/build.gradle
@@ -35,9 +35,6 @@ ext {
}
def kafkaVersions = [
- '01103': "0.11.0.3",
- '100': "1.0.0",
- '111': "1.1.1",
'201': "2.0.1",
'211': "2.1.1",
'222': "2.2.2",
@@ -139,15 +136,13 @@ task kafkaVersionsCompatibilityTest {
description = 'Runs KafkaIO with different Kafka client APIs'
def testNames = createTestList(kafkaVersions, "Test")
dependsOn testNames
- dependsOn (":sdks:java:io:kafka:kafka-01103:kafkaVersion01103BatchIT")
- dependsOn (":sdks:java:io:kafka:kafka-100:kafkaVersion100BatchIT")
- dependsOn (":sdks:java:io:kafka:kafka-111:kafkaVersion111BatchIT")
dependsOn (":sdks:java:io:kafka:kafka-201:kafkaVersion201BatchIT")
dependsOn (":sdks:java:io:kafka:kafka-211:kafkaVersion211BatchIT")
dependsOn (":sdks:java:io:kafka:kafka-222:kafkaVersion222BatchIT")
dependsOn (":sdks:java:io:kafka:kafka-231:kafkaVersion231BatchIT")
dependsOn (":sdks:java:io:kafka:kafka-241:kafkaVersion241BatchIT")
dependsOn (":sdks:java:io:kafka:kafka-251:kafkaVersion251BatchIT")
+ dependsOn (":sdks:java:io:kafka:kafka-312:kafkaVersion312BatchIT")
}
static def createTestList(Map<String, String> prefixMap, String suffix) {
diff --git a/sdks/java/io/kafka/kafka-01103/build.gradle
b/sdks/java/io/kafka/kafka-01103/build.gradle
deleted file mode 100644
index 3a74bf04ef2..00000000000
--- a/sdks/java/io/kafka/kafka-01103/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-project.ext {
- delimited="0.11.0.3"
- undelimited="01103"
- sdfCompatible=false
-}
-
-apply from: "../kafka-integration-test.gradle"
\ No newline at end of file
diff --git a/sdks/java/io/kafka/kafka-100/build.gradle
b/sdks/java/io/kafka/kafka-100/build.gradle
deleted file mode 100644
index bd5fa67b1cf..00000000000
--- a/sdks/java/io/kafka/kafka-100/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-project.ext {
- delimited="1.0.0"
- undelimited="100"
- sdfCompatible=false
-}
-
-apply from: "../kafka-integration-test.gradle"
diff --git a/sdks/java/io/kafka/kafka-111/build.gradle
b/sdks/java/io/kafka/kafka-111/build.gradle
deleted file mode 100644
index c2b0c8f8282..00000000000
--- a/sdks/java/io/kafka/kafka-111/build.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-project.ext {
- delimited="1.1.1"
- undelimited="111"
- sdfCompatible=false
-}
-
-apply from: "../kafka-integration-test.gradle"
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a38f69dac09..ca30a5ea750 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -333,6 +333,8 @@ project(":beam-test-gha").projectDir = file(".github")
include("beam-validate-runner")
project(":beam-validate-runner").projectDir =
file(".test-infra/validate-runner")
include("com.google.api.gax.batching")
+include("sdks:java:io:kafka:kafka-312")
+findProject(":sdks:java:io:kafka:kafka-312")?.name = "kafka-312"
include("sdks:java:io:kafka:kafka-251")
findProject(":sdks:java:io:kafka:kafka-251")?.name = "kafka-251"
include("sdks:java:io:kafka:kafka-241")
@@ -345,12 +347,6 @@ include("sdks:java:io:kafka:kafka-211")
findProject(":sdks:java:io:kafka:kafka-211")?.name = "kafka-211"
include("sdks:java:io:kafka:kafka-201")
findProject(":sdks:java:io:kafka:kafka-201")?.name = "kafka-201"
-include("sdks:java:io:kafka:kafka-111")
-findProject(":sdks:java:io:kafka:kafka-111")?.name = "kafka-111"
-include("sdks:java:io:kafka:kafka-100")
-findProject(":sdks:java:io:kafka:kafka-100")?.name = "kafka-100"
-include("sdks:java:io:kafka:kafka-01103")
-findProject(":sdks:java:io:kafka:kafka-01103")?.name = "kafka-01103"
include("sdks:java:managed")
findProject(":sdks:java:managed")?.name = "managed"
include("sdks:java:io:iceberg")
