Remove 2.1 and 2.2 and add 2.8 for Kafka compatibility test (#34265)

Abacn · web-flow · commit bd02aa62fda5 · 2025-03-13T10:24:22.000-04:00
diff --git a/sdks/java/io/kafka/build.gradle b/sdks/java/io/kafka/build.gradle
@@ -37,11 +37,10 @@ ext {
 
 def kafkaVersions = [
     '201': "2.0.1",
-    '211': "2.1.1",
-    '222': "2.2.2",
     '231': "2.3.1",
     '241': "2.4.1",
     '251': "2.5.1",
+    '282': "2.8.2",
     '312': "3.1.2",
     '390': "3.9.0",
 ]
@@ -139,14 +138,9 @@ task kafkaVersionsCompatibilityTest {
   description = 'Runs KafkaIO with different Kafka client APIs'
   def testNames = createTestList(kafkaVersions, "Test")
   dependsOn testNames
-  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")
-  dependsOn (":sdks:java:io:kafka:kafka-390:kafkaVersion390BatchIT")
+  kafkaVersions.keySet().each {
+    dependsOn (":sdks:java:io:kafka:kafka-${it}:kafkaVersion${it}BatchIT")
+  }
 }
 
 static def createTestList(Map<String, String> prefixMap, String suffix) {
diff --git a/sdks/java/io/kafka/kafka-222/build.gradle b/sdks/java/io/kafka/kafka-222/build.gradle
diff --git a/sdks/java/io/kafka/kafka-282/build.gradle b/sdks/java/io/kafka/kafka-282/build.gradle
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 project.ext {
-    delimited="2.1.1"
-    undelimited="211"
+    delimited="2.8.2"
+    undelimited="282"
     sdfCompatible=true
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -339,16 +339,14 @@ include("sdks:java:io:kafka:kafka-390")
 findProject(":sdks:java:io:kafka:kafka-390")?.name = "kafka-390"
 include("sdks:java:io:kafka:kafka-312")
 findProject(":sdks:java:io:kafka:kafka-312")?.name = "kafka-312"
+include("sdks:java:io:kafka:kafka-282")
+findProject(":sdks:java:io:kafka:kafka-282")?.name = "kafka-282"
 include("sdks:java:io:kafka:kafka-251")
 findProject(":sdks:java:io:kafka:kafka-251")?.name = "kafka-251"
 include("sdks:java:io:kafka:kafka-241")
 findProject(":sdks:java:io:kafka:kafka-241")?.name = "kafka-241"
 include("sdks:java:io:kafka:kafka-231")
 findProject(":sdks:java:io:kafka:kafka-231")?.name = "kafka-231"
-include("sdks:java:io:kafka:kafka-222")
-findProject(":sdks:java:io:kafka:kafka-222")?.name = "kafka-222"
-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:managed")
