From 0af6a6864821eb4d4541d2db79167a6527daa207 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Wed, 13 Nov 2024 11:31:33 +0000
Subject: [PATCH] Uplift of netty dependencies that are brought in by spring
 boot

- they conflict with the ones in parent used in apex and drools

Issue-ID: POLICY-5073
Change-Id: I35f1fdd622b8dce14d32f5bf0351b4c90124e0ac
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 participant/pom.xml | 37 +++++++++++++++++++++++++++++++++++++
 pom.xml             |  1 +
 runtime-acm/pom.xml | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+)

diff --git a/participant/pom.xml b/participant/pom.xml
index fdbd154b8..cb251ff64 100644
--- a/participant/pom.xml
+++ b/participant/pom.xml
@@ -120,6 +120,43 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing-bridge-otel</artifactId>
         </dependency>
+
+        <!-- these netty dependencies need to be uplifted later in parent-->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http2</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler-proxy</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 02ec9bdf2..d3ad465a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
     <properties>
         <policy.common.version>3.0.1-SNAPSHOT</policy.common.version>
         <policy.models.version>4.0.1-SNAPSHOT</policy.models.version>
+        <version.netty>4.1.112.Final</version.netty>
     </properties>
     <modules>
         <module>common</module>
diff --git a/runtime-acm/pom.xml b/runtime-acm/pom.xml
index 4b3c25db0..ec94b091e 100644
--- a/runtime-acm/pom.xml
+++ b/runtime-acm/pom.xml
@@ -308,6 +308,43 @@
             <artifactId>spring-boot-test-autoconfigure</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- these netty dependencies need to be uplifted later in parent-->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http2</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler-proxy</artifactId>
+            <version>${version.netty}</version>
+        </dependency>
     </dependencies>
 
     <build>
-- 
2.16.6