Skip to content

[backport][FLINK-36332] Fix okhttp dependency handling #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2024
Merged

[backport][FLINK-36332] Fix okhttp dependency handling #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions flink-kubernetes-operator-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,8 @@ under the License.
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>${fabric8.version}</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-httpclient-okhttp</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Utils -->
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -112,6 +101,11 @@ under the License.
<version>${log4j.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>

<!-- Test -->
<dependency>
<groupId>org.apache.flink</groupId>
Expand Down
18 changes: 0 additions & 18 deletions flink-kubernetes-operator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ under the License.
<!-- required by FlinkConfigManagerTest -->
--add-opens=java.base/java.util=ALL-UNNAMED
</surefire.module.config>
<!-- valid options can be checked at https://central.sonatype.com/search?q=kubernetes-httpclient- currently: okhttp, jdk, jetty, vertx -->
<fabric8.httpclient.impl>okhttp</fabric8.httpclient.impl>
</properties>

<dependencies>
Expand Down Expand Up @@ -421,22 +419,6 @@ under the License.
</plugins>
</build>
</profile>
<profile>
<id>depend-on-okhttp4</id>
<activation>
<property>
<name>fabric8.httpclient.impl</name>
<value>okhttp</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>

</project>
16 changes: 0 additions & 16 deletions flink-kubernetes-webhook/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,6 @@ under the License.
<scope>test</scope>
</dependency>

<!-- okhttp -->
<!--
Regarding the okhttp explicit version
see https://github.com/fabric8io/kubernetes-client/issues/4290
and https://issues.apache.org/jira/browse/FLINK-28637
-->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
Expand Down
44 changes: 44 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ under the License.

<derby.version>10.15.2.0</derby.version>
<awaitility.version>4.2.2</awaitility.version>

<!-- valid options can be checked at https://central.sonatype.com/search?q=kubernetes-httpclient- currently: okhttp, jdk, jetty, vertx -->
<!-- when using a value other than okhttp disable the `depend-on-okhttp4` profile as well. -->
<fabric8.httpclient.impl>okhttp</fabric8.httpclient.impl>
</properties>

<dependencyManagement>
Expand All @@ -129,6 +133,33 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>${fabric8.version}</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-httpclient-okhttp</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-server-mock</artifactId>
<version>${fabric8.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -189,6 +220,19 @@ under the License.
</plugins>
</build>
</profile>
<profile>
<id>depend-on-okhttp4</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
Expand Down
Loading