You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2020/03/18 15:50:24 UTC
[flink] 04/05: [FLINK-16635] Remove pinned dependency for okio and
okhttp from flink-metrics-influxdb
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit b4c0f2db5ecc8a0677763c1f822d5fdc46a52597
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Tue Mar 17 12:11:43 2020 +0100
[FLINK-16635] Remove pinned dependency for okio and okhttp from flink-metrics-influxdb
With FLINK-12147 we bumped the influxdb-java version from 2.14 to 2.16. At the same
time we still have okio and okhttp fixed to an incompatible version. This commit
removes the dependency management entries for these dependencies so that the
influxdb reporter bundles the correct dependencies.
---
flink-metrics/flink-metrics-influxdb/pom.xml | 15 ---------------
.../src/main/resources/META-INF/NOTICE | 4 ++--
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/flink-metrics/flink-metrics-influxdb/pom.xml b/flink-metrics/flink-metrics-influxdb/pom.xml
index 81d90cd..1d6289a 100644
--- a/flink-metrics/flink-metrics-influxdb/pom.xml
+++ b/flink-metrics/flink-metrics-influxdb/pom.xml
@@ -89,21 +89,6 @@ under the License.
</dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>3.11.0</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okio</groupId>
- <artifactId>okio</artifactId>
- <version>1.14.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<plugins>
<plugin>
diff --git a/flink-metrics/flink-metrics-influxdb/src/main/resources/META-INF/NOTICE b/flink-metrics/flink-metrics-influxdb/src/main/resources/META-INF/NOTICE
index ad79869..2cca565 100644
--- a/flink-metrics/flink-metrics-influxdb/src/main/resources/META-INF/NOTICE
+++ b/flink-metrics/flink-metrics-influxdb/src/main/resources/META-INF/NOTICE
@@ -8,8 +8,8 @@ This project bundles the following dependencies under the Apache Software Licens
- com.squareup.moshi:moshi:1.5.0
- com.squareup.okhttp3:logging-interceptor:3.11.0
-- com.squareup.okhttp3:okhttp:3.11.0
-- com.squareup.okio:okio:1.14.0
+- com.squareup.okhttp3:okhttp:3.14.3
+- com.squareup.okio:okio:1.17.2
- com.squareup.retrofit2:converter-moshi:2.4.0
- com.squareup.retrofit2:retrofit:2.4.0