From 78868e37cc039efb815853df4b6ed60ec1740ec5 Mon Sep 17 00:00:00 2001
From: Jeff Almeida <jefferson.ramal@tecnisys.com.br>
Date: Fri, 24 Apr 2026 11:06:14 -0300
Subject: [PATCH 1/2] AMBARI-26569: Exclude legacy transitive dependencies
 causing runtime conflicts in server assembly

---
 ambari-server/src/main/assemblies/server.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ambari-server/src/main/assemblies/server.xml b/ambari-server/src/main/assemblies/server.xml
index 9f5c1aa1637..90764c421c2 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -464,6 +464,19 @@
       <outputDirectory>/usr/lib/ambari-server</outputDirectory>
       <unpack>false</unpack>
       <scope>runtime</scope>
+      <!--
+        Exclude legacy JARs brought transitively by dependencies
+(e.g., Hadoop, swagger-jaxrs) that conflict at runtime with the versions
+currently used by Ambari (ehcache 3.x, Jersey 2.x, JAX-RS 2.x).-->
+      <excludes>
+        <exclude>net.sf.ehcache:ehcache</exclude>
+        <exclude>com.sun.jersey:jersey-core</exclude>
+        <exclude>com.sun.jersey:jersey-server</exclude>
+        <exclude>com.sun.jersey:jersey-json</exclude>
+        <exclude>com.sun.jersey:jersey-servlet</exclude>
+        <exclude>com.sun.jersey:jersey-client</exclude>
+        <exclude>javax.ws.rs:jsr311-api</exclude>
+      </excludes>
     </dependencySet>
   </dependencySets>
-</assembly>
+</assembly>
\ No newline at end of file

From 588bdab61218f17321abb719043eaa5fe12a6af0 Mon Sep 17 00:00:00 2001
From: Jeff Almeida <jefferson.ramal@tecnisys.com.br>
Date: Mon, 27 Apr 2026 17:33:14 -0300
Subject: [PATCH 2/2] AMBARI-26570: Move transitive dependency exclusions from
 assembly to POM for better dependency management

---
 ambari-server/pom.xml                        | 40 ++++++++++++++++++++
 ambari-server/src/main/assemblies/server.xml | 13 -------
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 6327e8de95d..a701affde30 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1582,6 +1582,18 @@
           <groupId>com.sun.jersey</groupId>
           <artifactId>jersey-server</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-json</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-servlet</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-client</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -1870,6 +1882,22 @@
           <groupId>com.sun.jersey</groupId>
           <artifactId>jersey-servlet</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-json</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-client</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>jsr311-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sf.ehcache</groupId>
+          <artifactId>ehcache</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -1965,6 +1993,18 @@
           <groupId>com.sun.jersey</groupId>
           <artifactId>jersey-server</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-client</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>jsr311-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>net.sf.ehcache</groupId>
+          <artifactId>ehcache</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/ambari-server/src/main/assemblies/server.xml b/ambari-server/src/main/assemblies/server.xml
index 90764c421c2..623e9c9537d 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -464,19 +464,6 @@
       <outputDirectory>/usr/lib/ambari-server</outputDirectory>
       <unpack>false</unpack>
       <scope>runtime</scope>
-      <!--
-        Exclude legacy JARs brought transitively by dependencies
-(e.g., Hadoop, swagger-jaxrs) that conflict at runtime with the versions
-currently used by Ambari (ehcache 3.x, Jersey 2.x, JAX-RS 2.x).-->
-      <excludes>
-        <exclude>net.sf.ehcache:ehcache</exclude>
-        <exclude>com.sun.jersey:jersey-core</exclude>
-        <exclude>com.sun.jersey:jersey-server</exclude>
-        <exclude>com.sun.jersey:jersey-json</exclude>
-        <exclude>com.sun.jersey:jersey-servlet</exclude>
-        <exclude>com.sun.jersey:jersey-client</exclude>
-        <exclude>javax.ws.rs:jsr311-api</exclude>
-      </excludes>
     </dependencySet>
   </dependencySets>
 </assembly>
\ No newline at end of file