[FLINK-29709][Connector/Pulsar] Bump the Pulsar to latest 2.10.2 (apa…

…che#21204)
dchristle · Nov 18, 2022 · 1397b5b · 1397b5b
1 parent 9c203aa
commit 1397b5b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 10 deletions.
diff --git a/flink-connectors/flink-connector-pulsar/pom.xml b/flink-connectors/flink-connector-pulsar/pom.xml
@@ -35,13 +35,14 @@ under the License.
  <packaging>jar</packaging>
 
  <properties>
- <pulsar.version>2.10.1</pulsar.version>
+ <pulsar.version>2.10.2</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-netty.version>4.1.77.Final</pulsar-netty.version>
  <pulsar-grpc.version>1.45.1</pulsar-grpc.version>
+ <pulsar-caffeine.version>2.9.1</pulsar-caffeine.version>
  </properties>
 
  <dependencies>
@@ -134,6 +135,12 @@ under the License.
  <version>${pulsar.version}</version>
  <scope>test</scope>
  </dependency>
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ <version>${pulsar-caffeine.version}</version>
+ <scope>test</scope>
+ </dependency>
 
  <!-- Add Pulsar 2.x as a dependency. -->
  <!-- Move this to button for avoiding class conflicts with pulsar-broker. -->

diff --git a/...or-pulsar/src/main/java/org/apache/flink/connector/pulsar/common/schema/PulsarSchema.java b/...or-pulsar/src/main/java/org/apache/flink/connector/pulsar/common/schema/PulsarSchema.java
@@ -155,6 +155,9 @@ private void writeObject(ObjectOutputStream oos) throws IOException {
  oos.writeUTF(entry.getKey());
  oos.writeUTF(entry.getValue());
  }
+
+ // Timestamp
+ oos.writeLong(schemaInfo.getTimestamp());
  }
 
  private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
@@ -177,7 +180,17 @@ private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IO
  properties.put(ois.readUTF(), ois.readUTF());
  }
 
- this.schemaInfo = new SchemaInfoImpl(name, schemaBytes, type, properties);
+ // Timestamp
+ long timestamp = ois.readLong();
+
+ this.schemaInfo =
+ SchemaInfoImpl.builder()
+ .name(name)
+ .schema(schemaBytes)
+ .type(type)
+ .properties(properties)
+ .timestamp(timestamp)
+ .build();
  this.schema = createSchema(schemaInfo);
  }
 

diff --git a/...lsar/src/main/java/org/apache/flink/connector/pulsar/common/schema/PulsarSchemaUtils.java b/...lsar/src/main/java/org/apache/flink/connector/pulsar/common/schema/PulsarSchemaUtils.java
@@ -181,8 +181,13 @@ public static SchemaInfo encodeClassInfo(SchemaInfo schemaInfo, Class<?> typeCla
  Map<String, String> properties = new HashMap<>(schemaInfo.getProperties());
  properties.put(CLASS_INFO_PLACEHOLDER, typeClass.getName());
 
- return new SchemaInfoImpl(
- schemaInfo.getName(), schemaInfo.getSchema(), schemaInfo.getType(), properties);
+ return SchemaInfoImpl.builder()
+ .name(schemaInfo.getName())
+ .schema(schemaInfo.getSchema())
+ .type(schemaInfo.getType())
+ .properties(properties)
+ .timestamp(schemaInfo.getTimestamp())
+ .build();
  }
 
  @SuppressWarnings("unchecked")

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
@@ -6,10 +6,10 @@ The Apache Software Foundation (http:https://www.apache.org/).
 
 This project bundles the following dependencies under the Apache Software License 2.0 (http:https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-- org.apache.pulsar:bouncy-castle-bc:pkg:2.10.1
-- org.apache.pulsar:pulsar-client-admin-api:2.10.1
-- org.apache.pulsar:pulsar-client-all:2.10.1
-- org.apache.pulsar:pulsar-client-api:2.10.1
+- org.apache.pulsar:bouncy-castle-bc:pkg:2.10.2
+- org.apache.pulsar:pulsar-client-admin-api:2.10.2
+- org.apache.pulsar:pulsar-client-all:2.10.2
+- org.apache.pulsar:pulsar-client-api:2.10.2
 - org.slf4j:jul-to-slf4j:1.7.32
 
 This project bundles the following dependencies under the Bouncy Castle license.

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
@@ -31,7 +31,7 @@ under the License.
  <name>Flink : E2E Tests : Pulsar</name>
 
  <properties>
- <pulsar.version>2.10.1</pulsar.version>
+ <pulsar.version>2.10.2</pulsar.version>
  <bouncycastle.version>1.69</bouncycastle.version>
  <jaxb-api.version>2.3.1</jaxb-api.version>
  </properties>

diff --git a/...arent/flink-test-utils-junit/src/main/java/org/apache/flink/util/DockerImageVersions.java b/...arent/flink-test-utils-junit/src/main/java/org/apache/flink/util/DockerImageVersions.java
@@ -38,7 +38,7 @@ public class DockerImageVersions {
 
  public static final String LOCALSTACK = "localstack/localstack:0.13.3";
 
- public static final String PULSAR = "apachepulsar/pulsar:2.10.1";
+ public static final String PULSAR = "apachepulsar/pulsar:2.10.2";
 
  public static final String CASSANDRA_4_0 = "cassandra:4.0.3";