From 94f475c9381b492e059993c3d5d34f2761db1433 Mon Sep 17 00:00:00 2001
From: streamnativebot <streamnativebot@streamnative.io>
Date: Sun, 26 Apr 2026 13:40:36 +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 2293b02ff..596d60b18 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>3.4.0-SNAPSHOT</version>
+        <version>4.0.10.1</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 707ea52b6..a34d621f6 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>3.4.0-SNAPSHOT</version>
+        <version>4.0.10.1</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 47fdb6df7..a6959d731 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>3.4.0-SNAPSHOT</version>
+        <version>4.0.10.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-proxy</artifactId>
diff --git a/pom.xml b/pom.xml
index 3d9a64b9d..511d4f6bb 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>3.4.0-SNAPSHOT</version>
+    <version>4.0.10.1</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.0.6.8</pulsar.version>
-        <sn.bom.version>4.0.6.8</sn.bom.version>
+        <pulsar.version>4.0.10.1</pulsar.version>
+        <sn.bom.version>4.0.10.1</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 dc84b2694..1d72e33a5 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>3.4.0-SNAPSHOT</version>
+        <version>4.0.10.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pulsar-protocol-handler-mqtt-tests</artifactId>

From ad5a37f19959c1f214e3e0c2eae2f061b13b13dd Mon Sep 17 00:00:00 2001
From: coderzc <zhaocong@apache.org>
Date: Mon, 27 Apr 2026 21:27:46 +0800
Subject: [PATCH 2/2] fix(mqtt): adapt additional servlet api

---
 .../handlers/mqtt/broker/rest/MQTTAdditionalServlet.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mqtt-broker/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/rest/MQTTAdditionalServlet.java b/mqtt-broker/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/rest/MQTTAdditionalServlet.java
index dd37d580d..1472a23ee 100644
--- a/mqtt-broker/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/rest/MQTTAdditionalServlet.java
+++ b/mqtt-broker/src/main/java/io/streamnative/pulsar/handlers/mqtt/broker/rest/MQTTAdditionalServlet.java
@@ -16,7 +16,6 @@
 import org.apache.pulsar.broker.PulsarService;
 import org.apache.pulsar.broker.web.plugin.servlet.AdditionalServletWithPulsarService;
 import org.apache.pulsar.common.configuration.PulsarConfiguration;
-import org.eclipse.jetty.servlet.ServletHolder;
 
 /**
  * MQTT additional servlet.
@@ -36,8 +35,8 @@ public String getBasePath() {
     }
 
     @Override
-    public ServletHolder getServletHolder() {
-        return new ServletHolder(new MQTTServiceServlet(pulsarService));
+    public Object getServletInstance() {
+        return new MQTTServiceServlet(pulsarService);
     }
 
     @Override