From 080e92ad7a42beb0cfcd583b2848fdb2c882f7f4 Mon Sep 17 00:00:00 2001
From: mattison chao <mattisonchao@gmail.com>
Date: Tue, 15 Feb 2022 18:53:40 +0800
Subject: [PATCH 1/3] Bump Pulsar version to 2.10.0.0-rc4

---
 .../pulsar/handlers/mqtt/support/MQTTConsumer.java            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mqtt-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/support/MQTTConsumer.java b/mqtt-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/support/MQTTConsumer.java
index 241323761..0dc5f64aa 100644
--- a/mqtt-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/support/MQTTConsumer.java
+++ b/mqtt-impl/src/main/java/io/streamnative/pulsar/handlers/mqtt/support/MQTTConsumer.java
@@ -37,6 +37,7 @@
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.common.api.proto.CommandAck;
 import org.apache.pulsar.common.api.proto.CommandSubscribe;
+import org.apache.pulsar.common.protocol.Commands;
 
 /**
  * MQTT consumer.
@@ -65,7 +66,8 @@ public MQTTConsumer(Subscription subscription, String mqttTopicName, String puls
                         OutstandingPacketContainer outstandingPacketContainer, MQTTMetricsCollector metricsCollector,
                         ClientRestrictions clientRestrictions) {
         super(subscription, CommandSubscribe.SubType.Shared, pulsarTopicName, 0, 0, consumerName, true, cnx,
-                "", null, false, CommandSubscribe.InitialPosition.Latest, null, MessageId.latest);
+                "", null, false, CommandSubscribe.InitialPosition.Latest, null,
+                MessageId.latest, Commands.DEFAULT_CONSUMER_EPOCH);
         this.pulsarTopicName = pulsarTopicName;
         this.mqttTopicName = mqttTopicName;
         this.cnx = cnx;

From 4734dd4554a8e027cea72f148dd07fb9cd5f4cb6 Mon Sep 17 00:00:00 2001
From: streamnativebot <streamnativebot@streamnative.io>
Date: Tue, 15 Feb 2022 06:31:26 +0000
Subject: [PATCH 2/3] "Created by snbot"

---
 mqtt-impl/pom.xml | 2 +-
 pom.xml           | 4 ++--
 tests/pom.xml     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mqtt-impl/pom.xml b/mqtt-impl/pom.xml
index 95f71738b..514fa899b 100644
--- a/mqtt-impl/pom.xml
+++ b/mqtt-impl/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>2.10.0.0-rc3</version>
+        <version>2.10.0.0-rc4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt</artifactId>
diff --git a/pom.xml b/pom.xml
index 754dea2df..e1521fac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>io.streamnative.pulsar.handlers</groupId>
     <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
-    <version>2.10.0.0-rc3</version>
+    <version>2.10.0.0-rc4</version>
     <name>StreamNative :: Pulsar Protocol Handler :: MoP Parent</name>
     <description>Parent for MQTT on Pulsar implemented using Pulsar Protocol Handler.</description>
 
@@ -49,7 +49,7 @@
         <mockito.version>2.22.0</mockito.version>
         <testng.version>6.14.3</testng.version>
         <awaitility.version>4.0.2</awaitility.version>
-        <pulsar.version>2.10.0.0-rc3</pulsar.version>
+        <pulsar.version>2.10.0.0-rc4</pulsar.version>
         <mqtt.codec.version>4.1.67.Final</mqtt.codec.version>
         <log4j2.version>2.17.1</log4j2.version>
         <lombok.version>1.18.4</lombok.version>
diff --git a/tests/pom.xml b/tests/pom.xml
index 79926f904..ebfadfc4e 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>2.10.0.0-rc3</version>
+        <version>2.10.0.0-rc4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-tests</artifactId>

From e200fd762320a81c0d8b2d33121acaca80bea758 Mon Sep 17 00:00:00 2001
From: mattison chao <mattisonchao@gmail.com>
Date: Tue, 15 Feb 2022 19:17:36 +0800
Subject: [PATCH 3/3] Upgrade netty version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e1521fac3..8281ce75b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <testng.version>6.14.3</testng.version>
         <awaitility.version>4.0.2</awaitility.version>
         <pulsar.version>2.10.0.0-rc4</pulsar.version>
-        <mqtt.codec.version>4.1.67.Final</mqtt.codec.version>
+        <mqtt.codec.version>4.1.74.Final</mqtt.codec.version>
         <log4j2.version>2.17.1</log4j2.version>
         <lombok.version>1.18.4</lombok.version>
         <fusesource.client.version>1.16</fusesource.client.version>