File tree Expand file tree Collapse file tree 3 files changed +17
-33
lines changed
flink-kubernetes-operator Expand file tree Collapse file tree 3 files changed +17
-33
lines changed Original file line number Diff line number Diff line change @@ -421,22 +421,6 @@ under the License.
421421 </plugins >
422422 </build >
423423 </profile >
424- <profile >
425- <id >depend-on-okhttp4</id >
426- <activation >
427- <property >
428- <name >fabric8.httpclient.impl</name >
429- <value >okhttp</value >
430- </property >
431- </activation >
432- <dependencies >
433- <dependency >
434- <groupId >com.squareup.okhttp3</groupId >
435- <artifactId >okhttp</artifactId >
436- <version >${okhttp.version} </version >
437- </dependency >
438- </dependencies >
439- </profile >
440424 </profiles >
441425
442426</project >
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ under the License.
2424 <groupId >org.apache.flink</groupId >
2525 <artifactId >flink-kubernetes-operator-parent</artifactId >
2626 <version >1.11-SNAPSHOT</version >
27- <relativePath >..</relativePath >
27+ <relativePath >../pom.xml </relativePath >
2828 </parent >
2929
3030 <artifactId >flink-kubernetes-webhook</artifactId >
@@ -78,22 +78,6 @@ under the License.
7878 <scope >test</scope >
7979 </dependency >
8080
81- <!-- okhttp -->
82- <!--
83- Regarding the okhttp explicit version
84- see https://github.com/fabric8io/kubernetes-client/issues/4290
85- and https://issues.apache.org/jira/browse/FLINK-28637
86- -->
87- <dependency >
88- <groupId >com.squareup.okhttp3</groupId >
89- <artifactId >okhttp</artifactId >
90- <version >${okhttp.version} </version >
91- </dependency >
92- <dependency >
93- <groupId >com.squareup.okhttp3</groupId >
94- <artifactId >logging-interceptor</artifactId >
95- <version >${okhttp.version} </version >
96- </dependency >
9781 <dependency >
9882 <groupId >com.squareup.okhttp3</groupId >
9983 <artifactId >mockwebserver</artifactId >
Original file line number Diff line number Diff line change @@ -189,6 +189,22 @@ under the License.
189189 </plugins >
190190 </build >
191191 </profile >
192+ <profile >
193+ <id >depend-on-okhttp4</id >
194+ <activation >
195+ <property >
196+ <name >fabric8.httpclient.impl</name >
197+ <value >okhttp</value >
198+ </property >
199+ </activation >
200+ <dependencies >
201+ <dependency >
202+ <groupId >com.squareup.okhttp3</groupId >
203+ <artifactId >okhttp</artifactId >
204+ <version >${okhttp.version} </version >
205+ </dependency >
206+ </dependencies >
207+ </profile >
192208 </profiles >
193209
194210 <build >
You can’t perform that action at this time.
0 commit comments