From 1654b6bdc74285f2d956f83c7e4d982fae7c79e3 Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Thu, 4 Jan 2024 10:46:59 +0800 Subject: [PATCH] Update pulsar version and project version (#2034) Update the Pulsar version to 3.1.1 and the project version to 3.2.0-SNAPSHOT. --- kafka-0-10/pom.xml | 2 +- kafka-0-9/pom.xml | 2 +- kafka-1-0/pom.xml | 2 +- kafka-2-8/pom.xml | 2 +- kafka-3-0/pom.xml | 2 +- kafka-client-api/pom.xml | 2 +- kafka-client-factory/pom.xml | 2 +- kafka-impl/pom.xml | 2 +- .../pulsar/handlers/kop/utils/OffsetFinderTest.java | 7 ++++++- kafka-payload-processor-shaded-tests/pom.xml | 2 +- kafka-payload-processor-shaded/pom.xml | 2 +- kafka-payload-processor/pom.xml | 2 +- oauth-client-shaded-test/pom.xml | 2 +- oauth-client-shaded/pom.xml | 2 +- oauth-client/pom.xml | 2 +- pom.xml | 4 ++-- schema-registry/pom.xml | 2 +- test-listener/pom.xml | 2 +- tests/pom.xml | 2 +- .../pulsar/handlers/kop/KopProtocolHandlerTestBase.java | 2 -- .../kop/security/auth/KafkaMockAuthorizationProvider.java | 5 +++++ 21 files changed, 30 insertions(+), 22 deletions(-) diff --git a/kafka-0-10/pom.xml b/kafka-0-10/pom.xml index 4bc47731fe..ec80f18b4d 100644 --- a/kafka-0-10/pom.xml +++ b/kafka-0-10/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/kafka-0-9/pom.xml b/kafka-0-9/pom.xml index 4175beb50e..7e735abe2d 100644 --- a/kafka-0-9/pom.xml +++ b/kafka-0-9/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/kafka-1-0/pom.xml b/kafka-1-0/pom.xml index 36dca1e4a3..fc7351b242 100644 --- a/kafka-1-0/pom.xml +++ b/kafka-1-0/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/kafka-2-8/pom.xml b/kafka-2-8/pom.xml index 5f35317075..87ea008d6a 100644 --- a/kafka-2-8/pom.xml +++ b/kafka-2-8/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/kafka-3-0/pom.xml b/kafka-3-0/pom.xml index 38f5b9641b..857a7ea6c9 100644 --- a/kafka-3-0/pom.xml +++ b/kafka-3-0/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/kafka-client-api/pom.xml b/kafka-client-api/pom.xml index e6c6c15ef5..c379e4a278 100644 --- a/kafka-client-api/pom.xml +++ b/kafka-client-api/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/kafka-client-factory/pom.xml b/kafka-client-factory/pom.xml index 8875d78c08..3e0e1441fe 100644 --- a/kafka-client-factory/pom.xml +++ b/kafka-client-factory/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/kafka-impl/pom.xml b/kafka-impl/pom.xml index eaef9656d5..251b6b0bda 100644 --- a/kafka-impl/pom.xml +++ b/kafka-impl/pom.xml @@ -22,7 +22,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT io.streamnative.pulsar.handlers 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 index db42f414e5..47cc3d3376 100644 --- 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 }); 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 index 5c7ba7742d..c45147442d 100644 --- a/kafka-payload-processor-shaded-tests/pom.xml +++ b/kafka-payload-processor-shaded-tests/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/kafka-payload-processor-shaded/pom.xml b/kafka-payload-processor-shaded/pom.xml index 6cae196c7b..0dfb0f40ec 100644 --- a/kafka-payload-processor-shaded/pom.xml +++ b/kafka-payload-processor-shaded/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/kafka-payload-processor/pom.xml b/kafka-payload-processor/pom.xml index 19823ae323..f34af51940 100644 --- a/kafka-payload-processor/pom.xml +++ b/kafka-payload-processor/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/oauth-client-shaded-test/pom.xml b/oauth-client-shaded-test/pom.xml index 1138edbc75..84b00b9093 100644 --- a/oauth-client-shaded-test/pom.xml +++ b/oauth-client-shaded-test/pom.xml @@ -21,7 +21,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT oauth-client-shaded-test diff --git a/oauth-client-shaded/pom.xml b/oauth-client-shaded/pom.xml index dc611e1164..6ea1dd9ce4 100644 --- a/oauth-client-shaded/pom.xml +++ b/oauth-client-shaded/pom.xml @@ -21,7 +21,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT oauth-client diff --git a/oauth-client/pom.xml b/oauth-client/pom.xml index 7b1a856d1a..4bd1ab92b9 100644 --- a/oauth-client/pom.xml +++ b/oauth-client/pom.xml @@ -22,7 +22,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT oauth-client-original diff --git a/pom.xml b/pom.xml index 9582ab3361..d1023cb0ef 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT StreamNative :: Pulsar Protocol Handler :: KoP Parent Parent for Kafka on Pulsar implemented using Pulsar Protocol Handler. @@ -53,7 +53,7 @@ 4.11.0 3.0.0-beta-2 io.streamnative - 3.0.0.1 + 3.1.1.1 1.7.25 3.1.12 2.1.3.Final diff --git a/schema-registry/pom.xml b/schema-registry/pom.xml index 3687fa1a72..9eff014e66 100644 --- a/schema-registry/pom.xml +++ b/schema-registry/pom.xml @@ -20,7 +20,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT io.streamnative.pulsar.handlers diff --git a/test-listener/pom.xml b/test-listener/pom.xml index 659ffb024e..9e0e8c3b12 100644 --- a/test-listener/pom.xml +++ b/test-listener/pom.xml @@ -20,7 +20,7 @@ pulsar-protocol-handler-kafka-parent io.streamnative.pulsar.handlers - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index ea69b8734d..ef7273c834 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -22,7 +22,7 @@ io.streamnative.pulsar.handlers pulsar-protocol-handler-kafka-parent - 2.11.0-SNAPSHOT + 3.2.0-SNAPSHOT io.streamnative.pulsar.handlers 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 index fe939f3689..2fa1a163d8 100644 --- 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/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java index 574bf352ac..23ff3eb89f 100644 --- a/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java +++ b/tests/src/test/java/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java @@ -180,6 +180,11 @@ public Boolean allowNamespacePolicyOperation(NamespaceName namespaceName, return roleAuthorized(role); } + @Override + public CompletableFuture removePermissionsAsync(TopicName topicName) { + return CompletableFuture.completedFuture(null); + } + @Override public CompletableFuture allowTopicOperationAsync(TopicName topic, String role,