From 321a317cf989902979d6a49f0027904a86cdfbda Mon Sep 17 00:00:00 2001 From: Chesnay Schepler Date: Fri, 31 Jan 2020 09:46:29 +0100 Subject: [PATCH] [hotfix][build] Add depMgmt entry for flink-shaded-hadoop Some noise reduction. --- flink-connectors/flink-connector-filesystem/pom.xml | 1 - flink-connectors/flink-hadoop-compatibility/pom.xml | 1 - flink-connectors/flink-hbase/pom.xml | 1 - flink-connectors/flink-hcatalog/pom.xml | 1 - flink-dist/pom.xml | 1 - .../flink-bucketing-sink-test/pom.xml | 1 - flink-filesystems/flink-hadoop-fs/pom.xml | 1 - flink-filesystems/flink-mapr-fs/pom.xml | 1 - flink-formats/flink-compress/pom.xml | 1 - flink-formats/flink-orc/pom.xml | 1 - flink-formats/flink-parquet/pom.xml | 1 - flink-formats/flink-sequence-file/pom.xml | 1 - flink-fs-tests/pom.xml | 1 - flink-runtime/pom.xml | 1 - flink-tests/pom.xml | 1 - flink-yarn/pom.xml | 1 - pom.xml | 12 ++++++++++++ 17 files changed, 12 insertions(+), 16 deletions(-) diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml index 67823334504a7..7dcea9e50a0ff 100644 --- a/flink-connectors/flink-connector-filesystem/pom.xml +++ b/flink-connectors/flink-connector-filesystem/pom.xml @@ -53,7 +53,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml index 37dae74128ea9..46237dd4b3f70 100644 --- a/flink-connectors/flink-hadoop-compatibility/pom.xml +++ b/flink-connectors/flink-hadoop-compatibility/pom.xml @@ -63,7 +63,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml index 4114f69841636..b840d052861bb 100644 --- a/flink-connectors/flink-hbase/pom.xml +++ b/flink-connectors/flink-hbase/pom.xml @@ -103,7 +103,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-connectors/flink-hcatalog/pom.xml b/flink-connectors/flink-hcatalog/pom.xml index 64fab18a828af..f09f5753c4743 100644 --- a/flink-connectors/flink-hcatalog/pom.xml +++ b/flink-connectors/flink-hcatalog/pom.xml @@ -69,7 +69,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 7a49a1da6e823..03bdcbac05c47 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -452,7 +452,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2-uber - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml b/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml index 09900c0458353..7e010d9140c6c 100644 --- a/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml +++ b/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml @@ -49,7 +49,6 @@ org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-filesystems/flink-hadoop-fs/pom.xml b/flink-filesystems/flink-hadoop-fs/pom.xml index f85a4fac0868d..7876b313942cc 100644 --- a/flink-filesystems/flink-hadoop-fs/pom.xml +++ b/flink-filesystems/flink-hadoop-fs/pom.xml @@ -45,7 +45,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} true diff --git a/flink-filesystems/flink-mapr-fs/pom.xml b/flink-filesystems/flink-mapr-fs/pom.xml index 885501e410407..32725fb1d3508 100644 --- a/flink-filesystems/flink-mapr-fs/pom.xml +++ b/flink-filesystems/flink-mapr-fs/pom.xml @@ -49,7 +49,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} true diff --git a/flink-formats/flink-compress/pom.xml b/flink-formats/flink-compress/pom.xml index 3bf5041a5efdf..644694415a007 100644 --- a/flink-formats/flink-compress/pom.xml +++ b/flink-formats/flink-compress/pom.xml @@ -46,7 +46,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-formats/flink-orc/pom.xml b/flink-formats/flink-orc/pom.xml index e13045bbbf3e2..f19702d071754 100644 --- a/flink-formats/flink-orc/pom.xml +++ b/flink-formats/flink-orc/pom.xml @@ -87,7 +87,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-formats/flink-parquet/pom.xml b/flink-formats/flink-parquet/pom.xml index 114f0a4e12c73..5e0171d36c28b 100644 --- a/flink-formats/flink-parquet/pom.xml +++ b/flink-formats/flink-parquet/pom.xml @@ -85,7 +85,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-formats/flink-sequence-file/pom.xml b/flink-formats/flink-sequence-file/pom.xml index 35a33dbe3e482..2d0bc88fc14f1 100644 --- a/flink-formats/flink-sequence-file/pom.xml +++ b/flink-formats/flink-sequence-file/pom.xml @@ -47,7 +47,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} provided diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml index 796832a402e2f..1f2af7bb22664 100644 --- a/flink-fs-tests/pom.xml +++ b/flink-fs-tests/pom.xml @@ -39,7 +39,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} test diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index a5a625e291cfd..aded7a2ef67db 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -70,7 +70,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} true diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml index 545e2d3ce059a..fdc55fc5cbd73 100644 --- a/flink-tests/pom.xml +++ b/flink-tests/pom.xml @@ -55,7 +55,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} test diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml index e44112904b10e..f9d61cca92e1f 100644 --- a/flink-yarn/pom.xml +++ b/flink-yarn/pom.xml @@ -56,7 +56,6 @@ under the License. org.apache.flink flink-shaded-hadoop-2 - ${hadoop.version}-${flink.shaded.version} diff --git a/pom.xml b/pom.xml index 98891c29e5da4..34989e9c6e2f6 100644 --- a/pom.xml +++ b/pom.xml @@ -295,6 +295,18 @@ under the License. test + + org.apache.flink + flink-shaded-hadoop-2 + ${hadoop.version}-${flink.shaded.version} + + + + org.apache.flink + flink-shaded-hadoop-2-uber + ${hadoop.version}-${flink.shaded.version} + + com.google.code.findbugs