Update pulsar version and project version (#2034)

Update the Pulsar version to 3.1.1 and the project version to 3.2.0-SNAPSHOT.
streamnative · Jan 4, 2024 · 1654b6b · 1654b6b
1 parent 6843a8e
commit 1654b6b
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 22 deletions.
diff --git a/kafka-0-10/pom.xml b/kafka-0-10/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-0-9/pom.xml b/kafka-0-9/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-1-0/pom.xml b/kafka-1-0/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-2-8/pom.xml b/kafka-2-8/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-3-0/pom.xml b/kafka-3-0/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-client-api/pom.xml b/kafka-client-api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-client-factory/pom.xml b/kafka-client-factory/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-impl/pom.xml b/kafka-impl/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.streamnative.pulsar.handlers</groupId>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>io.streamnative.pulsar.handlers</groupId>

diff --git a/kafka-impl/src/test/java/io/streamnative/pulsar/handlers/kop/utils/OffsetFinderTest.java b/kafka-impl/src/test/java/io/streamnative/pulsar/handlers/kop/utils/OffsetFinderTest.java
@@ -13,6 +13,8 @@
  */
 package io.streamnative.pulsar.handlers.kop.utils;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertTrue;
@@ -35,6 +37,7 @@
 import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl;
 import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
 import org.apache.pulsar.broker.service.persistent.PersistentMessageExpiryMonitor;
+import org.apache.pulsar.broker.service.persistent.PersistentTopic;
 import org.apache.pulsar.common.allocator.PulsarByteBufAllocator;
 import org.apache.pulsar.common.api.proto.MessageMetadata;
 import org.apache.pulsar.common.protocol.ByteBufPair;
@@ -171,8 +174,10 @@ public void findEntryFailed(ManagedLedgerException exception, Optional<Position>
             });
         assertTrue(ex.get());
 
+        PersistentTopic persistentTopic = mock(PersistentTopic.class);
+        when(persistentTopic.getName()).thenReturn("topicname");
         PersistentMessageExpiryMonitor monitor =
-            new PersistentMessageExpiryMonitor("topicname", c1.getName(), c1, null);
+            new PersistentMessageExpiryMonitor(persistentTopic, c1.getName(), c1, null);
         monitor.findEntryFailed(new ManagedLedgerException
             .ConcurrentFindCursorPositionException("failed"), Optional.empty(), null);
         Field field = monitor.getClass().getDeclaredField("expirationCheckInProgress");

diff --git a/kafka-payload-processor-shaded-tests/pom.xml b/kafka-payload-processor-shaded-tests/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-payload-processor-shaded/pom.xml b/kafka-payload-processor-shaded/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/kafka-payload-processor/pom.xml b/kafka-payload-processor/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/oauth-client-shaded-test/pom.xml b/oauth-client-shaded-test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.streamnative.pulsar.handlers</groupId>
         <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-        <version>2.11.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>oauth-client-shaded-test</artifactId>

diff --git a/oauth-client-shaded/pom.xml b/oauth-client-shaded/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.streamnative.pulsar.handlers</groupId>
         <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-        <version>2.11.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>oauth-client</artifactId>

diff --git a/oauth-client/pom.xml b/oauth-client/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
     <groupId>io.streamnative.pulsar.handlers</groupId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>oauth-client-original</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>io.streamnative.pulsar.handlers</groupId>
   <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-  <version>2.11.0-SNAPSHOT</version>
+  <version>3.2.0-SNAPSHOT</version>
   <name>StreamNative :: Pulsar Protocol Handler :: KoP Parent</name>
   <description>Parent for Kafka on Pulsar implemented using Pulsar Protocol Handler.</description>
 
@@ -53,7 +53,7 @@
     <mockito.version>4.11.0</mockito.version>
     <wiremock.version>3.0.0-beta-2</wiremock.version>
     <pulsar.group.id>io.streamnative</pulsar.group.id>
-    <pulsar.version>3.0.0.1</pulsar.version>
+    <pulsar.version>3.1.1.1</pulsar.version>
     <slf4j.version>1.7.25</slf4j.version>
     <spotbugs-annotations.version>3.1.12</spotbugs-annotations.version>
     <apicurio.version>2.1.3.Final</apicurio.version>

diff --git a/schema-registry/pom.xml b/schema-registry/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.streamnative.pulsar.handlers</groupId>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>io.streamnative.pulsar.handlers</groupId>

diff --git a/test-listener/pom.xml b/test-listener/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>2.11.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.streamnative.pulsar.handlers</groupId>
     <artifactId>pulsar-protocol-handler-kafka-parent</artifactId>
-    <version>2.11.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>io.streamnative.pulsar.handlers</groupId>

diff --git a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java
@@ -13,7 +13,6 @@
  */
 package io.streamnative.pulsar.handlers.kop;
 
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -393,7 +392,6 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception {
         doReturn(namespaceServiceSupplier).when(pulsar).getNamespaceServiceProvider();
 
         doReturn(sameThreadOrderedSafeExecutor).when(pulsar).getOrderedExecutor();
-        doAnswer((invocation) -> spy(invocation.callRealMethod())).when(pulsar).newCompactor();
     }
 
     public static MockZooKeeper createMockZooKeeper(String clusterName, String brokerUrl, String brokerUrlTls,

diff --git a/...ava/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java b/...ava/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java
@@ -180,6 +180,11 @@ public Boolean allowNamespacePolicyOperation(NamespaceName namespaceName,
         return roleAuthorized(role);
     }
 
+    @Override
+    public CompletableFuture<Void> removePermissionsAsync(TopicName topicName) {
+        return CompletableFuture.completedFuture(null);
+    }
+
     @Override
     public CompletableFuture<Boolean> allowTopicOperationAsync(TopicName topic,
                                                                String role,