From d82f8d9c9790004e2995cfcd09d1042a00a048ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 May 2026 08:52:07 +0000
Subject: [PATCH 1/2] chore(deps): bump io.netty:netty-all in /dhis-2

Bumps [io.netty:netty-all](https://github.com/netty/netty) from 4.2.1.Final to 4.2.13.Final.
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.2.1.Final...netty-4.2.13.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-all
  dependency-version: 4.2.13.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 dhis-2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index b354891f7add..1221aca9a5f8 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -174,7 +174,7 @@
 
     <!-- Apache Artemis -->
     <artemis-jakarta.version>2.44.0</artemis-jakarta.version>
-    <netty-all.version>4.2.1.Final</netty-all.version>
+    <netty-all.version>4.2.13.Final</netty-all.version>
     <classgraph.version>4.8.184</classgraph.version>
 
     <!-- SMS/SMPP -->

From ff9d2d2cba5e91a6b73279ecc9c710fcac416fbb Mon Sep 17 00:00:00 2001
From: Stian Sandvold <stian@dhis2.org>
Date: Sun, 31 May 2026 08:39:21 +0200
Subject: [PATCH 2/2] fix(deps): align netty modules via netty-bom for
 netty-all 4.2.13

Bumping netty-all to 4.2.13 leaves the individual netty modules that
Artemis pulls in transitively (netty-codec-haproxy,
netty-transport-classes-epoll/kqueue) at 4.1.128, putting two netty
versions on the classpath. At runtime that throws AbstractMethodError
(AbstractReferenceCountedByteBuf vs ReferenceCountUpdater) when the
Artemis JMS listener starts, which fails every integration test that
loads the Spring context.

Import io.netty:netty-bom (pinned to ${netty-all.version}) so all
io.netty:* artifacts resolve to one version. Verified: dependency:tree
shows all netty artifacts at 4.2.13 with no 4.1.x left, and
SchemaControllerTest passes under integration-h2-test.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 dhis-2/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dhis-2/pom.xml b/dhis-2/pom.xml
index 1221aca9a5f8..c2780d96824b 100644
--- a/dhis-2/pom.xml
+++ b/dhis-2/pom.xml
@@ -1331,6 +1331,17 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!-- Align every io.netty:* artifact (incl. modules Artemis pulls transitively,
+           e.g. netty-codec-haproxy / netty-transport-classes-*) to the same version as
+           netty-all. Without this, the netty-all uber jar mixes with older individual
+           netty modules on the classpath, causing AbstractMethodError at runtime. -->
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <version>${netty-all.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.graphhopper.external</groupId>
         <artifactId>jackson-datatype-jts</artifactId>