You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2022/07/05 14:32:50 UTC
[flink] 01/03: [FLINK-27199][Connector/Pulsar] Bump the pulsar-client-all to latest 2.10.0.
This is an automated email from the ASF dual-hosted git repository.
martijnvisser pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 688f6ab014a45948fb7ced1718588b792956b912
Author: Yufan Sheng <yu...@streamnative.io>
AuthorDate: Tue Jul 5 02:48:18 2022 +0800
[FLINK-27199][Connector/Pulsar] Bump the pulsar-client-all to latest 2.10.0.
---
flink-connectors/flink-connector-pulsar/pom.xml | 25 +++++++++-------------
.../pulsar/sink/writer/router/MessageKeyHash.java | 4 ++--
.../pulsar/source/config/SourceConfiguration.java | 2 +-
.../cursor/start/MessageIdStartCursor.java | 2 +-
.../pulsar/source/split/PulsarPartitionSplit.java | 4 ++--
.../src/main/resources/META-INF/NOTICE | 10 ++++-----
.../flink-end-to-end-tests-pulsar/pom.xml | 2 +-
.../org/apache/flink/util/DockerImageVersions.java | 2 +-
8 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/flink-connectors/flink-connector-pulsar/pom.xml b/flink-connectors/flink-connector-pulsar/pom.xml
index 8600d565aa6..bfba4068ee8 100644
--- a/flink-connectors/flink-connector-pulsar/pom.xml
+++ b/flink-connectors/flink-connector-pulsar/pom.xml
@@ -35,14 +35,14 @@ under the License.
<packaging>jar</packaging>
<properties>
- <pulsar.version>2.9.1</pulsar.version>
+ <pulsar.version>2.10.0</pulsar.version>
<!-- Test Libraries -->
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
+ <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
<pulsar-commons-lang3.version>3.11</pulsar-commons-lang3.version>
- <pulsar-zookeeper.version>3.6.3</pulsar-zookeeper.version>
- <pulsar-netty.version>4.1.72.Final</pulsar-netty.version>
- <pulsar-grpc.version>1.33.0</pulsar-grpc.version>
+ <pulsar-netty.version>4.1.74.Final</pulsar-netty.version>
+ <pulsar-grpc.version>1.42.1</pulsar-grpc.version>
</properties>
<dependencies>
@@ -107,7 +107,7 @@ under the License.
<scope>test</scope>
</dependency>
- <!-- Pulsar bundles the latest bookkeeper & zookeeper, -->
+ <!-- Pulsar bundles the latest bookkeeper -->
<!-- we don't override the version here. -->
<dependency>
<groupId>org.apache.pulsar</groupId>
@@ -123,6 +123,10 @@ under the License.
<groupId>org.powermock</groupId>
<artifactId>powermock-module-testng</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -141,15 +145,6 @@ under the License.
<scope>test</scope>
</dependency>
- <!-- Pulsar use a newer zookeeper in broker. -->
- <!-- Bump the version only for testing. -->
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${pulsar-zookeeper.version}</version>
- <scope>test</scope>
- </dependency>
-
<!-- Add Pulsar 2.x as a dependency. -->
<!-- Move this to button for avoiding class conflicts with pulsar-broker. -->
@@ -234,7 +229,7 @@ under the License.
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>1.7.0</version>
+ <version>${os-maven-plugin.version}</version>
</extension>
</extensions>
diff --git a/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/sink/writer/router/MessageKeyHash.java b/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/sink/writer/router/MessageKeyHash.java
index 7f35760f253..bbac99e4b96 100644
--- a/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/sink/writer/router/MessageKeyHash.java
+++ b/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/sink/writer/router/MessageKeyHash.java
@@ -25,7 +25,7 @@ import org.apache.flink.configuration.description.InlineElement;
import org.apache.pulsar.client.impl.Hash;
import org.apache.pulsar.client.impl.JavaStringHash;
-import org.apache.pulsar.client.impl.Murmur3_32Hash;
+import org.apache.pulsar.client.impl.Murmur3Hash32;
import static org.apache.flink.configuration.description.LinkElement.link;
import static org.apache.flink.configuration.description.TextElement.code;
@@ -57,7 +57,7 @@ public enum MessageKeyHash implements DescribedEnum {
link("https://en.wikipedia.org/wiki/MurmurHash", "Murmur3"))) {
@Override
public Hash getHash() {
- return Murmur3_32Hash.getInstance();
+ return Murmur3Hash32.getInstance();
}
};
diff --git a/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/config/SourceConfiguration.java b/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/config/SourceConfiguration.java
index 806fe4a418b..24e7ec0c9c0 100644
--- a/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/config/SourceConfiguration.java
+++ b/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/config/SourceConfiguration.java
@@ -45,7 +45,7 @@ import static org.apache.flink.connector.pulsar.source.PulsarSourceOptions.PULSA
import static org.apache.flink.connector.pulsar.source.PulsarSourceOptions.PULSAR_SUBSCRIPTION_TYPE;
import static org.apache.flink.connector.pulsar.source.PulsarSourceOptions.PULSAR_VERIFY_INITIAL_OFFSETS;
-/** The configure class for pulsar source. */
+/** The configuration class for pulsar source. */
@PublicEvolving
public class SourceConfiguration extends PulsarConfiguration {
private static final long serialVersionUID = 8488507275800787580L;
diff --git a/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/enumerator/cursor/start/MessageIdStartCursor.java b/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/enumerator/cursor/start/MessageIdStartCursor.java
index f8079608cc6..71a4eb6a026 100644
--- a/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/enumerator/cursor/start/MessageIdStartCursor.java
+++ b/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/enumerator/cursor/start/MessageIdStartCursor.java
@@ -27,7 +27,7 @@ import org.apache.pulsar.client.impl.MessageIdImpl;
import static org.apache.flink.util.Preconditions.checkState;
-/** This cursor would left pulsar start consuming from a specific message id. */
+/** This cursor would leave pulsar start consuming from a specific message id. */
public class MessageIdStartCursor implements StartCursor {
private static final long serialVersionUID = -8057345435887170111L;
diff --git a/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/split/PulsarPartitionSplit.java b/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/split/PulsarPartitionSplit.java
index 0ec693a2b26..90e29ca4712 100644
--- a/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/split/PulsarPartitionSplit.java
+++ b/flink-connectors/flink-connector-pulsar/src/main/java/org/apache/flink/connector/pulsar/source/split/PulsarPartitionSplit.java
@@ -60,8 +60,8 @@ public class PulsarPartitionSplit implements SourceSplit {
public PulsarPartitionSplit(
TopicPartition partition,
StopCursor stopCursor,
- MessageId latestConsumedId,
- TxnID uncommittedTransactionId) {
+ @Nullable MessageId latestConsumedId,
+ @Nullable TxnID uncommittedTransactionId) {
this.partition = checkNotNull(partition);
this.stopCursor = checkNotNull(stopCursor);
this.latestConsumedId = latestConsumedId;
diff --git a/flink-connectors/flink-sql-connector-pulsar/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-sql-connector-pulsar/src/main/resources/META-INF/NOTICE
index db82a498c9e..3bcba0e0198 100644
--- a/flink-connectors/flink-sql-connector-pulsar/src/main/resources/META-INF/NOTICE
+++ b/flink-connectors/flink-sql-connector-pulsar/src/main/resources/META-INF/NOTICE
@@ -6,11 +6,11 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- org.apache.pulsar:bouncy-castle-bc:pkg:2.9.1
-- org.apache.pulsar:pulsar-client-admin-api:2.9.1
-- org.apache.pulsar:pulsar-client-all:2.9.1
-- org.apache.pulsar:pulsar-client-api:2.9.1
-- org.slf4j:jul-to-slf4j:1.7.25
+- org.apache.pulsar:bouncy-castle-bc:pkg:2.10.0
+- org.apache.pulsar:pulsar-client-admin-api:2.10.0
+- org.apache.pulsar:pulsar-client-all:2.10.0
+- org.apache.pulsar:pulsar-client-api:2.10.0
+- org.slf4j:jul-to-slf4j:1.7.32
This project bundles the following dependencies under the Bouncy Castle license.
See bundled license files for details.
diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-pulsar/pom.xml b/flink-end-to-end-tests/flink-end-to-end-tests-pulsar/pom.xml
index 13bf4090fe1..b9bc5d4c2b1 100644
--- a/flink-end-to-end-tests/flink-end-to-end-tests-pulsar/pom.xml
+++ b/flink-end-to-end-tests/flink-end-to-end-tests-pulsar/pom.xml
@@ -31,7 +31,7 @@ under the License.
<name>Flink : E2E Tests : Pulsar</name>
<properties>
- <pulsar.version>2.9.1</pulsar.version>
+ <pulsar.version>2.10.0</pulsar.version>
<bouncycastle.version>1.69</bouncycastle.version>
</properties>
diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/DockerImageVersions.java b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/DockerImageVersions.java
index e99aff21765..e59e939500a 100644
--- a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/DockerImageVersions.java
+++ b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/DockerImageVersions.java
@@ -42,7 +42,7 @@ public class DockerImageVersions {
public static final String LOCALSTACK = "localstack/localstack:0.13.3";
- public static final String PULSAR = "apachepulsar/pulsar:2.9.1";
+ public static final String PULSAR = "apachepulsar/pulsar:2.10.0";
public static final String CASSANDRA_4_0 = "cassandra:4.0.3";