Code changes for pulsar 4.0

mukesh-ctds · mukesh-ctds · commit 768812a2d386 · 2025-03-31T16:19:30.000+05:30
diff --git a/.github/workflows/pr-docker-tests.yml b/.github/workflows/pr-docker-tests.yml
@@ -3,7 +3,7 @@ name: docker tests
 on:
   push:
     branches:
-      - 3.1_ds
+      - 4.0_ds
   pull_request:
 
 
diff --git a/.github/workflows/pr-impl-test.yml b/.github/workflows/pr-impl-test.yml
@@ -3,7 +3,7 @@ name: kop mvn build check and kafka-impl test
 on:
   push:
     branches:
-      - 3.1_ds
+      - 4.0_ds
   pull_request:
 
 jobs:
diff --git a/.github/workflows/pr-proxy-tests.yml b/.github/workflows/pr-proxy-tests.yml
@@ -3,7 +3,7 @@ name: kop proxy tests
 on:
   push:
     branches:
-      - 3.1_ds
+      - 4.0_ds
   pull_request:
 
 
diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
@@ -3,7 +3,7 @@ name: kop tests
 on:
   push:
     branches:
-      - 3.1_ds
+      - 4.0_ds
   pull_request:
 
 
diff --git a/docker/testImage/Dockerfile b/docker/testImage/Dockerfile
@@ -1,4 +1,4 @@
-FROM datastax/lunastreaming-all:3.1
+FROM datastax/lunastreaming-all:4.0
 USER root
 RUN apt-get update && apt-get -y install openjdk-11-dbg
 RUN rm /pulsar/protocols/*.nar /pulsar/proxyextensions/*.nar
diff --git a/kafka-0-10/pom.xml b/kafka-0-10/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>com.datastax.oss</groupId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-client-api</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
diff --git a/kafka-0-9/pom.xml b/kafka-0-9/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>com.datastax.oss</groupId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-client-api</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
diff --git a/kafka-1-0/pom.xml b/kafka-1-0/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>com.datastax.oss</groupId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-client-api</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
diff --git a/kafka-2-8/pom.xml b/kafka-2-8/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>com.datastax.oss</groupId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-client-api</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
diff --git a/kafka-3-0/pom.xml b/kafka-3-0/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>com.datastax.oss</groupId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-client-api</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
diff --git a/kafka-client-api/pom.xml b/kafka-client-api/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>com.datastax.oss</groupId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/kafka-client-factory/pom.xml b/kafka-client-factory/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>com.datastax.oss</groupId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,32 +30,32 @@
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-client-api</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-1-0</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-0-10</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-2-8</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-3-0</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>kafka-0-9</artifactId>
-      <version>3.1.0.4-SNAPSHOT</version>
+      <version>4.0.3.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/kafka-impl/pom.xml b/kafka-impl/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.datastax.oss</groupId>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>com.datastax.oss</groupId>
diff --git a/oauth-client/pom.xml b/oauth-client/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>com.datastax.oss</groupId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>oauth-client</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>com.datastax.oss</groupId>
   <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-  <version>3.1.0.4-SNAPSHOT</version>
+  <version>4.0.3.0-SNAPSHOT</version>
   <name>StreamNative :: Pulsar Protocol Handler :: KoP Parent</name>
   <description>Parent for Kafka on Pulsar implemented using Pulsar Protocol Handler.</description>
 
diff --git a/proxy/pom.xml b/proxy/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.datastax.oss</groupId>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>com.datastax.oss</groupId>
diff --git a/schema-registry/pom.xml b/schema-registry/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.datastax.oss</groupId>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>com.datastax.oss</groupId>
diff --git a/test-listener/pom.xml b/test-listener/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
         <groupId>com.datastax.oss</groupId>
-        <version>3.1.0.4-SNAPSHOT</version>
+        <version>4.0.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.datastax.oss</groupId>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-    <version>3.1.0.4-SNAPSHOT</version>
+    <version>4.0.3.0-SNAPSHOT</version>
   </parent>
 
   <groupId>com.datastax.oss</groupId>
diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/docker/DockerTest.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/docker/DockerTest.java
@@ -28,69 +28,69 @@
 @Slf4j
 public class DockerTest {
 
-    private static final String IMAGE_LUNASTREAMING31 = "datastax/lunastreaming:3.1";
-    private static final String IMAGE_PULSAR31 = "apachepulsar/pulsar:3.1.1";
+    private static final String IMAGE_LUNASTREAMING40 = "datastax/lunastreaming:4.0";
+    private static final String IMAGE_PULSAR40 = "apachepulsar/pulsar:4.0.3";
     private static final String CONFLUENT_CLIENT = "confluentinc/cp-kafka:latest";
     private static final String CONFLUENT_SCHEMAREGISTRY_CLIENT = "confluentinc/cp-schema-registry:latest";
 
     @Test
     public void test() throws Exception {
-        test("pulsar:9092", false, IMAGE_PULSAR31);
+        test("pulsar:9092", false, IMAGE_PULSAR40);
     }
 
     @Test
     public void testProxy() throws Exception {
-        test("pulsarproxy:9092", true, IMAGE_PULSAR31);
+        test("pulsarproxy:9092", true, IMAGE_PULSAR40);
     }
 
     @Test
     public void testAvro() throws Exception {
-        testAvro("pulsar:9092", "http://pulsar:8001", false, IMAGE_PULSAR31);
+        testAvro("pulsar:9092", "http://pulsar:8001", false, IMAGE_PULSAR40);
     }
 
     @Test
     public void testAvroProxy() throws Exception {
-        testAvro("pulsarproxy:9092", "http://pulsarproxy:8081", true, IMAGE_PULSAR31);
+        testAvro("pulsarproxy:9092", "http://pulsarproxy:8081", true, IMAGE_PULSAR40);
     }
 
     //    @Test
     public void testLunaStreaming() throws Exception {
-        test("pulsar:9092", false, IMAGE_LUNASTREAMING31);
+        test("pulsar:9092", false, IMAGE_LUNASTREAMING40);
     }
 
     //    @Test
     public void testLunaStreamingTls() throws Exception {
-        test("pulsar:9093", false, IMAGE_LUNASTREAMING31, true);
+        test("pulsar:9093", false, IMAGE_LUNASTREAMING40, true);
     }
 
     //    @Test
     public void testProxyLunaStreaming() throws Exception {
-        test("pulsarproxy:9092", true, IMAGE_LUNASTREAMING31);
+        test("pulsarproxy:9092", true, IMAGE_LUNASTREAMING40);
     }
 
     //    @Test
     public void testProxyLunaStreamingTls() throws Exception {
-        test("pulsarproxy:9093", true, IMAGE_LUNASTREAMING31, true);
+        test("pulsarproxy:9093", true, IMAGE_LUNASTREAMING40, true);
     }
 
     //    @Test
     public void testAvroLunaStreaming() throws Exception {
-        testAvro("pulsar:9092", "http://pulsar:8001", false, IMAGE_LUNASTREAMING31);
+        testAvro("pulsar:9092", "http://pulsar:8001", false, IMAGE_LUNASTREAMING40);
     }
 
     //    @Test
     public void testAvroLunaStreamingTls() throws Exception {
-        testAvro("pulsar:9093", "https://pulsar:8001", false, IMAGE_LUNASTREAMING31, true);
+        testAvro("pulsar:9093", "https://pulsar:8001", false, IMAGE_LUNASTREAMING40, true);
     }
 
     //    @Test
     public void testAvroProxyLunaStreaming() throws Exception {
-        testAvro("pulsarproxy:9092", "http://pulsarproxy:8081", true, IMAGE_LUNASTREAMING31);
+        testAvro("pulsarproxy:9092", "http://pulsarproxy:8081", true, IMAGE_LUNASTREAMING40);
     }
 
     //    @Test
     public void testAvroProxyLunaStreamingTls() throws Exception {
-        testAvro("pulsarproxy:9093", "https://pulsarproxy:8081", true, IMAGE_LUNASTREAMING31, true);
+        testAvro("pulsarproxy:9093", "https://pulsarproxy:8081", true, IMAGE_LUNASTREAMING40, true);
     }
 
     private void test(String kafkaAddress, boolean proxy, String image) throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM datastax/lunastreaming-all:3.1`
	`1`	`+FROM datastax/lunastreaming-all:4.0`
`2`	`2`	`USER root`
`3`	`3`	`RUN apt-get update && apt-get -y install openjdk-11-dbg`
`4`	`4`	`RUN rm /pulsar/protocols/.nar /pulsar/proxyextensions/.nar`