This is an automated email from the ASF dual-hosted git repository.
bbende 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 d56f92d738 NIFI-13707 Switched Kubernetes HTTP Client from OkHttp to
JDK (#9228)
d56f92d738 is described below
commit d56f92d738e54b8e9c0ce04606bd7b6259375239
Author: David Handermann <[email protected]>
AuthorDate: Thu Sep 5 10:31:15 2024 -0500
NIFI-13707 Switched Kubernetes HTTP Client from OkHttp to JDK (#9228)
---
nifi-commons/nifi-kubernetes-client/pom.xml | 11 ++++++++
.../nifi-framework-kubernetes-nar/pom.xml | 31 +++++++---------------
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/nifi-commons/nifi-kubernetes-client/pom.xml
b/nifi-commons/nifi-kubernetes-client/pom.xml
index 3944ccf9cd..a88c037778 100644
--- a/nifi-commons/nifi-kubernetes-client/pom.xml
+++ b/nifi-commons/nifi-kubernetes-client/pom.xml
@@ -31,6 +31,17 @@
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-httpclient-okhttp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-httpclient-jdk</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
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 19d64fdc59..707633844e 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
@@ -42,31 +42,18 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-httpclient-okhttp</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <!-- The following are transitive dependencies which we scope as
provided as the nifi-framework-nar is expected to have them -->
<dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-jdk8</artifactId>
- <version>${kotlin.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib-jdk7</artifactId>
- <version>${kotlin.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-stdlib</artifactId>
- <version>${kotlin.version}</version>
- <scope>provided</scope>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-httpclient-jdk</artifactId>
</dependency>
+ <!-- Transitive dependencies provided in nifi-framework-nar -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
