diff --git a/flink-kubernetes-operator-api/pom.xml b/flink-kubernetes-operator-api/pom.xml index 5e5a3ae236..25724f26dc 100644 --- a/flink-kubernetes-operator-api/pom.xml +++ b/flink-kubernetes-operator-api/pom.xml @@ -66,19 +66,8 @@ under the License. io.fabric8 kubernetes-client - ${fabric8.version} - - - com.squareup.okhttp3 - * - - - io.fabric8 - kubernetes-httpclient-okhttp - - - + org.apache.commons @@ -112,6 +101,11 @@ under the License. ${log4j.version} + + com.fasterxml.jackson.core + jackson-annotations + + org.apache.flink diff --git a/flink-kubernetes-operator/pom.xml b/flink-kubernetes-operator/pom.xml index ad0b2c2fc8..20a4f79483 100644 --- a/flink-kubernetes-operator/pom.xml +++ b/flink-kubernetes-operator/pom.xml @@ -37,8 +37,6 @@ under the License. --add-opens=java.base/java.util=ALL-UNNAMED - - okhttp @@ -421,22 +419,6 @@ under the License. - - depend-on-okhttp4 - - - fabric8.httpclient.impl - okhttp - - - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - diff --git a/flink-kubernetes-webhook/pom.xml b/flink-kubernetes-webhook/pom.xml index fdb7b76dc3..621659a076 100644 --- a/flink-kubernetes-webhook/pom.xml +++ b/flink-kubernetes-webhook/pom.xml @@ -78,22 +78,6 @@ under the License. test - - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - com.squareup.okhttp3 - logging-interceptor - ${okhttp.version} - com.squareup.okhttp3 mockwebserver diff --git a/pom.xml b/pom.xml index c9826cba9e..2df1e3e933 100644 --- a/pom.xml +++ b/pom.xml @@ -111,6 +111,10 @@ under the License. 10.15.2.0 4.2.2 + + + + okhttp @@ -129,6 +133,33 @@ under the License. pom import + + io.fabric8 + kubernetes-client + ${fabric8.version} + + + com.squareup.okhttp3 + * + + + io.fabric8 + kubernetes-httpclient-okhttp + + + + + io.fabric8 + kubernetes-server-mock + ${fabric8.version} + test + + + com.squareup.okhttp3 + mockwebserver + + + @@ -189,6 +220,19 @@ under the License. + + depend-on-okhttp4 + + true + + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + +