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
The following commit(s) were added to refs/heads/release-1.10 by this push:
new 5fa6289 [FLINK-15864][k8s] Upgrade jackson-databind dependency to
2.10.1
5fa6289 is described below
commit 5fa62896fde2683aff1bd89573260ccf72c54d0d
Author: Till Rohrmann <trohrm...@apache.org>
AuthorDate: Mon Feb 3 15:02:13 2020 +0100
[FLINK-15864][k8s] Upgrade jackson-databind dependency to 2.10.1
This closes #11000.
---
flink-kubernetes/pom.xml | 52 +++++-----------------
.../src/main/resources/META-INF/NOTICE | 2 +-
2 files changed, 12 insertions(+), 42 deletions(-)
diff --git a/flink-kubernetes/pom.xml b/flink-kubernetes/pom.xml
index dfc4cb5..8fabddf 100644
--- a/flink-kubernetes/pom.xml
+++ b/flink-kubernetes/pom.xml
@@ -35,6 +35,17 @@ under the License.
<kubernetes.client.version>4.5.2</kubernetes.client.version>
</properties>
+ <!-- Set dependency version for transitive dependencies -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.12.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- core dependencies -->
@@ -57,54 +68,13 @@ under the License.
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>${kubernetes.client.version}</version>
- <!-- exclude for dependency convergence and use fixed
version -->
- <exclusions>
- <exclusion>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>com.fasterxml.jackson.core</groupId>
-
<artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.9.8</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>3.12.1</version>
</dependency>
<!-- test dependencies -->
-
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-server-mock</artifactId>
<version>${kubernetes.client.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>com.fasterxml.jackson.core</groupId>
-
<artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
<scope>test</scope>
</dependency>
diff --git a/flink-kubernetes/src/main/resources/META-INF/NOTICE
b/flink-kubernetes/src/main/resources/META-INF/NOTICE
index 47837c2..9502c67 100644
--- a/flink-kubernetes/src/main/resources/META-INF/NOTICE
+++ b/flink-kubernetes/src/main/resources/META-INF/NOTICE
@@ -8,7 +8,7 @@ This project bundles the following dependencies under the
Apache Software Licens
- com.fasterxml.jackson.core:jackson-annotations:2.10.1
- com.fasterxml.jackson.core:jackson-core:2.10.1
-- com.fasterxml.jackson.core:jackson-databind:2.9.8
+- com.fasterxml.jackson.core:jackson-databind:2.10.1
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.9
- com.github.mifmif:generex:1.0.2
- com.squareup.okhttp3:logging-interceptor:3.12.0
