[hotfix][build] Add depMgmt entry for flink-shaded-hadoop

Some noise reduction.
tongcheng-elong · Feb 5, 2020 · 321a317 · 321a317
1 parent 031256e
commit 321a317
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 16 deletions.
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -53,7 +53,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml
@@ -63,7 +63,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml
@@ -103,7 +103,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/flink-connectors/flink-hcatalog/pom.xml b/flink-connectors/flink-hcatalog/pom.xml
@@ -69,7 +69,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -452,7 +452,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2-uber</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
  </dependencies>

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
@@ -49,7 +49,6 @@
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  <exclusions>
  <!-- Needed for proper dependency convergence -->

diff --git a/flink-filesystems/flink-hadoop-fs/pom.xml b/flink-filesystems/flink-hadoop-fs/pom.xml
@@ -45,7 +45,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <optional>true</optional>
  </dependency>
 

diff --git a/flink-filesystems/flink-mapr-fs/pom.xml b/flink-filesystems/flink-mapr-fs/pom.xml
@@ -49,7 +49,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <optional>true</optional>
  </dependency>
 

diff --git a/flink-formats/flink-compress/pom.xml b/flink-formats/flink-compress/pom.xml
@@ -46,7 +46,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/flink-formats/flink-orc/pom.xml b/flink-formats/flink-orc/pom.xml
@@ -87,7 +87,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/flink-formats/flink-parquet/pom.xml b/flink-formats/flink-parquet/pom.xml
@@ -85,7 +85,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/flink-formats/flink-sequence-file/pom.xml b/flink-formats/flink-sequence-file/pom.xml
@@ -47,7 +47,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
@@ -39,7 +39,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>test</scope>
  </dependency>
 

diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
@@ -70,7 +70,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <optional>true</optional>
  </dependency>
 

diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
@@ -55,7 +55,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>test</scope>
  </dependency>
 

diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml
@@ -56,7 +56,6 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-shaded-hadoop-2</artifactId>
- <version>${hadoop.version}-${flink.shaded.version}</version>
  </dependency>
 
  <!-- test dependencies -->

diff --git a/pom.xml b/pom.xml
@@ -295,6 +295,18 @@ under the License.
  <scope>test</scope>
  </dependency>
 
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-hadoop-2</artifactId>
+ <version>${hadoop.version}-${flink.shaded.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-hadoop-2-uber</artifactId>
+ <version>${hadoop.version}-${flink.shaded.version}</version>
+ </dependency>
+
  <!-- This manages the 'javax.annotation' annotations (JSR305) -->
  <dependency>
  <groupId>com.google.code.findbugs</groupId>