From 747a7d4b527eecd075a0e8a8a19bec9065ed2edc Mon Sep 17 00:00:00 2001
From: Sanaya Gupta <sanaya.gupta@est.tech>
Date: Wed, 22 Oct 2025 13:02:19 +0100
Subject: [PATCH] Upgrading the versions of Netty, Jetty and Spring6

---
 examples/helloworld-spring-webapp/pom.xml | 6 ++++++
 pom.xml                                   | 9 ++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/examples/helloworld-spring-webapp/pom.xml b/examples/helloworld-spring-webapp/pom.xml
index cbc3d91911..7575a67e39 100644
--- a/examples/helloworld-spring-webapp/pom.xml
+++ b/examples/helloworld-spring-webapp/pom.xml
@@ -76,6 +76,12 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.micrometer</groupId>
+                    <artifactId>micrometer-observation</artifactId>
+                </exclusion>
+            </exclusions>
             <version>${spring6.version}</version>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index ee38b9cb60..032ada0890 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2120,7 +2120,6 @@
                 <artifactId>opentracing-util</artifactId>
                 <version>${opentracing.version}</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -2262,7 +2261,7 @@
         <kryo.version>4.0.3</kryo.version>
         <mockito.version>4.11.0</mockito.version> <!-- CQ 17673 -->
         <mustache.version>0.9.14</mustache.version>
-        <netty.version>4.1.122.Final</netty.version>
+        <netty.version>4.1.128.Final</netty.version>
         <opentracing.version>0.33.0</opentracing.version>
         <osgi.version>6.0.0</osgi.version>
         <osgi.framework.version>1.10.0</osgi.framework.version>
@@ -2275,7 +2274,7 @@
         <rxjava2.version>2.2.21</rxjava2.version>
         <simple.version>6.0.1</simple.version>
         <slf4j.version>2.0.17</slf4j.version>
-        <spring6.version>6.0.23</spring6.version>
+        <spring6.version>6.2.11</spring6.version>
         <testng.version>7.11.0</testng.version>
         <testng6.version>6.14.3</testng6.version>
         <thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
@@ -2322,8 +2321,8 @@
         <jaxrs.api.spec.version>3.0</jaxrs.api.spec.version>
         <jaxrs.api.impl.version>3.0.0</jaxrs.api.impl.version>
         <jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version>
-        <jetty.version>11.0.25</jetty.version>
-        <jetty9.version>9.4.57.v20241219</jetty9.version>
+        <jetty.version>11.0.26</jetty.version>
+        <jetty9.version>9.4.58.v20250814</jetty9.version>
         <jetty.plugin.version>11.0.25</jetty.plugin.version>
         <jsonb.api.version>2.0.0</jsonb.api.version>
         <jsonp.ri.version>1.0.5</jsonp.ri.version>