[FLINK-10984][build] Remove flink-shaded-hadoop(-uber) modules

mbalassi · Jun 19, 2019 · ee4a2f7 · ee4a2f7
1 parent b1d5bf9
commit ee4a2f7
Show file tree

Hide file tree

Showing 35 changed files with 102 additions and 1,795 deletions.
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -52,8 +52,8 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <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
@@ -62,8 +62,8 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <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
@@ -110,8 +110,8 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <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
@@ -68,8 +68,8 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <artifactId>flink-shaded-hadoop-2</artifactId>
+ <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
 

diff --git a/flink-connectors/flink-orc/pom.xml b/flink-connectors/flink-orc/pom.xml
@@ -79,8 +79,8 @@ under the License.
  <!-- Replacement for ORC's Hadoop dependency. -->
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <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
@@ -135,7 +135,7 @@ under the License.
  <exclusions>
  <exclusion>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
+ <artifactId>flink-shaded-hadoop-2</artifactId>
  </exclusion>
  </exclusions>
  </dependency>
@@ -425,15 +425,10 @@ under the License.
  The Hadoop 2 Uber jar should not go into the Flink dist jar, but
  sit next to it. Hence, we set it to 'provided' here.
  -->
-
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2-uber</artifactId>
- <version>${hadoop.version}-${project.version}</version>
- <!--
- Exclusion of flink-shaded-hadoop2 not necessary, dependencies
- are shaded away properly by flink-shaded-hadoop2-uber.
- -->
+ <artifactId>flink-shaded-hadoop-2-uber</artifactId>
+ <version>${hadoop.version}-${flink.shaded.version}</version>
  <scope>provided</scope>
  </dependency>
  </dependencies>

diff --git a/flink-dist/src/main/assemblies/hadoop.xml b/flink-dist/src/main/assemblies/hadoop.xml
@@ -28,13 +28,14 @@ under the License.
  <includeBaseDirectory>true</includeBaseDirectory>
  <baseDirectory>flink-${project.version}</baseDirectory>
 
- <files>
- <!-- copy the Hadoop uber jar -->
- <file>
- <source>../flink-shaded-hadoop/flink-shaded-hadoop2-uber/target/flink-shaded-hadoop2-uber-${hadoop.version}-${project.version}.jar</source>
+ <dependencySets>
+ <dependencySet>
  <outputDirectory>lib/</outputDirectory>
- <destName>flink-shaded-hadoop2-uber-${project.version}-${hadoop.version}.jar</destName>
- <fileMode>0644</fileMode>
- </file>
- </files>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <scope>provided</scope>
+ <includes>
+ <include>org.apache.flink:flink-shaded-hadoop-2-uber</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
 </assembly>
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
@@ -48,8 +48,8 @@
  </dependency>
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <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
@@ -44,8 +44,8 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <artifactId>flink-shaded-hadoop-2</artifactId>
+ <version>${hadoop.version}-${flink.shaded.version}</version>
  <optional>true</optional>
  </dependency>
 

diff --git a/flink-filesystems/flink-swift-fs-hadoop/pom.xml b/flink-filesystems/flink-swift-fs-hadoop/pom.xml
@@ -60,7 +60,7 @@ under the License.
  <exclusions>
  <exclusion>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
+ <artifactId>flink-shaded-hadoop-2</artifactId>
  </exclusion>
  </exclusions>
  </dependency>

diff --git a/flink-formats/flink-parquet/pom.xml b/flink-formats/flink-parquet/pom.xml
@@ -60,8 +60,8 @@ under the License.
  <!-- Hadoop is needed by Parquet -->
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <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
@@ -46,8 +46,8 @@ under the License.
  <!-- Hadoop is needed for SequenceFile -->
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <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
@@ -38,8 +38,8 @@ under the License.
  <dependencies>
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <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
@@ -69,8 +69,8 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-hadoop2</artifactId>
- <version>${hadoop.version}-${project.version}</version>
+ <artifactId>flink-shaded-hadoop-2</artifactId>
+ <version>${hadoop.version}-${flink.shaded.version}</version>
  <optional>true</optional>
  </dependency>
 

diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2-uber/src/main/resources/META-INF/NOTICE b/flink-shaded-hadoop/flink-shaded-hadoop2-uber/src/main/resources/META-INF/NOTICE