This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 3897959c07 NIFI-14118 Upgraded Kubernetes Client from 6.13.4 to 7.0.1
This closes #9601
3897959c07 is described below
commit 3897959c07e5235c1561ff2b8f61f5d30f1b9029
Author: exceptionfactory <[email protected]>
AuthorDate: Fri Dec 27 09:56:16 2024 -0600
NIFI-14118 Upgraded Kubernetes Client from 6.13.4 to 7.0.1
This closes #9601
- Updated dependency exclusions from OkHttp to Vertx aligning with default
changes in Fabric8 Kubernetes Client 7.0.0
---
nifi-commons/nifi-kubernetes-client/pom.xml | 2 +-
.../nifi-framework-kubernetes-nar/pom.xml | 2 +-
.../nifi-framework-kubernetes-state-provider/pom.xml | 19 +++++++++++++++----
.../KubernetesConfigMapStateProviderTest.java | 2 +-
pom.xml | 2 +-
5 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/nifi-commons/nifi-kubernetes-client/pom.xml
b/nifi-commons/nifi-kubernetes-client/pom.xml
index 3ec5293d84..2e2864d3fb 100644
--- a/nifi-commons/nifi-kubernetes-client/pom.xml
+++ b/nifi-commons/nifi-kubernetes-client/pom.xml
@@ -34,7 +34,7 @@
<exclusions>
<exclusion>
<groupId>io.fabric8</groupId>
- <artifactId>kubernetes-httpclient-okhttp</artifactId>
+ <artifactId>kubernetes-httpclient-vertx</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-nar/pom.xml
b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-nar/pom.xml
index 5e779c4c75..83198ac9a6 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-nar/pom.xml
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-nar/pom.xml
@@ -45,7 +45,7 @@
<exclusions>
<exclusion>
<groupId>io.fabric8</groupId>
- <artifactId>kubernetes-httpclient-okhttp</artifactId>
+ <artifactId>kubernetes-httpclient-vertx</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/pom.xml
b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/pom.xml
index c15b323e89..b4695dbe3f 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/pom.xml
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/pom.xml
@@ -43,20 +43,31 @@
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
- <artifactId>kubernetes-server-mock</artifactId>
+ <artifactId>kubernetes-client</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-httpclient-vertx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
- <artifactId>kubernetes-model-core</artifactId>
+ <artifactId>kubernetes-httpclient-jdk</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
- <artifactId>mockwebserver</artifactId>
+ <artifactId>kubernetes-server-mock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.squareup.okhttp3</groupId>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-model-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/test/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProviderTest.java
b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/test/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProviderTest.java
index da354093ce..dcb32a512c 100644
---
a/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/test/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProviderTest.java
+++
b/nifi-framework-bundle/nifi-framework-extensions/nifi-framework-kubernetes-bundle/nifi-framework-kubernetes-state-provider/src/test/java/org/apache/nifi/kubernetes/state/provider/KubernetesConfigMapStateProviderTest.java
@@ -23,7 +23,7 @@ import
io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServerExtension;
import io.fabric8.mockwebserver.dsl.HttpMethod;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.state.Scope;
import org.apache.nifi.components.state.StateMap;
diff --git a/pom.xml b/pom.xml
index b9b53ed1d0..8e722f0fc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<com.amazonaws.version>1.12.780</com.amazonaws.version>
<software.amazon.awssdk.version>2.29.40</software.amazon.awssdk.version>
<gson.version>2.11.0</gson.version>
-
<io.fabric8.kubernetes.client.version>6.13.4</io.fabric8.kubernetes.client.version>
+
<io.fabric8.kubernetes.client.version>7.0.1</io.fabric8.kubernetes.client.version>
<kotlin.version>2.1.0</kotlin.version>
<okhttp.version>4.12.0</okhttp.version>
<okio.version>3.9.1</okio.version>
