From e2b6a4cf2ae6ba7d7caca43aecb0e9e29a1a2d70 Mon Sep 17 00:00:00 2001
From: streamnativebot <streamnativebot@streamnative.io>
Date: Wed, 29 Apr 2026 11:46:52 +0000
Subject: [PATCH 1/2] "Created by snbot"

---
 mqtt-broker/pom.xml | 2 +-
 mqtt-common/pom.xml | 2 +-
 mqtt-proxy/pom.xml  | 2 +-
 pom.xml             | 6 +++---
 tests/pom.xml       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mqtt-broker/pom.xml b/mqtt-broker/pom.xml
index 6e93eb653..80d604185 100644
--- a/mqtt-broker/pom.xml
+++ b/mqtt-broker/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt</artifactId>
diff --git a/mqtt-common/pom.xml b/mqtt-common/pom.xml
index d1ef745ef..4d3d9718d 100644
--- a/mqtt-common/pom.xml
+++ b/mqtt-common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-common</artifactId>
diff --git a/mqtt-proxy/pom.xml b/mqtt-proxy/pom.xml
index 807060904..26b9d90dd 100644
--- a/mqtt-proxy/pom.xml
+++ b/mqtt-proxy/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>pulsar-protocol-handler-mqtt-parent</artifactId>
         <groupId>io.streamnative.pulsar.handlers</groupId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-proxy</artifactId>
diff --git a/pom.xml b/pom.xml
index 500f4e089..edc86f1d3 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>4.2.0-SNAPSHOT</version>
+    <version>4.3.0-SNAPSHOT</version>
     <name>StreamNative :: Pulsar Protocol Handler :: MoP Parent</name>
     <description>Parent for MQTT on Pulsar implemented using Pulsar Protocol Handler.</description>
 
@@ -51,8 +51,8 @@
         <mockito.version>2.22.0</mockito.version>
         <testng.version>6.14.3</testng.version>
         <awaitility.version>4.0.2</awaitility.version>
-        <pulsar.version>4.2.0-SNAPSHOT</pulsar.version>
-        <sn.bom.version>4.2.0-SNAPSHOT</sn.bom.version>
+        <pulsar.version>4.3.0-SNAPSHOT</pulsar.version>
+        <sn.bom.version>4.3.0-SNAPSHOT</sn.bom.version>
         <log4j2.version>2.18.0</log4j2.version>
         <fusesource.client.version>1.16</fusesource.client.version>
         <hivemq.mqtt.client.version>1.2.2</hivemq.mqtt.client.version>
diff --git a/tests/pom.xml b/tests/pom.xml
index d2ef8e747..7779b2b04 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>4.2.0-SNAPSHOT</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-tests</artifactId>

From d3f8939d920bb33f0521297069af3e5242b249d1 Mon Sep 17 00:00:00 2001
From: Jiwei Guo <technoboy@apache.org>
Date: Thu, 30 Apr 2026 19:15:09 +0800
Subject: [PATCH 2/2] Fix

---
 mqtt-common/pom.xml                           | 39 +++++++++++++++-
 .../mqtt/common/MQTTConnectionManager.java    |  5 +-
 mqtt-proxy/pom.xml                            | 46 ++++++++++++++++++-
 pom.xml                                       | 21 +++++----
 4 files changed, 98 insertions(+), 13 deletions(-)

diff --git a/mqtt-common/pom.xml b/mqtt-common/pom.xml
index 4d3d9718d..331fe1fce 100644
--- a/mqtt-common/pom.xml
+++ b/mqtt-common/pom.xml
@@ -24,4 +24,41 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-common</artifactId>
-</project>
\ No newline at end of file
+
+    <dependencies>
+        <dependency>
+            <groupId>io.streamnative</groupId>
+            <artifactId>pulsar-client-original</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.bookkeeper</groupId>
+            <artifactId>bookkeeper-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>${validation-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.conscrypt</groupId>
+            <artifactId>conscrypt-openjdk-uber</artifactId>
+            <version>${conscrypt.version}</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java b/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java
index efd7b3c53..211b4b5ed 100644
--- a/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java
+++ b/mqtt-common/src/main/java/io/streamnative/pulsar/handlers/mqtt/common/MQTTConnectionManager.java
@@ -30,7 +30,6 @@
 import java.util.function.Consumer;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.pulsar.jetcd.shaded.io.vertx.core.impl.ConcurrentHashSet;
 
 /**
  * Proxy connection manager.
@@ -40,7 +39,7 @@ public class MQTTConnectionManager {
 
     private final ConcurrentMap<String, Connection> localConnections;
 
-    private final ConcurrentHashSet<String> eventClientIds;
+    private final Set<String> eventClientIds;
 
     @Getter
     private static final HashedWheelTimer sessionExpireInterval =
@@ -58,7 +57,7 @@ public class MQTTConnectionManager {
     public MQTTConnectionManager(String advertisedAddress) {
         this.advertisedAddress = advertisedAddress;
         this.localConnections = new ConcurrentHashMap<>(2048);
-        this.eventClientIds = new ConcurrentHashSet<>(2048);
+        this.eventClientIds = ConcurrentHashMap.newKeySet(2048);
         this.connectListener = new ConnectEventListener();
         this.disconnectListener = new DisconnectEventListener();
     }
diff --git a/mqtt-proxy/pom.xml b/mqtt-proxy/pom.xml
index 26b9d90dd..e0785503e 100644
--- a/mqtt-proxy/pom.xml
+++ b/mqtt-proxy/pom.xml
@@ -32,6 +32,50 @@
             <artifactId>pulsar-protocol-handler-mqtt-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>simpleclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.ee8</groupId>
+            <artifactId>jetty-ee8-servlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet-core</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-multipart</artifactId>
+            <version>${jersey.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>${javax.ws.rs.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -55,4 +99,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index edc86f1d3..729db5836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,6 @@
     </licenses>
 
     <properties>
-        <lombok.version>1.18.22</lombok.version>
         <mockito.version>2.22.0</mockito.version>
         <testng.version>6.14.3</testng.version>
         <awaitility.version>4.0.2</awaitility.version>
@@ -72,6 +71,11 @@
         <spotbugs-maven-plugin.version>3.1.8</spotbugs-maven-plugin.version>
         <maven-jacoco-plugin.version>0.8.7</maven-jacoco-plugin.version>
         <opentelemetry.version>1.56.0</opentelemetry.version>
+        <validation-api.version>2.0.1.Final</validation-api.version>
+        <jersey.version>2.42</jersey.version>
+        <swagger-annotations.version>1.6.15</swagger-annotations.version>
+        <javax.ws.rs.version>2.1.1</javax.ws.rs.version>
+        <conscrypt.version>2.5.2</conscrypt.version>
     </properties>
 
     <dependencies>
@@ -131,6 +135,14 @@
             <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
             <version>${opentelemetry.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -198,13 +210,6 @@
                     <source>${javac.source}</source>
                     <target>${javac.target}</target>
                     <useIncrementalCompilation>false</useIncrementalCompilation>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                            <version>${lombok.version}</version>
-                        </path>
-                    </annotationProcessorPaths>
                     <compilerArgs>
                         <arg>-parameters</arg>
                         <!-- enable 'all' lint warnings with some exclusions -->