From d2f115774e32f13fef69e72c9671b2e3c1a2dc5d Mon Sep 17 00:00:00 2001
From: Will Ezell <will@dotcms.com>
Date: Wed, 16 Sep 2026 22:15:15 -0400
Subject: [PATCH 1/3] chore(core): remove pgjdbc-ng and PostgresPubSubImpl
 (#37592)

PostgresPubSubImpl was superseded by JDBCPubSubImpl (vanilla postgres
driver, #26019) and DotPubSubProviderLocator has defaulted to it since.
Nothing in the repo sets DOT_PUBSUB_PROVIDER_OVERRIDE to
PostgresPubSubImpl, so the pgjdbc-ng code path was unreachable.

pgjdbc-ng was the only remaining compile-scope, non-Azure/non-AWS source
of Netty on the classpath, transitively bringing Netty 4.1.63 while
langchain4j-azure-open-ai brought 4.1.118.

Changes:
- Delete PostgresPubSubImpl, PgNgDataSourceUrl and their tests
- Deregister PostgresPubSubImplTest from MainSuite2a/MainSuite2b
- Drop the pgjdbc-ng dependency from dotCMS/pom.xml and bom/application
- Replace the codebase's only Netty import (io.netty.util.NetUtil in
  HttpRequestDataUtil#getIpAddress) with Guava InetAddresses.forString;
  Guava is already a direct compile dependency. The `throws
  UnknownHostException` signature is preserved because callers catch it.
- Keep the six Netty BOM pins; Azure/reactor-netty still ship 4.1.112
  vs 4.1.118 skew, and AWS still pulls 4.1.130. Update the stale comment.

Netty remains on the classpath via azure-core-http-netty and the AWS SDK
sqs netty-nio-client; only the 4.1.63 line disappears.
---
 bom/application/pom.xml                       |  11 +-
 dotCMS/pom.xml                                |   5 -
 .../dotcms/dotpubsub/PgNgDataSourceUrl.java   |  89 ------
 .../dotcms/dotpubsub/PostgresPubSubImpl.java  | 292 ------------------
 .../com/dotcms/util/HttpRequestDataUtil.java  |  17 +-
 .../transport/PubSubCacheTransportTest.java   |   2 +-
 .../dotpubsub/PgNgDataSourceUrlTest.java      |  98 ------
 .../src/test/java/com/dotcms/MainSuite2a.java |   1 -
 .../src/test/java/com/dotcms/MainSuite2b.java |   2 -
 .../dotpubsub/PostgresPubSubImplTest.java     | 256 ---------------
 10 files changed, 17 insertions(+), 756 deletions(-)
 delete mode 100644 dotCMS/src/main/java/com/dotcms/dotpubsub/PgNgDataSourceUrl.java
 delete mode 100644 dotCMS/src/main/java/com/dotcms/dotpubsub/PostgresPubSubImpl.java
 delete mode 100644 dotCMS/src/test/java/com/dotcms/dotpubsub/PgNgDataSourceUrlTest.java
 delete mode 100644 dotcms-integration/src/test/java/com/dotcms/dotpubsub/PostgresPubSubImplTest.java

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 19738ee7501c..d8356a327ad1 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -100,8 +100,9 @@
                 <version>3.4.41</version>
             </dependency>
 
-            <!-- Netty: pin to 4.1.118.Final to resolve conflict between pgjdbc-ng (4.1.63)
-                 and langchain4j-azure-open-ai (4.1.118). Required for DefaultHeaders$ValueValidator. -->
+            <!-- Netty: pin to 4.1.118.Final so the Azure (langchain4j-azure-open-ai) and
+                 reactor-netty trees agree on one version. Required for
+                 DefaultHeaders$ValueValidator. -->
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-common</artifactId>
@@ -847,12 +848,6 @@
             </dependency>
 
 
-            <dependency>
-                <groupId>com.impossibl.pgjdbc-ng</groupId>
-                <artifactId>pgjdbc-ng</artifactId>
-                <version>0.8.9</version>
-            </dependency>
-
             <!--
              *****************************
                Cluster Support
diff --git a/dotCMS/pom.xml b/dotCMS/pom.xml
index 6e8a6cd1adaf..6c68bb7b6150 100644
--- a/dotCMS/pom.xml
+++ b/dotCMS/pom.xml
@@ -712,11 +712,6 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>com.impossibl.pgjdbc-ng</groupId>
-            <artifactId>pgjdbc-ng</artifactId>
-        </dependency>
-
         <!--
          *****************************
            Cluster Support
diff --git a/dotCMS/src/main/java/com/dotcms/dotpubsub/PgNgDataSourceUrl.java b/dotCMS/src/main/java/com/dotcms/dotpubsub/PgNgDataSourceUrl.java
deleted file mode 100644
index 4e62f00aff68..000000000000
--- a/dotCMS/src/main/java/com/dotcms/dotpubsub/PgNgDataSourceUrl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.dotcms.dotpubsub;
-
-import java.io.StringWriter;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import io.vavr.control.Try;
-
-/**
- * A Utility Class that converts the default dotCMS postgres DB connection/driver to a url using the
- * pgjdbc-ng driver, which supports Postgres PubSub. We use this driver to listen for incoming
- * events
- *
- * @author will
- *
- */
-class PgNgDataSourceUrl {
-
-    private final String finalUrl;
-
-
-    static final String SSL_MODE = System.getenv("DOT_PUBSUB_SSL_MODE") != null ? System.getenv("DOT_PUBSUB_SSL_MODE") : "prefer";
-
-
-
-    /**
-     * Use our existing database connection/url and
-     * 
-     * @param username
-     * @param password
-     * @param url
-     */
-    PgNgDataSourceUrl(final String username, final String password, final String url) {
-        final String encodedUsername = Try.of(()->URLEncoder.encode(username, StandardCharsets.UTF_8.toString())).getOrNull();
-        final String encodedPassword = Try.of(()->URLEncoder.encode(password, StandardCharsets.UTF_8.toString())).getOrNull();
-        this.finalUrl = createUrl(encodedUsername, encodedPassword, url);
-    }
-
-    PgNgDataSourceUrl(final String providedUrl) {
-
-        this.finalUrl = providedUrl;
-    }
-
-    @Override
-    public String toString() {
-        return "DbUrl Obfuscated";
-    }
-
-    String getDbUrl() {
-        return finalUrl;
-    }
-
-    /**
-     * jdbc:postgresql://oboxturbo/dotcms
-     * 
-     * @param username
-     * @param password
-     * @param url
-     * @return
-     */
-    private String createUrl(final String username, final String password, final String url) {
-
-        String[] data = url.split("/");
-        StringWriter sw = new StringWriter();
-        sw.append("jdbc:pgsql://");
-        if (url.contains("@")) {
-            sw.append(data[data.length - 3]);
-        } else {
-            sw.append(username).append(":").append(new String(password)).append("@");
-        }
-        sw.append(data[data.length - 2]);
-        sw.append("/");
-        sw.append(data[data.length - 1]);
-
-        if(url.contains("ssl.mode=")){
-            return sw.toString();
-        }
-        if(url.contains("?")){
-            sw.append( "&");
-        }else{
-            sw.append( "?");
-        }
-
-        sw.append("ssl.mode=" + SSL_MODE);
-        return  sw.toString();
-
-
-    }
-
-}
diff --git a/dotCMS/src/main/java/com/dotcms/dotpubsub/PostgresPubSubImpl.java b/dotCMS/src/main/java/com/dotcms/dotpubsub/PostgresPubSubImpl.java
deleted file mode 100644
index 112ae321b03a..000000000000
--- a/dotCMS/src/main/java/com/dotcms/dotpubsub/PostgresPubSubImpl.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package com.dotcms.dotpubsub;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-import com.dotmarketing.business.APILocator;
-import com.dotmarketing.db.DbConnectionFactory;
-import com.dotmarketing.util.Config;
-import com.dotmarketing.util.Logger;
-import com.dotmarketing.util.StringUtils;
-import com.google.common.annotations.VisibleForTesting;
-import com.impossibl.postgres.api.jdbc.PGConnection;
-import com.impossibl.postgres.api.jdbc.PGNotificationListener;
-import com.zaxxer.hikari.HikariDataSource;
-import io.vavr.Lazy;
-import io.vavr.control.Try;
-
-public class PostgresPubSubImpl implements DotPubSubProvider {
-
-    private enum RUNSTATE {
-        STOPPED, STARTED, REBUILD
-    }
-
-    final static String PG_NOTIFY_SQL = "SELECT pg_notify(?,?)";
-    public final String serverId;
-    private long restartDelay = 0;
-
-    /**
-     * provides db connection information for the postgres pub/sub connection
-     */
-    final private Lazy<PgNgDataSourceUrl> attributes = Lazy.of(() -> getDatasourceAttributes());
-    final private AtomicReference<RUNSTATE> state = new AtomicReference<>(RUNSTATE.STOPPED);
-    private PGConnection connection;
-
-    
-    /**
-     * This is the list of topics that are subscribed to by the postgres pub/sub connection
-     */
-    private Map<Comparable<String>, DotPubSubTopic> topicMap = new ConcurrentHashMap<>();
-
-    @VisibleForTesting
-    private static DotPubSubEvent lastEventIn, lastEventOut;
-
-    @Override
-    public DotPubSubProvider start() {
-
-        if(DbConnectionFactory.isPostgres()) {
-            int numberOfServers = Try.of(() -> APILocator.getServerAPI().getAliveServers().size()).getOrElse(1);
-            Logger.info(PostgresPubSubImpl.class, () -> "Starting PostgresPubSub. Have servers:" + numberOfServers);
-
-            try {
-                setUpPersistantConnection();
-                for (DotPubSubTopic topic : topicMap.values()) {
-                    subscribeToTopicSQL(topic.getKey().toString());
-                }
-            } catch (Exception e) {
-                Logger.warnAndDebug(getClass(), e);
-                if (state.get() != RUNSTATE.STOPPED) {
-                    restart();
-                }
-            }
-        } else {
-            Logger.debug(this, "PostgresPubSubImpl only runs on Postgres, for: " + DbConnectionFactory.getDBType() +
-                    ", use another implementation.");
-        }
-
-        return this;
-    }
-
-    public PostgresPubSubImpl() {
-        this(APILocator.getServerAPI().readServerId());
-
-    }
-
-    public PostgresPubSubImpl(String serverId) {
-        this.serverId = StringUtils.shortify(serverId, 10);
-
-
-    }
-
-    /**
-     * This is the DB Listener that listens for messages and then passes them on to the matching
-     * DotPubSubTopic for processing by the topic.notify(DotPubSubEvent) method. This listener will
-     * reconnect in the case of any errors or if the connection gets closed
-     * 
-     */
-    private PGNotificationListener listener = new PGNotificationListener() {
-
-        @Override
-        public void notification(final int processId, final String channelName, final String payload) {
-
-            restartDelay = 0;
-            Logger.debug(PostgresPubSubImpl.class,
-                            () -> "recieved event: " + processId + ", " + channelName + ", " + payload);
-
-            List<DotPubSubTopic> matchingTopics = topicMap.values().stream()
-                            .filter(t -> t.getKey().toString().compareToIgnoreCase(channelName) == 0)
-                            .collect(Collectors.toList());
-
-            if (matchingTopics.isEmpty()) {
-                return;
-            }
-
-            final DotPubSubEvent event = Try.of(() -> new DotPubSubEvent(payload))
-                            .onFailure(e -> Logger.warn(PostgresPubSubImpl.class, e.getMessage(), e)).getOrNull();
-            if (event == null) {
-                return;
-            }
-            Logger.debug(PostgresPubSubImpl.class,
-                            () -> "recieved event: " + processId + ", " + channelName + ", " + payload);
-
-            // save for testing
-            lastEventIn = event;
-            restartDelay = 0;
-
-            matchingTopics.forEach(t -> {
-                t.incrementReceivedCounters(event);
-                t.notify(event);
-
-            });
-
-        }
-
-        @Override
-        public void closed() {
-            if (state.get() != RUNSTATE.STOPPED) {
-                Logger.warn(this.getClass(), "PGNotificationListener connection closed, reconnecting");
-                restart();
-            }
-        }
-    };
-
-    /**
-     * Runs the SQL that starts the listening process and activates the PGNotificationListener
-     * 
-     * @throws SQLException
-     */
-    private void setUpPersistantConnection() throws SQLException {
-        if (connection != null && !connection.isClosed()) {
-            Logger.info(this.getClass(), () -> "PGNotificationListener already connected. Returning");
-            return;
-        }
-        state.set(RUNSTATE.STARTED);
-
-        Logger.info(this.getClass(), () -> "PGNotificationListener connecting to pub/sub...");
-        try {
-
-            connection = this.getConnection();
-            connection.addNotificationListener(listener);
-
-        } catch (Exception e) {
-            Logger.warn(getClass(), e.getMessage(), e);
-            if (state.get() != RUNSTATE.STOPPED) {
-                restart();
-            }
-        }
-
-    }
-
-    private void subscribeToTopicSQL(String topic) throws SQLException {
-        try (Statement stmt = connection.createStatement()) {
-            Logger.info(this.getClass(), () -> " - LISTEN " + topic.toLowerCase());
-            stmt.execute("LISTEN " + topic.toString().toLowerCase());
-        }
-    }
-
-    private void unsubscribeToTopicSQL(String topic) throws SQLException {
-        try (Statement stmt = connection.createStatement()) {
-            Logger.info(this.getClass(), () -> " - UNLISTEN " + topic.toLowerCase());
-            stmt.execute("UNLISTEN " + topic.toString().toLowerCase());
-        }
-    }
-
-    /**
-     * This will automatically restart the connection
-     */
-    public void restart() {
-
-        Logger.warn(getClass(), "Restarting PGNotificationListener in " + restartDelay
-                        + " ms to retry postgres pub/sub connection");
-        stop();
-        restartDelay = Math.min(restartDelay + 1000, 10000);
-        Try.run(() -> Thread.sleep(restartDelay));
-        start();
-    }
-
-    /**
-     * Stops the listener and connection
-     */
-    public void stop() {
-        this.state.set(RUNSTATE.STOPPED);
-        topicMap.keySet().forEach(k -> Try.run(() -> unsubscribeToTopicSQL(k.toString())));
-        Try.run(() -> connection.close());
-        connection = null;
-    }
-
-    /**
-     * allow a user to override the DB server for PubSub Activity Otherwise, we will just use the same
-     * DB Format:
-     * 
-     * jdbc:pgsql://{username}:{password}@{serverName}/{dbName}
-     * jdbc:pgsql://dotcms:dotcms@myDbServer.com/dotcms
-     * 
-     * @return
-     */
-
-    private PgNgDataSourceUrl getDatasourceAttributes() {
-        String POSTGRES_PUBSUB_JDBC_URL = Config.getStringProperty("POSTGRES_PUBSUB_JDBC_URL", null);
-        if (POSTGRES_PUBSUB_JDBC_URL != null) {
-            return new PgNgDataSourceUrl(POSTGRES_PUBSUB_JDBC_URL);
-        }
-
-        HikariDataSource hds = (HikariDataSource) DbConnectionFactory.getDataSource();
-        return new PgNgDataSourceUrl(hds.getUsername(), hds.getPassword(), hds.getJdbcUrl());
-
-    }
-
-    private PGConnection getConnection() throws SQLException {
-        return DriverManager.getConnection(attributes.get().getDbUrl()).unwrap(PGConnection.class);
-
-    }
-
-    @Override
-    public DotPubSubProvider subscribe(DotPubSubTopic topic) {
-        this.topicMap.put(topic.getKey().toString().toLowerCase(), topic);
-        try {
-            subscribeToTopicSQL(topic.getKey().toString());
-        } catch (Exception e) {
-            restart();
-        }
-
-        return this;
-    }
-
-    @Override
-    public DotPubSubProvider unsubscribe(DotPubSubTopic topic) {
-        this.topicMap.remove(topic.getKey().toString().toLowerCase());
-        try {
-            unsubscribeToTopicSQL(topic.getKey().toString());
-        } catch (Exception e) {
-            restart();
-        }
-
-        return this;
-    }
-
-    @Override
-    public boolean publish(final DotPubSubEvent eventIn) {
-
-        final DotPubSubEvent eventOut = new DotPubSubEvent.Builder(eventIn).withOrigin(serverId).build();
-
-        Logger.debug(getClass(), () -> "sending  event:" + eventOut);
-        try (final Connection conn = DbConnectionFactory.getDataSource().getConnection();
-                        final PreparedStatement statment = conn.prepareStatement(PG_NOTIFY_SQL)) {
-
-            statment.setString(1, eventIn.getTopic());
-            statment.setString(2, eventOut.toString());
-            if (statment.execute()) {
-
-                Try.run(() -> topicMap.get(eventIn.getTopic()).incrementSentCounters(eventOut));
-                lastEventOut = eventOut;
-                return true;
-            }
-
-            return false;
-        } catch (Exception e) {
-            Logger.warn(this.getClass(), "Unable to send pubsub : " + eventIn.toString());
-
-            Logger.warnAndDebug(this.getClass(), e.getMessage(), e);
-            return false;
-        }
-
-    }
-
-    @Override
-    public DotPubSubEvent lastEventIn() {
-        return lastEventIn;
-    }
-
-    @Override
-    public DotPubSubEvent lastEventOut() {
-        return lastEventOut;
-    }
-
-}
diff --git a/dotCMS/src/main/java/com/dotcms/util/HttpRequestDataUtil.java b/dotCMS/src/main/java/com/dotcms/util/HttpRequestDataUtil.java
index 3b0c2ddc603c..94fdd4257209 100644
--- a/dotCMS/src/main/java/com/dotcms/util/HttpRequestDataUtil.java
+++ b/dotCMS/src/main/java/com/dotcms/util/HttpRequestDataUtil.java
@@ -5,7 +5,7 @@
 import com.dotmarketing.exception.DotRuntimeException;
 import com.dotmarketing.util.Logger;
 import com.dotmarketing.util.UtilMethods;
-import io.netty.util.NetUtil;
+import com.google.common.net.InetAddresses;
 import org.apache.commons.lang.StringUtils;
 
 import javax.management.MBeanServer;
@@ -52,6 +52,9 @@ public class HttpRequestDataUtil {
 
 	public static final String DEFAULT_REMOTE_ADDRESS = "0.0.0.0";
 
+	/** Loopback address returned when the remote address cannot be parsed as an IP literal. */
+	private static final byte[] LOOPBACK_ADDRESS = {127, 0, 0, 1};
+
 	/**
 	 * Get the remote address, if the request is null will return 0.0.0.0.
 	 * @param request {@link HttpServletRequest}
@@ -78,9 +81,15 @@ public static String getRemoteAddress (final HttpServletRequest request) {
 	public static InetAddress getIpAddress(HttpServletRequest request)
 			throws UnknownHostException {
 		final String addr = request.getRemoteAddr();
-		final byte[] parsed = addr != null ? NetUtil.createByteArrayFromIpAddressString(addr) : null;
-		final byte[] remoteAddr = parsed != null ? parsed : new byte[]{127, 0, 0, 1};
-		return InetAddress.getByAddress(remoteAddr);
+		if (addr != null) {
+			try {
+				return InetAddresses.forString(addr);
+			} catch (final IllegalArgumentException e) {
+				Logger.debug(HttpRequestDataUtil.class,
+						() -> "Remote address is not a valid IP literal, falling back to loopback: " + addr);
+			}
+		}
+		return InetAddress.getByAddress(LOOPBACK_ADDRESS);
 	}
 
 	/**
diff --git a/dotCMS/src/test/java/com/dotcms/cache/transport/PubSubCacheTransportTest.java b/dotCMS/src/test/java/com/dotcms/cache/transport/PubSubCacheTransportTest.java
index a45cc128f06f..07d64a73265d 100644
--- a/dotCMS/src/test/java/com/dotcms/cache/transport/PubSubCacheTransportTest.java
+++ b/dotCMS/src/test/java/com/dotcms/cache/transport/PubSubCacheTransportTest.java
@@ -319,7 +319,7 @@ public com.dotcms.dotpubsub.DotPubSubProvider start() {
 
     /**
      * Mimics a synchronous provider whose connection has dropped: publish() returns false and
-     * never throws, exactly as JDBCPubSubImpl/PostgresPubSubImpl/RedisPubSubImpl do.
+     * never throws, exactly as JDBCPubSubImpl/RedisPubSubImpl do.
      */
     private static class FailingProvider extends NullDotPubSubProvider {
         @Override
diff --git a/dotCMS/src/test/java/com/dotcms/dotpubsub/PgNgDataSourceUrlTest.java b/dotCMS/src/test/java/com/dotcms/dotpubsub/PgNgDataSourceUrlTest.java
deleted file mode 100644
index 11d58df14a16..000000000000
--- a/dotCMS/src/test/java/com/dotcms/dotpubsub/PgNgDataSourceUrlTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.dotcms.dotpubsub;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import io.vavr.control.Try;
-
-public class PgNgDataSourceUrlTest {
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {}
-
-    
-
-    final String PgNgUrl = "jdbc:pgsql://dotcmsUserName:dotcmsPassword@dbServer.com/dotcms?ssl.mode=" + PgNgDataSourceUrl.SSL_MODE;
-
-    
-    
-    @Test
-    public void test_PgNgDataSourceUrl_does_not_mess_with_url() {
-
-
-        PgNgDataSourceUrl testDataSource = new PgNgDataSourceUrl(PgNgUrl);
-        assert testDataSource.getDbUrl().equals(PgNgUrl);
-        
-        
-        
-    }
-    
-    @Test
-    public void test_PgNgDataSourceUrl_builts_correctly() {
-
-        
-        String url = "jdbc:postgresql://dbServer.com/dotcms";
-        String username = "dotcmsUserName";
-        String password = "dotcmsPassword";
-
-        final PgNgDataSourceUrl testDataSource = new PgNgDataSourceUrl(username,password,url);
-        
-        final String finalUrl=testDataSource.getDbUrl();
-        
-        
-        assert finalUrl.equals(PgNgUrl);
-        
-        
-        
-    }
-    
-    
-    @Test
-    public void test_PgNgDataSourceUrl_URL_escapes_special_chars() {
-
-        
-        final String url = "jdbc:postgresql://dbServer.com/dotcms";
-        final String username = "dotcmsUserName@";
-        final String password = ")mvd99/iyH!_=ag=Por/W}%%aKY^ygt+,sC7%%P?APOU$!@$+*";
-        final String encodedUsername = Try.of(()->URLEncoder.encode(username, StandardCharsets.UTF_8.toString())).getOrNull();
-        final String encodedPassword = Try.of(()->URLEncoder.encode(password, StandardCharsets.UTF_8.toString())).getOrNull();
-        assert (encodedPassword!=null);
-        assert (!encodedPassword.contains("!"));
-
-        
-        final PgNgDataSourceUrl testDataSource = new PgNgDataSourceUrl(username, password, url);
-
-        final String finalUrl = testDataSource.getDbUrl();
-
-        assert (!encodedPassword.equals(password));
-
-        assert (finalUrl.contains(encodedUsername));
-        assert (finalUrl.contains(encodedPassword));
-        
-        
-    }
-
-    @Test
-    public void test_ssl_mode_is_added() throws MalformedURLException {
-
-        String url = "jdbc:postgresql://dbServer.com/dotcms";
-        String username = "username";
-        String password = "password";
-
-
-        PgNgDataSourceUrl testDataSource = new PgNgDataSourceUrl(username, password, url);
-
-        assert testDataSource.getDbUrl().contains("?ssl.mode=" + PgNgDataSourceUrl.SSL_MODE);
-
-        url = "jdbc:postgresql://dbServer.com/dotcms?test=here";
-
-
-        testDataSource = new PgNgDataSourceUrl(username, password, url);
-
-        assert testDataSource.getDbUrl().contains("&ssl.mode=" + PgNgDataSourceUrl.SSL_MODE);
-
-    }
-}
diff --git a/dotcms-integration/src/test/java/com/dotcms/MainSuite2a.java b/dotcms-integration/src/test/java/com/dotcms/MainSuite2a.java
index 48e1192317e5..6dd880c82bc5 100644
--- a/dotcms-integration/src/test/java/com/dotcms/MainSuite2a.java
+++ b/dotcms-integration/src/test/java/com/dotcms/MainSuite2a.java
@@ -5,7 +5,6 @@
 import com.dotcms.content.elasticsearch.util.ESMappingUtilHelperTest;
 import com.dotcms.contenttype.business.DotAssetBaseTypeToContentTypeStrategyImplTest;
 import com.dotcms.contenttype.test.DotAssetAPITest;
-import com.dotcms.dotpubsub.PostgresPubSubImplTest;
 import com.dotcms.ema.EMAWebInterceptorTest;
 import com.dotcms.enterprise.cluster.ClusterFactoryTest;
 import com.dotcms.junit.MainBaseSuite;
diff --git a/dotcms-integration/src/test/java/com/dotcms/MainSuite2b.java b/dotcms-integration/src/test/java/com/dotcms/MainSuite2b.java
index 3698ca1ad4c4..5ce0b291fbd0 100644
--- a/dotcms-integration/src/test/java/com/dotcms/MainSuite2b.java
+++ b/dotcms-integration/src/test/java/com/dotcms/MainSuite2b.java
@@ -45,7 +45,6 @@
 import com.dotcms.contenttype.test.DotAssetAPITest;
 import com.dotcms.csspreproc.CSSCacheTest;
 import com.dotcms.csspreproc.CSSPreProcessServletIT;
-import com.dotcms.dotpubsub.PostgresPubSubImplTest;
 import com.dotcms.dotpubsub.RedisPubSubImplTest;
 import com.dotcms.ema.EMAWebInterceptorTest;
 import com.dotcms.enterprise.cluster.ClusterFactoryTest;
@@ -553,7 +552,6 @@
         Task05305AddPushPublishFilterColumnTest.class,
         CMSMaintenanceFactoryTest.class,
         Task05350AddDotSaltClusterColumnTest.class,
-        PostgresPubSubImplTest.class,
         DotParseTest.class,
         TestWorkflowAction.class,
         SamlConfigurationServiceTest.class,
diff --git a/dotcms-integration/src/test/java/com/dotcms/dotpubsub/PostgresPubSubImplTest.java b/dotcms-integration/src/test/java/com/dotcms/dotpubsub/PostgresPubSubImplTest.java
deleted file mode 100644
index 8ac9a2ff1cf7..000000000000
--- a/dotcms-integration/src/test/java/com/dotcms/dotpubsub/PostgresPubSubImplTest.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package com.dotcms.dotpubsub;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assume.assumeTrue;
-
-import com.dotmarketing.db.DbConnectionFactory;
-import com.zaxxer.hikari.HikariDataSource;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import com.dotcms.cache.transport.CacheTransportTopic;
-import com.dotcms.util.IntegrationTestInitService;
-import com.dotmarketing.util.Logger;
-
-public class PostgresPubSubImplTest {
-
-    static PostgresPubSubImpl pubsubA,pubsubB;
-    static DotPubSubTopic topicA;
-    
-    static String fakeServerA = "fakeServerA";
-    static String fakeServerB = "fakeServerB";
-    
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        
-        IntegrationTestInitService.getInstance().init();
-
-        assumeTrue(isPostgres());
-
-        pubsubA = new PostgresPubSubImpl(fakeServerA);
-        topicA = new CacheTransportTopic(fakeServerA,pubsubA);
-        pubsubA.subscribe(topicA);
-        pubsubA.start();
-
-
-        
-    }
-
-
-    @Test
-    public void test_ping() throws Exception{
-
-        DotPubSubEvent event = new DotPubSubEvent.Builder()
-                        .withType(CacheTransportTopic.CacheEventType.PING.name())
-                        .withTopic(topicA)
-                        .build();
-
-        
-        long messagesSent = topicA.messagesSent();
-        long messagesRecieved= topicA.messagesReceived();
-        
-        
-        pubsubA.publish(event);
-        
-        
-        Thread.sleep(2000);
-
-        assert(messagesSent < topicA.messagesSent());
-        assert(messagesRecieved < topicA.messagesReceived());
-        
-
-    }
-    
-    
-    @Test
-    public void test_cluster_request_response() throws Exception{
-
-        DotPubSubEvent event = new DotPubSubEvent.Builder().withType(CacheTransportTopic.CacheEventType.CLUSTER_REQ.name())
-                        .withTopic(topicA).build();
-
-
-        long messagesSent = topicA.messagesSent();
-        long messagesRecieved= topicA.messagesReceived();
-        
-        pubsubA.publish(event);
-        
-        Thread.sleep(2000);
-        
-        assert(messagesSent < topicA.messagesSent());
-        assert(messagesRecieved < topicA.messagesReceived());
-
-        
-    }
-    
-    
-    @Test
-    public void test_reconnection() throws Exception{
-
-        DotPubSubEvent event = new DotPubSubEvent.Builder().withType(CacheTransportTopic.CacheEventType.PING.name() ).withTopic(topicA).build();
-
-        
-        long messagesSent = topicA.messagesSent();
-        long messagesRecieved= topicA.messagesReceived();
-        pubsubA.publish(event);
-        
-        
-        Thread.sleep(2000);
-        
-        assert(messagesSent < topicA.messagesSent());
-        assert(messagesRecieved < topicA.messagesReceived());
-        
-        messagesSent = topicA.messagesSent();
-        messagesRecieved= topicA.messagesReceived();
-        
-        pubsubA.restart();
-        
-        pubsubA.publish(event);
-        Thread.sleep(2000);
-        
-        assert(messagesSent < topicA.messagesSent());
-        assert(messagesRecieved < topicA.messagesReceived());
-        
-    }
-    
-    
-    
-    
-    
-    @Test
-    public void test_adding_removing_topic() throws Exception{
-
-        // create a fake topic and subscribe to it
-        FakeDotPubSubTopic fakeTopic = new FakeDotPubSubTopic(); 
-        pubsubA.subscribe(fakeTopic);
-        
-        long messagesRecieved = fakeTopic.messagesReceived();
-        
-        DotPubSubEvent event = new DotPubSubEvent.Builder().withType(CacheTransportTopic.CacheEventType.PING.name() ).withTopic(fakeTopic).build();
-
-        // publish to fake topic
-        pubsubA.publish(event);
-
-        
-        Thread.sleep(2000);
-        
-        // got a faketopic event
-        assert(messagesRecieved < fakeTopic.messagesReceived());
-       
-        event.equals(fakeTopic.lastEvent);
-
-        
-        messagesRecieved= fakeTopic.messagesReceived();
-        
-        
-        // unsubscribe from fakeTopic
-        pubsubA.unsubscribe(fakeTopic);
-        
-        // publishing an event does nothing
-        pubsubA.publish(event);
-        
-        Thread.sleep(2000);
-        
-        // NO event received, nothing has been incremented
-        assert(messagesRecieved == fakeTopic.messagesReceived());
-
-    }
-    
-    
-    
-    
-
-    class FakeDotPubSubTopic implements DotPubSubTopic {
-        DotPubSubEvent lastEvent=null;
-        int messagesSent, messagesRecieved = 0;
-
-        @Override
-        public Comparable getKey() {
-            return "faketopic";
-        }
-
-        @Override
-        public long messagesSent() {
-            return messagesSent;
-        }
-
-        @Override
-        public long messagesReceived() {
-
-            return messagesRecieved;
-        }
-
-        @Override
-        public void incrementSentCounters(DotPubSubEvent event) {
-            messagesSent++;
-
-        }
-
-        @Override
-        public void incrementReceivedCounters(DotPubSubEvent event) {
-            messagesRecieved++;
-            
-
-        }
-
-        @Override
-        public void notify(DotPubSubEvent event) {
-            incrementReceivedCounters(event);
-            this.lastEvent = event;
-            Logger.info(this.getClass(), "got FAKE event:" + event);
-
-        }
-
-    };
-    
-    
-    
-    
-    @Test
-    public void test_sending_a_large_message_fails_and_recovers() throws Exception{
-        
-        
-        // create a fake topic and subscribe to it
-        FakeDotPubSubTopic fakeTopic = new FakeDotPubSubTopic(); 
-        pubsubA.subscribe(fakeTopic);
-        DotPubSubEvent workingEvent = new DotPubSubEvent.Builder()
-                        .withType(CacheTransportTopic.CacheEventType.UKN.name())
-                                        .withTopic(fakeTopic)
-                                        .withMessage(RandomStringUtils.randomAlphabetic(7500))
-                                        .build();
-        
-        DotPubSubEvent tooBigEvent = new DotPubSubEvent.Builder()
-                        .withType(CacheTransportTopic.CacheEventType.UKN.name())
-                                        .withTopic(fakeTopic)
-                                        .withMessage(RandomStringUtils.randomAlphabetic(9000))
-                                        .build();
-        
-        
-        assert(pubsubA.publish(workingEvent));
-            
-
-        assertFalse(pubsubA.publish(tooBigEvent));
-            
-
-       
-
-        
-        assert(pubsubA.publish(workingEvent));
-            
-        
-        
-        
-    }
-
-
-    private static boolean isPostgres() {
-        return DbConnectionFactory.isPostgres() && DbConnectionFactory.getDataSource() instanceof HikariDataSource;
-    }
-    
-    
-    
-    
-    
-    
-    
-
-}

From c9408c2a52f0362c7e3977840f525ddaba3278cd Mon Sep 17 00:00:00 2001
From: Will Ezell <will@dotcms.com>
Date: Thu, 17 Sep 2026 08:09:55 -0400
Subject: [PATCH 2/3] fix(core): fall back to JDBCPubSubImpl when pub/sub
 override is unusable (#37592)

DOT_PUBSUB_PROVIDER_OVERRIDE previously threw DotRuntimeException when the
named class could not be loaded or constructed, so a stale override
(e.g. pointing at a class from a dependency that is no longer shipped)
prevented the node from starting.

Now the locator logs a warning and falls back to JDBCPubSubImpl. The
fallback covers a missing class, no no-arg constructor, a constructor
that throws, and a class that does not implement DotPubSubProvider. If
the fallback target is itself unusable the exception is rethrown, since
there is nothing left to fall back to.

Also replaces the deprecated Class.newInstance() with
getDeclaredConstructor().newInstance(), and documents the fallback in
dotmarketing-config.properties.

Adds DotPubSubProviderLocatorTest (6 cases) covering each fallback path.
---
 .../dotpubsub/DotPubSubProviderLocator.java   | 75 +++++++++++++++-
 .../resources/dotmarketing-config.properties  |  2 +
 .../DotPubSubProviderLocatorTest.java         | 89 +++++++++++++++++++
 3 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 dotCMS/src/test/java/com/dotcms/dotpubsub/DotPubSubProviderLocatorTest.java

diff --git a/dotCMS/src/main/java/com/dotcms/dotpubsub/DotPubSubProviderLocator.java b/dotCMS/src/main/java/com/dotcms/dotpubsub/DotPubSubProviderLocator.java
index 02b9a3417cee..fcb36315a3aa 100644
--- a/dotCMS/src/main/java/com/dotcms/dotpubsub/DotPubSubProviderLocator.java
+++ b/dotCMS/src/main/java/com/dotcms/dotpubsub/DotPubSubProviderLocator.java
@@ -2,13 +2,28 @@
 
 import com.dotmarketing.exception.DotRuntimeException;
 import com.dotmarketing.util.Config;
+import com.dotmarketing.util.Logger;
+import com.google.common.annotations.VisibleForTesting;
 import io.vavr.Lazy;
 import io.vavr.control.Try;
 
+/**
+ * Resolves the {@link DotPubSubProvider} used to broadcast cache and cluster events.
+ * <p>
+ * The default is {@link JDBCPubSubImpl}. It can be replaced by setting the
+ * {@code DOT_PUBSUB_PROVIDER_OVERRIDE} system property or config property to the fully qualified
+ * name of an alternative implementation, for example {@code RedisPubSubImpl}.
+ * <p>
+ * If the configured class cannot be loaded or constructed - for instance because it belongs to a
+ * dependency that is no longer shipped - the default provider is used instead and a warning is
+ * logged. A stale override therefore degrades to the built-in behaviour rather than preventing
+ * the node from starting.
+ */
 public class DotPubSubProviderLocator {
 
     public final static String DOT_PUBSUB_PROVIDER_OVERRIDE = "DOT_PUBSUB_PROVIDER_OVERRIDE";
     public final static String DOT_PUBSUB_USE_QUEUE = "DOT_PUBSUB_USE_QUEUE";
+
     /**
      * Default provider is JDBCPubSubImpl, can be overriden by setting config: DOT_PUBSUB_PROVIDER_OVERRIDE
      * DOT_PUBSUB_USE_QUEUE is a boolean, and will wrap the Pubsub in a queue
@@ -24,11 +39,67 @@ public class DotPubSubProviderLocator {
                 : Config.getStringProperty(DOT_PUBSUB_PROVIDER_OVERRIDE,
                 JDBCPubSubImpl.class.getCanonicalName());
 
-        DotPubSubProvider provider = (DotPubSubProvider) Try.of(() -> Class.forName(pubsubClazz).newInstance())
-                        .getOrElseThrow(e -> new DotRuntimeException(e));
+        final DotPubSubProvider provider = resolveProvider(pubsubClazz);
 
         return (useQueue) ? new QueuingPubSubWrapper(provider) : provider;
 
     });
 
+    /**
+     * Resolves the provider named by {@code DOT_PUBSUB_PROVIDER_OVERRIDE}, falling back to
+     * {@link JDBCPubSubImpl} when that class is unavailable.
+     *
+     * @param pubsubClazz fully qualified name of the requested provider implementation
+     * @return the resolved provider
+     * @throws DotRuntimeException if neither the requested nor the default provider can be created
+     */
+    private static DotPubSubProvider resolveProvider(final String pubsubClazz) {
+        return resolveProvider(pubsubClazz, JDBCPubSubImpl.class.getCanonicalName());
+    }
+
+    /**
+     * Resolves the provider named by {@code pubsubClazz}, falling back to {@code defaultClazz} when
+     * the requested class is missing, exposes no no-arg constructor, throws from its constructor, or
+     * does not implement {@link DotPubSubProvider}.
+     * <p>
+     * A failure to build the <em>default</em> provider is not recoverable and is rethrown, since
+     * there is nothing left to fall back to.
+     *
+     * @param pubsubClazz  fully qualified name of the requested provider implementation
+     * @param defaultClazz fully qualified name of the provider to fall back to
+     * @return the resolved provider
+     * @throws DotRuntimeException if the fallback (or an explicitly requested default) is unusable
+     */
+    @VisibleForTesting
+    static DotPubSubProvider resolveProvider(final String pubsubClazz, final String defaultClazz) {
+
+        final Try<DotPubSubProvider> configured = Try.of(() -> newProviderInstance(pubsubClazz));
+
+        if (configured.isSuccess() || defaultClazz.equals(pubsubClazz)) {
+            return configured.getOrElseThrow(DotRuntimeException::new);
+        }
+
+        Logger.warn(DotPubSubProviderLocator.class,
+                () -> "Unable to instantiate DOT_PUBSUB_PROVIDER_OVERRIDE '" + pubsubClazz
+                        + "', falling back to " + defaultClazz,
+                configured.getCause());
+
+        return Try.of(() -> newProviderInstance(defaultClazz))
+                .getOrElseThrow(DotRuntimeException::new);
+    }
+
+    /**
+     * Creates a provider from its fully qualified class name.
+     *
+     * @param className fully qualified name of the provider implementation
+     * @return a new provider instance
+     * @throws ReflectiveOperationException if the class is missing, has no no-arg constructor, or
+     *                                      the constructor itself fails
+     * @throws ClassCastException           if the class does not implement {@link DotPubSubProvider}
+     */
+    private static DotPubSubProvider newProviderInstance(final String className)
+            throws ReflectiveOperationException {
+        return (DotPubSubProvider) Class.forName(className).getDeclaredConstructor().newInstance();
+    }
+
 }
diff --git a/dotCMS/src/main/resources/dotmarketing-config.properties b/dotCMS/src/main/resources/dotmarketing-config.properties
index d46f59c48285..d98e909cd269 100644
--- a/dotCMS/src/main/resources/dotmarketing-config.properties
+++ b/dotCMS/src/main/resources/dotmarketing-config.properties
@@ -404,6 +404,8 @@ PULLPERSONALIZED_PERSONA_WEIGHT=100
 ##################### dotCMS PUB/SUB #####################
 ## If you want to use a custom DOT_PUBSUB_PROVIDER, you can set the the DOT_PUBSUB_PROVIDER_OVERRIDE
 ## to the class you would like to use.  By default we use the com.dotcms.dotpubsub.JDBCPubSubImpl
+## If the configured class is missing or cannot be instantiated, we log a warning and fall back
+## to com.dotcms.dotpubsub.JDBCPubSubImpl rather than failing to start.
 #DOT_PUBSUB_PROVIDER_OVERRIDE=com.dotcms.dotpubsub.JDBCPubSubImpl
 
 ## Setting this to true will send all PUB/SUB messages async, through an async queuing mechanism
diff --git a/dotCMS/src/test/java/com/dotcms/dotpubsub/DotPubSubProviderLocatorTest.java b/dotCMS/src/test/java/com/dotcms/dotpubsub/DotPubSubProviderLocatorTest.java
new file mode 100644
index 000000000000..752093319c9d
--- /dev/null
+++ b/dotCMS/src/test/java/com/dotcms/dotpubsub/DotPubSubProviderLocatorTest.java
@@ -0,0 +1,89 @@
+package com.dotcms.dotpubsub;
+
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import com.dotmarketing.exception.DotRuntimeException;
+import org.junit.Test;
+
+/**
+ * Exercises {@link DotPubSubProviderLocator}'s override resolution.
+ * <p>
+ * The behaviour under test is that a stale or otherwise unusable
+ * {@code DOT_PUBSUB_PROVIDER_OVERRIDE} degrades to the default provider instead of preventing the
+ * node from starting. {@link NullDotPubSubProvider} stands in for the default so these tests stay
+ * free of database and API-locator infrastructure.
+ */
+public class DotPubSubProviderLocatorTest {
+
+    private static final String DEFAULT = NullDotPubSubProvider.class.getCanonicalName();
+    private static final String MISSING = "com.dotcms.dotpubsub.NoSuchProviderImpl";
+
+    @Test
+    public void resolveProvider_uses_the_requested_class_when_it_is_valid() {
+
+        final DotPubSubProvider provider =
+                DotPubSubProviderLocator.resolveProvider(DEFAULT, DEFAULT);
+
+        assertTrue(provider instanceof NullDotPubSubProvider);
+    }
+
+    @Test
+    public void resolveProvider_falls_back_when_the_class_is_missing() {
+
+        final DotPubSubProvider provider =
+                DotPubSubProviderLocator.resolveProvider(MISSING, DEFAULT);
+
+        assertTrue(provider instanceof NullDotPubSubProvider);
+    }
+
+    @Test
+    public void resolveProvider_falls_back_when_the_class_is_not_a_provider() {
+
+        final DotPubSubProvider provider =
+                DotPubSubProviderLocator.resolveProvider(String.class.getName(), DEFAULT);
+
+        assertTrue(provider instanceof NullDotPubSubProvider);
+    }
+
+    @Test
+    public void resolveProvider_falls_back_when_there_is_no_no_arg_constructor() {
+
+        final DotPubSubProvider provider = DotPubSubProviderLocator
+                .resolveProvider(NoNoArgConstructorProvider.class.getName(), DEFAULT);
+
+        assertTrue(provider instanceof NullDotPubSubProvider);
+    }
+
+    @Test
+    public void resolveProvider_falls_back_when_the_constructor_throws() {
+
+        final DotPubSubProvider provider = DotPubSubProviderLocator
+                .resolveProvider(FailingConstructorProvider.class.getName(), DEFAULT);
+
+        assertTrue(provider instanceof NullDotPubSubProvider);
+    }
+
+    @Test
+    public void resolveProvider_fails_when_the_fallback_is_itself_unusable() {
+
+        assertThrows(DotRuntimeException.class,
+                () -> DotPubSubProviderLocator.resolveProvider(MISSING, MISSING));
+    }
+
+    /** A provider with no no-arg constructor, so it cannot be built reflectively. */
+    static class NoNoArgConstructorProvider extends NullDotPubSubProvider {
+
+        NoNoArgConstructorProvider(final String requiredArgument) {
+        }
+    }
+
+    /** A provider whose constructor always fails. */
+    static class FailingConstructorProvider extends NullDotPubSubProvider {
+
+        FailingConstructorProvider() {
+            throw new IllegalStateException("constructor intentionally fails");
+        }
+    }
+
+}

From b6a18e74b15845b813e00bd2b7d5e71ec204964d Mon Sep 17 00:00:00 2001
From: Will Ezell <will@dotcms.com>
Date: Thu, 17 Sep 2026 08:18:33 -0400
Subject: [PATCH 3/3] chore(build): bump Netty to 4.1.138.Final via netty-bom

The six individual Netty pins only covered netty-common, netty-buffer,
netty-transport, netty-resolver, netty-codec and netty-handler, so the
rest of the tree still resolved to whatever each consumer asked for:
reactor-netty brought netty-resolver-dns 4.1.112, azure-core-http-netty
brought netty-codec-http2 4.1.132 and the awssdk netty-nio-client
brought netty-transport-classes-epoll 4.1.130. Mixed Netty modules on
one classpath fail at runtime with NoSuchMethodError.

Replaces the six pins with an import of io.netty:netty-bom, which manages
all 60 Netty artifacts - including the native transports, resolver-dns
and tcnative - at a single version. Bumps 4.1.118.Final to the latest
4.1.x, 4.1.138.Final.

Side effect: netty-tcnative-boringssl-static moves 2.0.70.Final ->
2.0.84.Final, the version netty-bom 4.1.138 pairs with.

Verified via dependency:tree that every io.netty artifact now resolves to
4.1.138.Final and tcnative to 2.0.84.Final; dotcms-core compiles and its
unit tests pass.
---
 bom/application/pom.xml | 40 ++++++++++------------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index d8356a327ad1..27202950b233 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -30,6 +30,7 @@
         <micrometer.version>1.13.10</micrometer.version>
         <opensearch.version>3.3.0</opensearch.version>
         <langchain4j.version>1.15.1</langchain4j.version>
+        <netty.version>4.1.138.Final</netty.version>
         <commonmark.version>0.22.0</commonmark.version>
         <jsoup.version>1.21.1</jsoup.version>
     </properties>
@@ -100,38 +101,17 @@
                 <version>3.4.41</version>
             </dependency>
 
-            <!-- Netty: pin to 4.1.118.Final so the Azure (langchain4j-azure-open-ai) and
-                 reactor-netty trees agree on one version. Required for
-                 DefaultHeaders$ValueValidator. -->
+            <!-- Netty: import the 4.1.x BOM so every Netty module resolves to a single version.
+                 Left to transitive resolution the trees disagree - azure-core-http-netty brings
+                 4.1.118, reactor-netty brings 4.1.112, netty-codec-http2 brings 4.1.132 and the
+                 awssdk netty-nio-client brings 4.1.130 - which fails at runtime with
+                 NoSuchMethodError, most visibly in DefaultHeaders$ValueValidator. -->
             <dependency>
                 <groupId>io.netty</groupId>
-                <artifactId>netty-common</artifactId>
-                <version>4.1.118.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-buffer</artifactId>
-                <version>4.1.118.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-transport</artifactId>
-                <version>4.1.118.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-resolver</artifactId>
-                <version>4.1.118.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec</artifactId>
-                <version>4.1.118.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler</artifactId>
-                <version>4.1.118.Final</version>
+                <artifactId>netty-bom</artifactId>
+                <version>${netty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>