From e51ad132d25567631b4fc8003b192c3c2dc3cc97 Mon Sep 17 00:00:00 2001 From: Thomas Weise Date: Mon, 3 Feb 2020 15:13:19 -0800 Subject: [PATCH] [FLINK-15868][kinesis] Resolve version conflict between jackson-core and jackson-dataformat-cbor --- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 4 ++-- .../src/main/resources/META-INF/NOTICE | 4 ++-- pom.xml | 13 ++++++++++--- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/flink-connectors/flink-connector-elasticsearch2/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-connector-elasticsearch2/src/main/resources/META-INF/NOTICE index 2c992f9d4b3c6..e84826d1742dc 100644 --- a/flink-connectors/flink-connector-elasticsearch2/src/main/resources/META-INF/NOTICE +++ b/flink-connectors/flink-connector-elasticsearch2/src/main/resources/META-INF/NOTICE @@ -8,7 +8,7 @@ This project bundles the following dependencies under the Apache Software Licens - com.carrotsearch:hppc:0.7.1 - com.fasterxml.jackson.core:jackson-core:2.10.1 -- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.6 +- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 - com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.6.6 - com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.6.6 - com.google.guava:guava:18.0 diff --git a/flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/NOTICE index b21d631496cc4..00ebcaad7b49c 100644 --- a/flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/NOTICE +++ b/flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/NOTICE @@ -8,7 +8,7 @@ This project bundles the following dependencies under the Apache Software Licens - com.carrotsearch:hppc:0.7.1 - com.fasterxml.jackson.core:jackson-core:2.10.1 -- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.1 +- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 - com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.1 - com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.1 - com.github.spullara.mustache.java:compiler:0.9.3 diff --git a/flink-connectors/flink-sql-connector-elasticsearch6/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-sql-connector-elasticsearch6/src/main/resources/META-INF/NOTICE index 20dec3295addc..0553ffd183537 100644 --- a/flink-connectors/flink-sql-connector-elasticsearch6/src/main/resources/META-INF/NOTICE +++ b/flink-connectors/flink-sql-connector-elasticsearch6/src/main/resources/META-INF/NOTICE @@ -7,7 +7,7 @@ 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.fasterxml.jackson.core:jackson-core:2.10.1 -- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.10 +- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 - com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.10 - com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.10 - commons-codec:commons-codec:1.10 diff --git a/flink-connectors/flink-sql-connector-elasticsearch7/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-sql-connector-elasticsearch7/src/main/resources/META-INF/NOTICE index 269334ec77488..9ee1428cec268 100644 --- a/flink-connectors/flink-sql-connector-elasticsearch7/src/main/resources/META-INF/NOTICE +++ b/flink-connectors/flink-sql-connector-elasticsearch7/src/main/resources/META-INF/NOTICE @@ -7,7 +7,7 @@ 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.fasterxml.jackson.core:jackson-core:2.10.1 -- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.8.11 +- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 - com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.8.11 - com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.11 - commons-codec:commons-codec:1.10 diff --git a/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE index 1ad6388e27de8..8705a6a9d7821 100644 --- a/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE +++ b/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE @@ -11,7 +11,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.10.1 -- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7 +- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 - com.fasterxml.woodstox:woodstox-core:5.0.3 - com.google.guava:guava:11.0.2 - commons-beanutils:commons-beanutils:1.9.3 @@ -46,4 +46,4 @@ See bundled license files for details. This project bundles the following dependencies under BSD License (https://opensource.org/licenses/bsd-license.php). See bundled license files for details. -- org.codehaus.woodstox:stax2-api:3.1.4 (https://github.com/FasterXML/stax2-api/tree/stax2-api-3.1.4) \ No newline at end of file +- org.codehaus.woodstox:stax2-api:3.1.4 (https://github.com/FasterXML/stax2-api/tree/stax2-api-3.1.4) diff --git a/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE index aea4a374aef05..6a64e1ab4bfbe 100644 --- a/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE +++ b/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE @@ -22,7 +22,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.10.1 -- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.7 +- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.10.1 - com.fasterxml.woodstox:woodstox-core:5.0.3 - com.google.guava:guava:21.0 - io.airlift:configuration:0.153 @@ -62,4 +62,4 @@ See bundled license files for details. This project bundles the following dependencies under BSD License (https://opensource.org/licenses/bsd-license.php). See bundled license files for details. -- org.codehaus.woodstox:stax2-api:3.1.4 (https://github.com/FasterXML/stax2-api/tree/stax2-api-3.1.4) \ No newline at end of file +- org.codehaus.woodstox:stax2-api:3.1.4 (https://github.com/FasterXML/stax2-api/tree/stax2-api-3.1.4) diff --git a/pom.xml b/pom.xml index f5467131029bf..995c77fda6626 100644 --- a/pom.xml +++ b/pom.xml @@ -390,19 +390,26 @@ under the License. com.fasterxml.jackson.core jackson-annotations - 2.10.1 + ${jackson.version} com.fasterxml.jackson.core jackson-databind - 2.10.1 + ${jackson.version} com.fasterxml.jackson.core jackson-core - 2.10.1 + ${jackson.version} + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${jackson.version}