Merge branch 'master' of https://github.com/kubernetes-client/java into metrics-label-selector

Author: at88mph

examples/examples-release-17/pom.xml

@@ -96,7 +96,7 @@
 			<plugin>
         		<groupId>com.diffplug.spotless</groupId>
         		<artifactId>spotless-maven-plugin</artifactId>
-        		<version>2.45.0</version>
+        		<version>2.46.1</version>
         	</plugin>
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
@@ -116,7 +116,7 @@
 		</plugins>
 	</build>
 	<properties>
-		<junit-jupiter.version>5.13.3</junit-jupiter.version>
-		<spring.boot.version>3.5.3</spring.boot.version>
+		<junit-jupiter.version>5.13.4</junit-jupiter.version>
+		<spring.boot.version>3.5.4</spring.boot.version>
 	</properties>
 </project>

examples/examples-release-18/pom.xml

@@ -97,7 +97,7 @@
 			<plugin>
         		<groupId>com.diffplug.spotless</groupId>
         		<artifactId>spotless-maven-plugin</artifactId>
-        		<version>2.45.0</version>
+        		<version>2.46.1</version>
         	</plugin>
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
@@ -117,7 +117,7 @@
 		</plugins>
 	</build>
     <properties>
-        <junit-jupiter.version>5.13.3</junit-jupiter.version>
-        <spring.boot.version>3.5.3</spring.boot.version>
+        <junit-jupiter.version>5.13.4</junit-jupiter.version>
+        <spring.boot.version>3.5.4</spring.boot.version>
     </properties>
 </project>

examples/examples-release-19/pom.xml

@@ -101,7 +101,7 @@
 			<plugin>
         		<groupId>com.diffplug.spotless</groupId>
         		<artifactId>spotless-maven-plugin</artifactId>
-        		<version>2.45.0</version>
+        		<version>2.46.1</version>
         	</plugin>
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
@@ -121,7 +121,7 @@
 		</plugins>
 	</build>
     <properties>
-        <junit-jupiter.version>5.13.3</junit-jupiter.version>
-        <spring.boot.version>3.5.3</spring.boot.version>
+        <junit-jupiter.version>5.13.4</junit-jupiter.version>
+        <spring.boot.version>3.5.4</spring.boot.version>
     </properties>
 </project>

examples/examples-release-20/pom.xml

@@ -101,7 +101,7 @@
 			<plugin>
         		<groupId>com.diffplug.spotless</groupId>
         		<artifactId>spotless-maven-plugin</artifactId>
-        		<version>2.45.0</version>
+        		<version>2.46.1</version>
         	</plugin>
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
@@ -121,7 +121,7 @@
 		</plugins>
 	</build>
     <properties>
-        <junit-jupiter.version>5.13.3</junit-jupiter.version>
-        <spring.boot.version>3.5.3</spring.boot.version>
+        <junit-jupiter.version>5.13.4</junit-jupiter.version>
+        <spring.boot.version>3.5.4</spring.boot.version>
     </properties>
 </project>

pom.xml

@@ -50,11 +50,11 @@
     <slf4j.version>2.0.17</slf4j.version>
     <caffeine.version>2.9.3</caffeine.version>
     <protobuf.version>4.31.1</protobuf.version>
-    <junit-jupiter.version>5.13.3</junit-jupiter.version>
+    <junit-jupiter.version>5.13.4</junit-jupiter.version>
     <bucket4j.version>8.10.1</bucket4j.version>
     <bouncycastle.version>1.81</bouncycastle.version>
     <gson.version>2.13.1</gson.version>
-    <jackson.version>2.19.1</jackson.version>
+    <jackson.version>2.19.2</jackson.version>
     <jsr305.version>3.0.2</jsr305.version>
     <okhttp3.version>5.1.0</okhttp3.version>
     <swagger-core.version>1.6.16</swagger-core.version>
@@ -63,10 +63,10 @@
     <apache.commons.lang3.version>3.18.0</apache.commons.lang3.version>
     <apache.commons.collections4.version>4.5.0</apache.commons.collections4.version>
     <apache.commons.compress>1.27.1</apache.commons.compress>
-    <apache.commons.io>2.19.0</apache.commons.io>
-    <common.codec.version>1.18.0</common.codec.version>
-    <spring.boot.version>3.5.3</spring.boot.version>
-    <spring.version>6.2.8</spring.version>
+    <apache.commons.io>2.20.0</apache.commons.io>
+    <common.codec.version>1.19.0</common.codec.version>
+    <spring.boot.version>3.5.4</spring.boot.version>
+    <spring.version>6.2.9</spring.version>
     <prometheus.client.version>0.16.0</prometheus.client.version>
     <reflections.version>0.10.2</reflections.version>
 
@@ -152,7 +152,7 @@
       <dependency>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>sts</artifactId>
-        <version>2.32.0</version>
+        <version>2.32.10</version>
       </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
@@ -348,7 +348,7 @@
         <plugin>
           <groupId>com.diffplug.spotless</groupId>
           <artifactId>spotless-maven-plugin</artifactId>
-          <version>2.45.0</version>
+          <version>2.46.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>

util/src/main/java/io/kubernetes/client/util/ClientBuilder.java

@@ -73,6 +73,7 @@ public class ClientBuilder {
   // time to refresh exec based credentials
   // TODO: Read the expiration from the credential itself
   private Duration execCredentialRefreshPeriod = null;
+  private ApiClient apiClient = null;
 
   /**
    * Creates an {@link ApiClient} by calling {@link #standard()} and {@link #build()}.
@@ -435,8 +436,17 @@ public ClientBuilder setKeyStorePassphrase(String keyStorePassphrase) {
     return this;
   }
 
+  public ApiClient getApiClient() {
+    return this.apiClient;
+  }
+
+  public ClientBuilder setApiClient(ApiClient apiClient) {
+    this.apiClient = apiClient;
+    return this;
+  }
+
   public ApiClient build() {
-    final ApiClient client = new ApiClient();
+    final ApiClient client = this.apiClient == null ? new ApiClient() : this.apiClient;
 
     client.setHttpClient(
         client

util/src/main/java/io/kubernetes/client/util/generic/GenericKubernetesApi.java

@@ -707,7 +707,7 @@ private CallBuilder makeClusterCreateCallBuilder(
             this.resourcePlural,
             object)
                 .dryRun(createOptions.getDryRun())
-                .dryRun(createOptions.getFieldManager())
+                .fieldManager(createOptions.getFieldManager())
                 .buildCall(null);
   }