Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

Update pulsar version and project version #2034

Merged
merged 2 commits into from
Jan 4, 2024
Merged

Update pulsar version and project version #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81a0799
Update pulsar version and project version
BewareMyPower Dec 29, 2023
e396297
Fix tests
BewareMyPower Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kafka-0-10/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kafka-0-9/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kafka-1-0/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kafka-2-8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kafka-3-0/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kafka-client-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kafka-client-factory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kafka-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion kafka-impl/src/test/java/io/streamnative/pulsar/handlers/kop/utils/OffsetFinderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion kafka-payload-processor-shaded-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kafka-payload-processor-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion kafka-payload-processor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion oauth-client-shaded-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion oauth-client-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion oauth-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion schema-registry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test-listener/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions tests/src/test/java/io/streamnative/pulsar/handlers/kop/KopProtocolHandlerTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions ...ava/io/streamnative/pulsar/handlers/kop/security/auth/KafkaMockAuthorizationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading