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:53:26 UTC
[flink] branch release-1.10 updated (15b08d0 -> ac33f1a)
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a change to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 15b08d0 [FLINK-16433][table-api] TableEnvironmentImpl doesn't clear buffered operations when it fails
new 2fc3667 [FLINK-16635] Remove pinned dependency for okio and okhttp from flink-metrics-influxdb
new ac33f1a [FLINK-16635] Bump influxdb-java version to 2.17
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-metrics/flink-metrics-influxdb/pom.xml | 17 +----------------
.../src/main/resources/META-INF/NOTICE | 14 +++++++-------
2 files changed, 8 insertions(+), 23 deletions(-)
[flink] 01/02: [FLINK-16635] Remove pinned dependency for okio and
okhttp from flink-metrics-influxdb
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 2fc3667b1ea514bfeb67556fcb5832f0de87261d
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 cd99a17..dd1b9a4 100644
--- a/flink-metrics/flink-metrics-influxdb/pom.xml
+++ b/flink-metrics/flink-metrics-influxdb/pom.xml
@@ -90,21 +90,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
[flink] 02/02: [FLINK-16635] Bump influxdb-java version to 2.17
Posted by tr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git
commit ac33f1a9c690e7183ac2c0d340d5568cca1ba40e
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Tue Mar 17 14:38:09 2020 +0100
[FLINK-16635] Bump influxdb-java version to 2.17
This commit bumps influxdb-java version from 2.16 to 2.17. This resolves a
dependency convergence problem within the influxdb-java dependency.
This closes #11428.
---
flink-metrics/flink-metrics-influxdb/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/flink-metrics/flink-metrics-influxdb/pom.xml b/flink-metrics/flink-metrics-influxdb/pom.xml
index dd1b9a4..8e0c1be 100644
--- a/flink-metrics/flink-metrics-influxdb/pom.xml
+++ b/flink-metrics/flink-metrics-influxdb/pom.xml
@@ -57,7 +57,7 @@ under the License.
<dependency>
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
</dependency>
<!-- test dependencies -->
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 2cca565..cfd39b4 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
@@ -6,13 +6,13 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- com.squareup.moshi:moshi:1.5.0
-- com.squareup.okhttp3:logging-interceptor:3.11.0
-- com.squareup.okhttp3:okhttp:3.14.3
+- com.squareup.moshi:moshi:1.8.0
+- com.squareup.okhttp3:logging-interceptor:3.14.4
+- com.squareup.okhttp3:okhttp:3.14.4
- com.squareup.okio:okio:1.17.2
-- com.squareup.retrofit2:converter-moshi:2.4.0
-- com.squareup.retrofit2:retrofit:2.4.0
+- com.squareup.retrofit2:converter-moshi:2.6.2
+- com.squareup.retrofit2:retrofit:2.6.2
This project bundles the following dependencies under the MIT license. (https://opensource.org/licenses/MIT)
-- org.influxdb:influxdb-java:2.14
+- org.influxdb:influxdb-java:2.17