From 69ecadf7f957794bd27ee0d3907e6bb8a5aa1ab9 Mon Sep 17 00:00:00 2001
From: Jaehong Park <105151063+PHJ2000@users.noreply.github.com>
Date: Sat, 17 Oct 2026 17:15:12 +0900
Subject: [PATCH 1/2] GH-11538: Deprecate the Paho-based MQTT module

Fixes: https://github.com/spring-projects/spring-integration/issues/11538

The HiveMQ-based spring-integration-mqtt-client module provides the
replacement for the Paho-based MQTT integration.

* Deprecate the existing module types for removal as of 7.2.
* Explain the replacement in the MQTT reference and What's New.

Signed-off-by: Jaehong Park <105151063+PHJ2000@users.noreply.github.com>
---
 .../integration/mqtt/aot/MqttRuntimeHints.java         |  3 +++
 .../xml/MqttMessageDrivenChannelAdapterParser.java     |  4 +++-
 .../mqtt/config/xml/MqttNamespaceHandler.java          |  4 +++-
 .../config/xml/MqttOutboundChannelAdapterParser.java   |  4 +++-
 .../integration/mqtt/config/xml/MqttParserUtils.java   |  4 +++-
 .../mqtt/core/AbstractMqttClientManager.java           |  3 +++
 .../integration/mqtt/core/ClientManager.java           |  7 +++++++
 .../mqtt/core/DefaultMqttPahoClientFactory.java        | 10 +++++++++-
 .../integration/mqtt/core/MqttComponent.java           |  4 +++-
 .../integration/mqtt/core/MqttPahoClientFactory.java   |  4 +++-
 .../integration/mqtt/core/MqttPahoComponent.java       |  4 +++-
 .../integration/mqtt/core/Mqttv3ClientManager.java     |  3 +++
 .../integration/mqtt/core/Mqttv5ClientManager.java     |  3 +++
 .../mqtt/event/MqttConnectionFailedEvent.java          |  4 +++-
 .../integration/mqtt/event/MqttIntegrationEvent.java   |  3 +++
 .../mqtt/event/MqttMessageDeliveredEvent.java          |  4 +++-
 .../mqtt/event/MqttMessageDeliveryEvent.java           |  4 +++-
 .../mqtt/event/MqttMessageNotDeliveredEvent.java       |  4 +++-
 .../integration/mqtt/event/MqttMessageSentEvent.java   |  4 +++-
 .../integration/mqtt/event/MqttProtocolErrorEvent.java |  3 +++
 .../integration/mqtt/event/MqttSubscribedEvent.java    |  4 +++-
 .../AbstractMqttMessageDrivenChannelAdapter.java       |  4 +++-
 .../inbound/MqttPahoMessageDrivenChannelAdapter.java   |  4 +++-
 .../inbound/Mqttv5PahoMessageDrivenChannelAdapter.java |  4 +++-
 .../mqtt/outbound/AbstractMqttMessageHandler.java      |  4 +++-
 .../mqtt/outbound/MqttPahoMessageHandler.java          |  4 +++-
 .../mqtt/outbound/Mqttv5PahoMessageHandler.java        |  3 +++
 .../mqtt/support/DefaultPahoMessageConverter.java      |  4 +++-
 .../integration/mqtt/support/MqttHeaderAccessor.java   |  4 +++-
 .../integration/mqtt/support/MqttHeaderMapper.java     |  3 +++
 .../integration/mqtt/support/MqttHeaders.java          |  4 +++-
 .../integration/mqtt/support/MqttMessageConverter.java |  4 +++-
 .../integration/mqtt/support/MqttUtils.java            |  4 +++-
 src/reference/antora/modules/ROOT/pages/mqtt.adoc      |  6 +++++-
 src/reference/antora/modules/ROOT/pages/whats-new.adoc |  1 +
 35 files changed, 115 insertions(+), 25 deletions(-)

diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java
index d7415fb4f70..0bd7e9d7614 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java
@@ -19,9 +19,12 @@
  * {@link RuntimeHintsRegistrar} for Spring Integration MQTT module.
  *
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 6.1.9
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 class MqttRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java
index 5ca7c71e645..fcfe0da6e57 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java
@@ -18,10 +18,12 @@
  *
  * @author Gary Russell
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class MqttMessageDrivenChannelAdapterParser extends AbstractChannelAdapterParser {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java
index 19786fa9efc..e73cf9281f3 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java
@@ -10,10 +10,12 @@
  * The namespace handler for the MqttAdapter namespace.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class MqttNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java
index eadb5c520d4..5c1bd2b94da 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java
@@ -18,9 +18,11 @@
  * The parser for the MqttAdapter Outbound Channel Adapter.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class MqttOutboundChannelAdapterParser extends AbstractOutboundChannelAdapterParser {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java
index 0ae8935d908..04346808b05 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java
@@ -23,10 +23,12 @@
  *
  * @author Gary Russell
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 final class MqttParserUtils {
 
 	private MqttParserUtils() {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java
index abe0ba873cc..995137c32b2 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java
@@ -30,9 +30,12 @@
  * @author Artem Vozhdayenko
  * @author Artem Bilan
  * @author Christian Tzolov
+ * @author Jaehong Park
  *
  * @since 6.0
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public abstract class AbstractMqttClientManager<T, C> implements ClientManager<T, C>, ApplicationEventPublisherAware {
 
 	protected final Log logger = LogFactory.getLog(this.getClass()); // NOSONAR
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java
index 98313166e53..10e4bbb4fd9 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java
@@ -20,9 +20,12 @@
  * @author Artem Bilan
  * @author Jiri Soucek
  * @author Jiandong Ma
+ * @author Jaehong Park
  *
  * @since 6.0
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public interface ClientManager<T, C> extends SmartLifecycle, MqttComponent<C> {
 
 	/**
@@ -103,7 +106,9 @@ public interface ClientManager<T, C> extends SmartLifecycle, MqttComponent<C> {
 	 *
 	 * @see org.eclipse.paho.mqttv5.client.MqttCallback#connectComplete
 	 * @see org.eclipse.paho.client.mqttv3.MqttCallbackExtended#connectComplete
+	 * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
 	 */
+	@Deprecated(since = "7.2", forRemoval = true)
 	@FunctionalInterface
 	interface ConnectCallback {
 
@@ -124,7 +129,9 @@ interface ConnectCallback {
 	 *
 	 * @see org.eclipse.paho.mqttv5.client.MqttCallback#messageArrived(String, org.eclipse.paho.mqttv5.common.MqttMessage)
 	 * @see org.eclipse.paho.client.mqttv3.MqttCallback#messageArrived(String, org.eclipse.paho.client.mqttv3.MqttMessage)
+	 * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
 	 */
+	@Deprecated(since = "7.2", forRemoval = true)
 	@FunctionalInterface
 	interface DefaultMessageHandler<M> {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java
index b69d9a761a8..773033603c9 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java
@@ -20,10 +20,12 @@
  *
  * @author Gary Russell
  * @author Gunnar Hillert
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class DefaultMqttPahoClientFactory implements MqttPahoClientFactory {
 
 	private MqttConnectOptions options = new MqttConnectOptions();
@@ -65,6 +67,12 @@ public MqttConnectOptions getConnectionOptions() {
 		return this.options;
 	}
 
+	/**
+	 * An MQTT will message.
+	 *
+	 * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
+	 */
+	@Deprecated(since = "7.2", forRemoval = true)
 	public static class Will {
 
 		private final String topic;
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java
index f7ab64e7a59..b9d76772dc1 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java
@@ -12,9 +12,11 @@
  * @param <T> The connection information type.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  * @since 2.5
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public interface MqttComponent<T> extends BeanNameAware {
 
 	/**
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java
index e5e9cfe2506..fdf08551d19 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java
@@ -12,9 +12,11 @@
 
 /**
  * @author Gary Russell
+ * @author Jaehong Park
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public interface MqttPahoClientFactory {
 
 	/**
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java
index db14394a525..580383c54eb 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java
@@ -10,9 +10,11 @@
  * An extension of {@link MqttComponent} for Eclipse Paho components.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  * @since 5.4
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public interface MqttPahoComponent extends MqttComponent<MqttConnectOptions> {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java
index b78235f0a7b..d5637fc9792 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java
@@ -28,9 +28,12 @@
  * @author Artem Bilan
  * @author Christian Tzolov
  * @author Jiri Soucek
+ * @author Jaehong Park
  *
  * @since 6.0
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class Mqttv3ClientManager
 		extends AbstractMqttClientManager<IMqttAsyncClient, MqttConnectOptions>
 		implements MqttCallbackExtended {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java
index 838c0afab90..b6f57b381db 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java
@@ -31,9 +31,12 @@
  * @author Artem Bilan
  * @author Christian Tzolov
  * @author Jiri Soucek
+ * @author Jaehong Park
  *
  * @since 6.0
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class Mqttv5ClientManager
 		extends AbstractMqttClientManager<IMqttAsyncClient, MqttConnectionOptions>
 		implements MqttCallback {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java
index 3b54191cf61..a225f6b1312 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java
@@ -12,10 +12,12 @@
  *
  * @author Gary Russell
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 4.2.2
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 @SuppressWarnings("serial")
 public class MqttConnectionFailedEvent extends MqttIntegrationEvent {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java
index 6d1c8c83fa6..94dfa3019bd 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java
@@ -15,9 +15,12 @@
  *
  * @author Gary Russell
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 4.1
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 @SuppressWarnings("serial")
 public abstract class MqttIntegrationEvent extends IntegrationEvent {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java
index ba8f319b434..0c181197844 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java
@@ -9,9 +9,11 @@
  * was delivered.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  * @since 4.1
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 @SuppressWarnings("serial")
 public class MqttMessageDeliveredEvent extends MqttMessageDeliveryEvent {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java
index 5e4e10330b2..e8e3c632e91 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java
@@ -9,9 +9,11 @@
  * {@link #clientId} and {@link #clientInstance} can be used to correlate events.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  * @since 4.1
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 @SuppressWarnings("serial")
 public abstract class MqttMessageDeliveryEvent extends MqttIntegrationEvent {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java
index fd387421421..60cc98d56f2 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java
@@ -11,10 +11,12 @@
  * was not delivered on publish operation.
  *
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 6.4
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class MqttMessageNotDeliveredEvent extends MqttMessageDeliveryEvent {
 
 	@Serial
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java
index 771f3fe701c..af2014320da 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java
@@ -11,9 +11,11 @@
  * has been sent.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  * @since 4.1
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 @SuppressWarnings("serial")
 public class MqttMessageSentEvent extends MqttMessageDeliveryEvent {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java
index c2c7400d872..3b5dbfdf9c2 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java
@@ -10,11 +10,14 @@
  * The even representing an MQTT error occurred during client interaction.
  *
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 5.5.5
  *
  * @see org.eclipse.paho.mqttv5.client.MqttCallback#mqttErrorOccurred(MqttException)
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 @SuppressWarnings("serial")
 public class MqttProtocolErrorEvent extends MqttIntegrationEvent {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java
index 69f78a2d144..969f2b005ea 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java
@@ -6,9 +6,11 @@
 
 /**
  * @author Gary Russell
+ * @author Jaehong Park
  * @since 4.2.2
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 @SuppressWarnings("serial")
 public class MqttSubscribedEvent extends MqttIntegrationEvent {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java
index ddfd3d8ae52..e2b84439ab9 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java
@@ -40,10 +40,12 @@
  * @author Artem Vozhdayenko
  * @author Jiri Soucek
  * @author Glenn Renfro
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 @ManagedResource
 @IntegrationManagedResource
 public abstract class AbstractMqttMessageDrivenChannelAdapter<T, C> extends MessageProducerSupport
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
index 6574fee22fe..6a5bbd2bb2e 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
@@ -49,10 +49,12 @@
  * @author Artem Bilan
  * @author Artem Vozhdayenko
  * @author Glenn Renfro
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class MqttPahoMessageDrivenChannelAdapter
 		extends AbstractMqttMessageDrivenChannelAdapter<IMqttAsyncClient, MqttConnectOptions>
 		implements MqttCallbackExtended, MqttPahoComponent {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java
index fda2f52421c..d87202f1730 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java
@@ -76,10 +76,12 @@
  * @author Matthias Thoma
  * @author Glenn Renfro
  * @author Goutam Adwant
+ * @author Jaehong Park
  *
  * @since 5.5.5
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class Mqttv5PahoMessageDrivenChannelAdapter
 		extends AbstractMqttMessageDrivenChannelAdapter<IMqttAsyncClient, MqttConnectionOptions>
 		implements MqttCallback, MqttComponent<MqttConnectionOptions> {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java
index b5b56b145c2..83573777c77 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java
@@ -38,10 +38,12 @@
  * @author Gary Russell
  * @author Artem Bilan
  * @author Artem Vozhdayenko
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public abstract class AbstractMqttMessageHandler<T, C> extends AbstractMessageHandler
 		implements ManageableLifecycle, ApplicationEventPublisherAware {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java
index 853b73b7998..7c910446fcf 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java
@@ -39,10 +39,12 @@
  * @author Artem Bilan
  * @author Artem Vozhdayenko
  * @author Christian Tzolov
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class MqttPahoMessageHandler extends AbstractMqttMessageHandler<IMqttAsyncClient, MqttConnectOptions>
 		implements MqttCallback, MqttPahoComponent {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java
index e32605bfcba..ddcc7a7e5a4 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java
@@ -45,9 +45,12 @@
  * @author Artem Vozhdayenko
  * @author Glenn Renfro
  * @author Deng Pan
+ * @author Jaehong Park
  *
  * @since 5.5.5
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class Mqttv5PahoMessageHandler extends AbstractMqttMessageHandler<IMqttAsyncClient, MqttConnectionOptions>
 		implements MqttCallback, MqttComponent<MqttConnectionOptions> {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
index 08aebe05b4e..a7c50cdd17e 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
@@ -28,10 +28,12 @@
  *
  * @author Gary Russell
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class DefaultPahoMessageConverter implements MqttMessageConverter, BeanFactoryAware {
 
 	private final Charset charset;
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java
index 9b232ca72f9..9eed646622d 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java
@@ -12,9 +12,11 @@
  * Helper for typed access to incoming MQTT message headers.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  * @since 5.3
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public final class MqttHeaderAccessor {
 
 	private MqttHeaderAccessor() {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java
index 3518dba9ecb..b69c88bd98c 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java
@@ -26,9 +26,12 @@
  * The default {@link HeaderMapper} implementation for MQTT v5 message properties mapping.
  *
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 5.5.5
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public class MqttHeaderMapper implements HeaderMapper<MqttProperties> {
 
 	private static final LogAccessor LOGGER = new LogAccessor(MqttHeaderMapper.class);
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java
index 346814e7a90..62ed52d2ee3 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java
@@ -8,10 +8,12 @@
  * Spring Integration headers.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public final class MqttHeaders {
 
 	public static final String PREFIX = "mqtt_";
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java
index f0fc34e9252..a16de2735b4 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java
@@ -18,10 +18,12 @@
  *
  * @author Gary Russell
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 4.0
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public interface MqttMessageConverter extends MessageConverter {
 
 	/**
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java
index 197fc3badf9..d0dc553da1f 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java
@@ -19,10 +19,12 @@
  * MQTT Utilities.
  *
  * @author Gary Russell
+ * @author Jaehong Park
  *
  * @since 5.4
- *
+ * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
+@Deprecated(since = "7.2", forRemoval = true)
 public final class MqttUtils {
 
 	private static final boolean PAHO_MQTTV3_PRESENT =
diff --git a/src/reference/antora/modules/ROOT/pages/mqtt.adoc b/src/reference/antora/modules/ROOT/pages/mqtt.adoc
index a7943b9d8ea..2d208c26384 100644
--- a/src/reference/antora/modules/ROOT/pages/mqtt.adoc
+++ b/src/reference/antora/modules/ROOT/pages/mqtt.adoc
@@ -3,6 +3,10 @@
 
 Spring Integration provides inbound and outbound channel adapters to support the Message Queueing Telemetry Transport (MQTT) protocol.
 
+IMPORTANT: Starting with version 7.2, the Paho-based `spring-integration-mqtt` module is deprecated for removal in favor of the HiveMQ-based `spring-integration-mqtt-client` module.
+The following sections describe the deprecated Paho-based adapters.
+To migrate, use the `spring-integration-mqtt-client` dependency and the components in the `org.springframework.integration.mqtt.client` packages, and adapt your client configuration to the HiveMQ MQTT client API.
+
 This dependency is required for the project:
 
 [tabs]
@@ -565,4 +569,4 @@ private void addAddRuntimeAdapter(IntegrationFlowContext flowContext, Mqttv5Clie
                 .get())
         .register();
 }
-----
\ No newline at end of file
+----
diff --git a/src/reference/antora/modules/ROOT/pages/whats-new.adoc b/src/reference/antora/modules/ROOT/pages/whats-new.adoc
index cbd447ada39..a7c4f73f805 100644
--- a/src/reference/antora/modules/ROOT/pages/whats-new.adoc
+++ b/src/reference/antora/modules/ROOT/pages/whats-new.adoc
@@ -21,6 +21,7 @@ A new `KafkaShareMessageDrivenChannelAdapter` provides a message-driven inbound
 See xref:kafka.adoc#kafka-share-inbound[Message-driven Channel Adapter for Share Groups] for more information.
 
 A new `spring-integration-mqtt-client` module has been introduced to provide similar capabilities to the existing `spring-integration-mqtt`, but based on the HiveMQ MQTT client.
+The Paho-based `spring-integration-mqtt` module is deprecated for removal in favor of this new module.
 See xref:mqtt.adoc[] for more information.
 
 A new `PayloadValidatingMessageSelector` accepts a message only if its payload passes a Spring `Validator`, such as a Bean Validation one from the `LocalValidatorFactoryBean`.

From 02b7ee2d6e5c19b5ab4197442b4502401aff9a38 Mon Sep 17 00:00:00 2001
From: Jaehong Park <105151063+PHJ2000@users.noreply.github.com>
Date: Tue, 20 Oct 2026 13:16:31 +0900
Subject: [PATCH 2/2] GH-11538: Suppress removal warnings in the MQTT module

Suppress removal warnings on top-level production and test types so
internal uses of the deprecated API do not obscure other build warnings.
Remove redundant deprecation declarations from nested types; retain
deprecation on their enclosing top-level types.

Signed-off-by: Jaehong Park <105151063+PHJ2000@users.noreply.github.com>
---
 .../integration/mqtt/aot/MqttRuntimeHints.java               | 1 +
 .../config/xml/MqttMessageDrivenChannelAdapterParser.java    | 1 +
 .../integration/mqtt/config/xml/MqttNamespaceHandler.java    | 1 +
 .../mqtt/config/xml/MqttOutboundChannelAdapterParser.java    | 1 +
 .../integration/mqtt/config/xml/MqttParserUtils.java         | 1 +
 .../integration/mqtt/core/AbstractMqttClientManager.java     | 1 +
 .../springframework/integration/mqtt/core/ClientManager.java | 5 +----
 .../integration/mqtt/core/DefaultMqttPahoClientFactory.java  | 4 +---
 .../springframework/integration/mqtt/core/MqttComponent.java | 1 +
 .../integration/mqtt/core/MqttPahoClientFactory.java         | 1 +
 .../integration/mqtt/core/MqttPahoComponent.java             | 1 +
 .../integration/mqtt/core/Mqttv3ClientManager.java           | 1 +
 .../integration/mqtt/core/Mqttv5ClientManager.java           | 1 +
 .../integration/mqtt/event/MqttConnectionFailedEvent.java    | 2 +-
 .../integration/mqtt/event/MqttIntegrationEvent.java         | 2 +-
 .../integration/mqtt/event/MqttMessageDeliveredEvent.java    | 2 +-
 .../integration/mqtt/event/MqttMessageDeliveryEvent.java     | 2 +-
 .../integration/mqtt/event/MqttMessageNotDeliveredEvent.java | 1 +
 .../integration/mqtt/event/MqttMessageSentEvent.java         | 2 +-
 .../integration/mqtt/event/MqttProtocolErrorEvent.java       | 2 +-
 .../integration/mqtt/event/MqttSubscribedEvent.java          | 2 +-
 .../inbound/AbstractMqttMessageDrivenChannelAdapter.java     | 1 +
 .../mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java    | 1 +
 .../mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java  | 1 +
 .../mqtt/outbound/AbstractMqttMessageHandler.java            | 1 +
 .../integration/mqtt/outbound/MqttPahoMessageHandler.java    | 1 +
 .../integration/mqtt/outbound/Mqttv5PahoMessageHandler.java  | 1 +
 .../mqtt/support/DefaultPahoMessageConverter.java            | 1 +
 .../integration/mqtt/support/MqttHeaderAccessor.java         | 1 +
 .../integration/mqtt/support/MqttHeaderMapper.java           | 1 +
 .../integration/mqtt/support/MqttHeaders.java                | 1 +
 .../integration/mqtt/support/MqttMessageConverter.java       | 1 +
 .../springframework/integration/mqtt/support/MqttUtils.java  | 1 +
 .../integration/mqtt/BackToBackAdapterTests.java             | 2 ++
 .../integration/mqtt/ClientManagerBackToBackTests.java       | 2 ++
 .../integration/mqtt/DownstreamExceptionTests.java           | 2 ++
 .../integration/mqtt/MosquittoContainerTest.java             | 2 ++
 .../springframework/integration/mqtt/MqttAdapterTests.java   | 2 ++
 .../org/springframework/integration/mqtt/MqttDslTests.java   | 2 ++
 .../springframework/integration/mqtt/Mqttv5AdapterTests.java | 2 ++
 .../mqtt/Mqttv5BackToBackAutomaticReconnectTests.java        | 2 ++
 .../integration/mqtt/Mqttv5BackToBackTests.java              | 2 ++
 .../springframework/integration/mqtt/Mqttv5HandlerTests.java | 2 ++
 .../integration/mqtt/Mqttv5ReconnectionConditionTests.java   | 2 ++
 .../mqtt/ResubscribeAfterAutomaticReconnectTests.java        | 2 ++
 .../xml/MqttMessageDrivenChannelAdapterParserTests.java      | 2 ++
 .../config/xml/MqttOutboundChannelAdapterParserTests.java    | 2 ++
 47 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java
index 0bd7e9d7614..98aea697733 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/aot/MqttRuntimeHints.java
@@ -25,6 +25,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 class MqttRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java
index fcfe0da6e57..679265524db 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParser.java
@@ -24,6 +24,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class MqttMessageDrivenChannelAdapterParser extends AbstractChannelAdapterParser {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java
index e73cf9281f3..5340c230e00 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttNamespaceHandler.java
@@ -16,6 +16,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class MqttNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java
index 5c1bd2b94da..bce32c966fc 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParser.java
@@ -23,6 +23,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class MqttOutboundChannelAdapterParser extends AbstractOutboundChannelAdapterParser {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java
index 04346808b05..8cdd56e1672 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/config/xml/MqttParserUtils.java
@@ -29,6 +29,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 final class MqttParserUtils {
 
 	private MqttParserUtils() {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java
index 995137c32b2..58a5205e081 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/AbstractMqttClientManager.java
@@ -36,6 +36,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public abstract class AbstractMqttClientManager<T, C> implements ClientManager<T, C>, ApplicationEventPublisherAware {
 
 	protected final Log logger = LogFactory.getLog(this.getClass()); // NOSONAR
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java
index 10e4bbb4fd9..08f5e4d7750 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/ClientManager.java
@@ -26,6 +26,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public interface ClientManager<T, C> extends SmartLifecycle, MqttComponent<C> {
 
 	/**
@@ -106,9 +107,7 @@ public interface ClientManager<T, C> extends SmartLifecycle, MqttComponent<C> {
 	 *
 	 * @see org.eclipse.paho.mqttv5.client.MqttCallback#connectComplete
 	 * @see org.eclipse.paho.client.mqttv3.MqttCallbackExtended#connectComplete
-	 * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
 	 */
-	@Deprecated(since = "7.2", forRemoval = true)
 	@FunctionalInterface
 	interface ConnectCallback {
 
@@ -129,9 +128,7 @@ interface ConnectCallback {
 	 *
 	 * @see org.eclipse.paho.mqttv5.client.MqttCallback#messageArrived(String, org.eclipse.paho.mqttv5.common.MqttMessage)
 	 * @see org.eclipse.paho.client.mqttv3.MqttCallback#messageArrived(String, org.eclipse.paho.client.mqttv3.MqttMessage)
-	 * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
 	 */
-	@Deprecated(since = "7.2", forRemoval = true)
 	@FunctionalInterface
 	interface DefaultMessageHandler<M> {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java
index 773033603c9..3f829d1851b 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/DefaultMqttPahoClientFactory.java
@@ -26,6 +26,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class DefaultMqttPahoClientFactory implements MqttPahoClientFactory {
 
 	private MqttConnectOptions options = new MqttConnectOptions();
@@ -69,10 +70,7 @@ public MqttConnectOptions getConnectionOptions() {
 
 	/**
 	 * An MQTT will message.
-	 *
-	 * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
 	 */
-	@Deprecated(since = "7.2", forRemoval = true)
 	public static class Will {
 
 		private final String topic;
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java
index b9d76772dc1..96fc0373589 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttComponent.java
@@ -17,6 +17,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public interface MqttComponent<T> extends BeanNameAware {
 
 	/**
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java
index fdf08551d19..209b1e5f77d 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoClientFactory.java
@@ -17,6 +17,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public interface MqttPahoClientFactory {
 
 	/**
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java
index 580383c54eb..fbcf3fe9ff4 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/MqttPahoComponent.java
@@ -15,6 +15,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public interface MqttPahoComponent extends MqttComponent<MqttConnectOptions> {
 
 	@Override
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java
index d5637fc9792..f5773a206c8 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv3ClientManager.java
@@ -34,6 +34,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class Mqttv3ClientManager
 		extends AbstractMqttClientManager<IMqttAsyncClient, MqttConnectOptions>
 		implements MqttCallbackExtended {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java
index b6f57b381db..e8f5a609227 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/core/Mqttv5ClientManager.java
@@ -37,6 +37,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class Mqttv5ClientManager
 		extends AbstractMqttClientManager<IMqttAsyncClient, MqttConnectionOptions>
 		implements MqttCallback {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java
index a225f6b1312..a7a4d2e752b 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttConnectionFailedEvent.java
@@ -18,7 +18,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
-@SuppressWarnings("serial")
+@SuppressWarnings({"serial", "removal"})
 public class MqttConnectionFailedEvent extends MqttIntegrationEvent {
 
 	public MqttConnectionFailedEvent(Object source) {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java
index 94dfa3019bd..d0eb9108403 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttIntegrationEvent.java
@@ -21,7 +21,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
-@SuppressWarnings("serial")
+@SuppressWarnings({"serial", "removal"})
 public abstract class MqttIntegrationEvent extends IntegrationEvent {
 
 	public MqttIntegrationEvent(Object source) {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java
index 0c181197844..857ce79b39c 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveredEvent.java
@@ -14,7 +14,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
-@SuppressWarnings("serial")
+@SuppressWarnings({"serial", "removal"})
 public class MqttMessageDeliveredEvent extends MqttMessageDeliveryEvent {
 
 	public MqttMessageDeliveredEvent(Object source, int messageId, String clientId,
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java
index e8e3c632e91..78795663927 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageDeliveryEvent.java
@@ -14,7 +14,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
-@SuppressWarnings("serial")
+@SuppressWarnings({"serial", "removal"})
 public abstract class MqttMessageDeliveryEvent extends MqttIntegrationEvent {
 
 	private final int messageId;
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java
index 60cc98d56f2..5781e1583c9 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageNotDeliveredEvent.java
@@ -17,6 +17,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class MqttMessageNotDeliveredEvent extends MqttMessageDeliveryEvent {
 
 	@Serial
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java
index af2014320da..5b82ddb2a20 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttMessageSentEvent.java
@@ -16,7 +16,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
-@SuppressWarnings("serial")
+@SuppressWarnings({"serial", "removal"})
 public class MqttMessageSentEvent extends MqttMessageDeliveryEvent {
 
 	private final Message<?> message;
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java
index 3b5dbfdf9c2..6a5d87b7ae2 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttProtocolErrorEvent.java
@@ -18,7 +18,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
-@SuppressWarnings("serial")
+@SuppressWarnings({"serial", "removal"})
 public class MqttProtocolErrorEvent extends MqttIntegrationEvent {
 
 	public MqttProtocolErrorEvent(Object source, MqttException exception) {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java
index 969f2b005ea..2795682eabe 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/event/MqttSubscribedEvent.java
@@ -11,7 +11,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
-@SuppressWarnings("serial")
+@SuppressWarnings({"serial", "removal"})
 public class MqttSubscribedEvent extends MqttIntegrationEvent {
 
 	private final String message;
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java
index e2b84439ab9..987b4d8eb12 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/AbstractMqttMessageDrivenChannelAdapter.java
@@ -48,6 +48,7 @@
 @Deprecated(since = "7.2", forRemoval = true)
 @ManagedResource
 @IntegrationManagedResource
+@SuppressWarnings("removal")
 public abstract class AbstractMqttMessageDrivenChannelAdapter<T, C> extends MessageProducerSupport
 		implements ApplicationEventPublisherAware, ClientManager.ConnectCallback {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
index 6a5bbd2bb2e..0a80ffd0f58 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/MqttPahoMessageDrivenChannelAdapter.java
@@ -55,6 +55,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class MqttPahoMessageDrivenChannelAdapter
 		extends AbstractMqttMessageDrivenChannelAdapter<IMqttAsyncClient, MqttConnectOptions>
 		implements MqttCallbackExtended, MqttPahoComponent {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java
index d87202f1730..fdc5d9e3461 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/inbound/Mqttv5PahoMessageDrivenChannelAdapter.java
@@ -82,6 +82,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class Mqttv5PahoMessageDrivenChannelAdapter
 		extends AbstractMqttMessageDrivenChannelAdapter<IMqttAsyncClient, MqttConnectionOptions>
 		implements MqttCallback, MqttComponent<MqttConnectionOptions> {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java
index 83573777c77..e7e574e75db 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/AbstractMqttMessageHandler.java
@@ -44,6 +44,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public abstract class AbstractMqttMessageHandler<T, C> extends AbstractMessageHandler
 		implements ManageableLifecycle, ApplicationEventPublisherAware {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java
index 7c910446fcf..c503b1d53fd 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/MqttPahoMessageHandler.java
@@ -45,6 +45,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class MqttPahoMessageHandler extends AbstractMqttMessageHandler<IMqttAsyncClient, MqttConnectOptions>
 		implements MqttCallback, MqttPahoComponent {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java
index ddcc7a7e5a4..3575b2e89a0 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/outbound/Mqttv5PahoMessageHandler.java
@@ -51,6 +51,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class Mqttv5PahoMessageHandler extends AbstractMqttMessageHandler<IMqttAsyncClient, MqttConnectionOptions>
 		implements MqttCallback, MqttComponent<MqttConnectionOptions> {
 
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
index a7c50cdd17e..9daff2385d4 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/DefaultPahoMessageConverter.java
@@ -34,6 +34,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class DefaultPahoMessageConverter implements MqttMessageConverter, BeanFactoryAware {
 
 	private final Charset charset;
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java
index 9eed646622d..3bd3b898d19 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderAccessor.java
@@ -17,6 +17,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public final class MqttHeaderAccessor {
 
 	private MqttHeaderAccessor() {
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java
index b69c88bd98c..7ec7b16e3b5 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaderMapper.java
@@ -32,6 +32,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public class MqttHeaderMapper implements HeaderMapper<MqttProperties> {
 
 	private static final LogAccessor LOGGER = new LogAccessor(MqttHeaderMapper.class);
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java
index 62ed52d2ee3..c97f897f7ae 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttHeaders.java
@@ -14,6 +14,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public final class MqttHeaders {
 
 	public static final String PREFIX = "mqtt_";
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java
index a16de2735b4..a9c671ef9b7 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttMessageConverter.java
@@ -24,6 +24,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public interface MqttMessageConverter extends MessageConverter {
 
 	/**
diff --git a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java
index d0dc553da1f..12c5ac5f1c9 100644
--- a/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java
+++ b/spring-integration-mqtt/src/main/java/org/springframework/integration/mqtt/support/MqttUtils.java
@@ -25,6 +25,7 @@
  * @deprecated since 7.2 in favor of the {@code spring-integration-mqtt-client} module.
  */
 @Deprecated(since = "7.2", forRemoval = true)
+@SuppressWarnings("removal")
 public final class MqttUtils {
 
 	private static final boolean PAHO_MQTTV3_PRESENT =
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java
index e0e2db9666b..9d4fa85930a 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/BackToBackAdapterTests.java
@@ -52,12 +52,14 @@
  * @author Gary Russell
  * @author Artem Bilan
  * @author Glenn Renfro
+ * @author Jaehong Park
  *
  * @since 4.0
  *
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class BackToBackAdapterTests implements MosquittoContainerTest {
 
 	private static final long QUIESCENT_TIMEOUT = 1;
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java
index dffb380574f..a798264b54a 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ClientManagerBackToBackTests.java
@@ -47,9 +47,11 @@
 /**
  * @author Artem Vozhdayenko
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 6.0
  */
+@SuppressWarnings("removal")
 class ClientManagerBackToBackTests implements MosquittoContainerTest {
 
 	static final long QUIESCENT_TIMEOUT = 1L;
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java
index 3bd59287c36..ddfc1dceefa 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/DownstreamExceptionTests.java
@@ -35,12 +35,14 @@
  * @author Gary Russell
  * @author Artem Bilan
  * @author Glenn Renfro
+ * @author Jaehong Park
  *
  * @since 4.0
  *
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class DownstreamExceptionTests implements MosquittoContainerTest {
 
 	@Autowired
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java
index bb38ada7668..46a5bd7669e 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java
@@ -16,10 +16,12 @@
  * started only once per JVM, therefore the target Docker container is reused automatically.
  *
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 5.5.5
  */
 @Testcontainers(disabledWithoutDocker = true)
+@SuppressWarnings("removal")
 public interface MosquittoContainerTest {
 
 	GenericContainer<?> MOSQUITTO_CONTAINER =
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java
index e8968220749..406db9a66c7 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttAdapterTests.java
@@ -86,10 +86,12 @@
  * @author Artem Bilan
  * @author Artem Vozhdayenko
  * @author Glenn Renfro
+ * @author Jaehong Park
  *
  * @since 4.0
  *
  */
+@SuppressWarnings("removal")
 public class MqttAdapterTests implements TestApplicationContextAware {
 
 	private final IMqttToken alwaysComplete;
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java
index fc302115c30..5ec16deabd0 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MqttDslTests.java
@@ -41,11 +41,13 @@
 
 /**
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 5.1.2
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class MqttDslTests implements MosquittoContainerTest, TestApplicationContextAware {
 
 	@Autowired
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java
index 3896859a714..87d8954745e 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java
@@ -43,10 +43,12 @@
  * @author Artem Vozhdayenko
  * @author Matthias Thoma
  * @author Goutam Adwant
+ * @author Jaehong Park
  *
  * @since 5.5.16
  *
  */
+@SuppressWarnings("removal")
 public class Mqttv5AdapterTests {
 
 	@Test
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java
index 76e0d873458..165fca7dd92 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackAutomaticReconnectTests.java
@@ -38,11 +38,13 @@
 /**
  * @author Lucas Bowler
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 5.5.13
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class Mqttv5BackToBackAutomaticReconnectTests implements MosquittoContainerTest {
 
 	@Autowired
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java
index cf21538e059..08487457e6e 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5BackToBackTests.java
@@ -48,12 +48,14 @@
  * @author Mikhail Polivakha
  * @author Glenn Renfro
  * @author Goutam Adwant
+ * @author Jaehong Park
  *
  * @since 5.5.5
  *
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class Mqttv5BackToBackTests implements MosquittoContainerTest {
 
 	private static final long QUIESCENT_TIMEOUT = 1;
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5HandlerTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5HandlerTests.java
index d38d7d22990..536f5fbfcc8 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5HandlerTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5HandlerTests.java
@@ -34,9 +34,11 @@
  * conversion path.
  *
  * @author Deng Pan
+ * @author Jaehong Park
  *
  * @since 7.1
  */
+@SuppressWarnings("removal")
 class Mqttv5HandlerTests {
 
 	@Test
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5ReconnectionConditionTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5ReconnectionConditionTests.java
index 68d031baa46..aef0cfc2b09 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5ReconnectionConditionTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5ReconnectionConditionTests.java
@@ -39,9 +39,11 @@
  * in {@link Mqttv5PahoMessageHandler}.
  *
  * @author Glenn Renfro
+ * @author Jaehong Park
  *
  * @since 7.1
  */
+@SuppressWarnings("removal")
 public class Mqttv5ReconnectionConditionTests {
 
 	@Test
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ResubscribeAfterAutomaticReconnectTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ResubscribeAfterAutomaticReconnectTests.java
index d3bafbdfec1..ae301092c66 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ResubscribeAfterAutomaticReconnectTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/ResubscribeAfterAutomaticReconnectTests.java
@@ -33,11 +33,13 @@
 
 /**
  * @author Artem Bilan
+ * @author Jaehong Park
  *
  * @since 6.0.3
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class ResubscribeAfterAutomaticReconnectTests implements MosquittoContainerTest {
 
 	@Autowired
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java
index 3fc432ba939..9a5d56ae8af 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttMessageDrivenChannelAdapterParserTests.java
@@ -23,12 +23,14 @@
  * @author Gary Russell
  * @author Artem Bilan
  * @author Glenn Renfro
+ * @author Jaehong Park
  *
  * @since 4.0
  *
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class MqttMessageDrivenChannelAdapterParserTests {
 
 	@Autowired
diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java
index b5ea1fb3861..debdbd2f777 100644
--- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java
+++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java
@@ -29,11 +29,13 @@
  * @author Gary Russell
  * @author Artem Bilan
  * @author Glenn Renfro
+ * @author Jaehong Park
  *
  * @since 4.0
  */
 @SpringJUnitConfig
 @DirtiesContext
+@SuppressWarnings("removal")
 public class MqttOutboundChannelAdapterParserTests {
 
 	@Autowired