From 3541332d0f8953703655587937542d891e3e53f0 Mon Sep 17 00:00:00 2001
From: omraj shinde <omrajshinde534@gmail.com>
Date: Sat, 27 Dec 2025 13:17:52 +0530
Subject: [PATCH 1/2] Fix missing test dependencies and clean unused
 dependencies

---
 client-java-contrib/admissionreview/pom.xml |  5 +----
 e2e/pom.xml                                 |  7 +-----
 extended/pom.xml                            | 22 ++++++------------
 kubernetes/pom.xml                          | 21 +++++------------
 spring-aot/pom.xml                          |  5 -----
 spring/pom.xml                              |  5 -----
 util/pom.xml                                | 25 ++++++++++++---------
 7 files changed, 29 insertions(+), 61 deletions(-)

diff --git a/client-java-contrib/admissionreview/pom.xml b/client-java-contrib/admissionreview/pom.xml
index 4a20da8d4d..0be17ad436 100644
--- a/client-java-contrib/admissionreview/pom.xml
+++ b/client-java-contrib/admissionreview/pom.xml
@@ -16,10 +16,7 @@
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-        </dependency>
+    
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/e2e/pom.xml b/e2e/pom.xml
index 5cb16b9435..4c4764f13e 100644
--- a/e2e/pom.xml
+++ b/e2e/pom.xml
@@ -24,12 +24,7 @@
             <artifactId>client-java-extended</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
+        
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/extended/pom.xml b/extended/pom.xml
index a9917a1424..4057932b90 100644
--- a/extended/pom.xml
+++ b/extended/pom.xml
@@ -19,11 +19,6 @@
             <artifactId>client-java-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.kubernetes</groupId>
-            <artifactId>client-java-proto</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.kubernetes</groupId>
             <artifactId>client-java</artifactId>
@@ -52,24 +47,21 @@
             <artifactId>caffeine</artifactId>
         </dependency>
         <!-- test dependencies -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock</artifactId>
+                <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>5.12.1</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml
index 0afdd1be02..56173e1a36 100644
--- a/kubernetes/pom.xml
+++ b/kubernetes/pom.xml
@@ -150,10 +150,6 @@
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>logging-interceptor</artifactId>
@@ -174,26 +170,19 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-    </dependency>
+
 
     <!-- test dependencies -->
     <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
+        <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
+
   </dependencies>
 </project>
diff --git a/spring-aot/pom.xml b/spring-aot/pom.xml
index 5aaa0c8c55..2aa5560029 100644
--- a/spring-aot/pom.xml
+++ b/spring-aot/pom.xml
@@ -21,11 +21,6 @@
             <artifactId>reflections</artifactId>
             <version>${reflections.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.kubernetes</groupId>
-            <artifactId>client-java-spring-integration</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/spring/pom.xml b/spring/pom.xml
index 4548ef4c68..c2f39c19c1 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -47,11 +47,6 @@
       <artifactId>caffeine</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-test</artifactId>
diff --git a/util/pom.xml b/util/pom.xml
index 067d024569..72858ab01a 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -63,11 +63,6 @@
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>sts</artifactId>
-            <optional>${software.amazon.awssdk.sts.optional}</optional>
-        </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
@@ -85,17 +80,27 @@
             <artifactId>google-auth-library-oauth2-http</artifactId>
             <optional>${com.google.auth.google-auth-library-oauth2-http.optional}</optional>
         </dependency>
-        <!-- test dependencies -->
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
+    <groupId>software.amazon.awssdk</groupId>
+    <artifactId>sts</artifactId>
+    <optional>${software.amazon.awssdk.sts.optional}</optional>
+</dependency>
+
+        <!-- test dependencies -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+    <groupId>org.junit.jupiter</groupId>
+    <artifactId>junit-jupiter-params</artifactId>
+    <version>5.12.1</version>
+    <scope>test</scope>
+</dependency>
+
+
+
         <dependency>
             <groupId>uk.org.webcompere</groupId>
             <artifactId>system-stubs-jupiter</artifactId>

From e966827aca07784ab1c117f319746d5fcf016f5c Mon Sep 17 00:00:00 2001
From: omraj shinde <omrajshinde534@gmail.com>
Date: Wed, 7 Jan 2026 22:13:58 +0530
Subject: [PATCH 2/2] chore: fix XML formatting and move junit-jupiter-params
 version to parent pom

---
 extended/pom.xml   |  3 +--
 kubernetes/pom.xml |  2 +-
 pom.xml            |  9 ++++++++-
 util/pom.xml       | 21 +++++++++------------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/extended/pom.xml b/extended/pom.xml
index 4057932b90..e5b670d004 100644
--- a/extended/pom.xml
+++ b/extended/pom.xml
@@ -52,10 +52,9 @@
             <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-                <dependency>
+        <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.12.1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/kubernetes/pom.xml b/kubernetes/pom.xml
index 56173e1a36..8fbe974dd6 100644
--- a/kubernetes/pom.xml
+++ b/kubernetes/pom.xml
@@ -178,7 +178,7 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-        <dependency>
+    <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
diff --git a/pom.xml b/pom.xml
index 7bc85959f8..98d683552d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,6 @@
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
     <jakarta.annotation.version>3.0.0</jakarta.annotation.version>
     <jakarta.ws.rs-api-version>3.1.0</jakarta.ws.rs-api-version>
     <snakeyaml.version>2.5</snakeyaml.version>
@@ -50,6 +49,8 @@
     <caffeine.version>2.9.3</caffeine.version>
     <protobuf.version>4.33.2</protobuf.version>
     <junit-jupiter.version>5.13.4</junit-jupiter.version>
+    <junit-jupiter.version>5.13.4</junit-jupiter.version>
+    <junit-jupiter-params.version>${junit-jupiter.version}</junit-jupiter-params.version>
     <bucket4j.version>8.10.1</bucket4j.version>
     <bouncycastle.version>1.83</bouncycastle.version>
     <gson.version>2.13.2</gson.version>
@@ -267,6 +268,12 @@
         <version>${junit-jupiter.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${junit-jupiter.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-junit-jupiter</artifactId>
diff --git a/util/pom.xml b/util/pom.xml
index 72858ab01a..a38e8c5c5a 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -81,10 +81,11 @@
             <optional>${com.google.auth.google-auth-library-oauth2-http.optional}</optional>
         </dependency>
         <dependency>
-    <groupId>software.amazon.awssdk</groupId>
-    <artifactId>sts</artifactId>
-    <optional>${software.amazon.awssdk.sts.optional}</optional>
-</dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>sts</artifactId>
+            <optional>${software.amazon.awssdk.sts.optional}</optional>
+        </dependency>
+
 
         <!-- test dependencies -->
         <dependency>
@@ -93,14 +94,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-    <groupId>org.junit.jupiter</groupId>
-    <artifactId>junit-jupiter-params</artifactId>
-    <version>5.12.1</version>
-    <scope>test</scope>
-</dependency>
-
-
-
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>uk.org.webcompere</groupId>
             <artifactId>system-stubs-jupiter</artifactId>