[FLINK-6654] [build] Let 'flink-dist' properly depend on 'flink-shade…

…d-hadoop2-uber'

This closes apache#3960

flink-dist/pom.xml

@@ -206,7 +206,7 @@ under the License.
  </dependency>
 
  <!-- Concrete logging framework - we add this only here (and not in the 
- root POM to not tie the projects to one specific framework and make
+ root POM) to not tie the projects to one specific framework and make
  it easier for users to swap logging frameworks -->
 
  <dependency>
@@ -221,6 +221,22 @@ under the License.
  <scope>compile</scope>
  </dependency>
 
+ <!--
+ 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>${project.version}</version>
+ <!--
+ Exclusion of flink-shaded-hadoop2 not necessary, dependencies
+ are shaded away properly by flink-shaded-hadoop2-uber.
+ -->
+ <scope>provided</scope>
+ </dependency>
+
  <!--
  The following dependencies are packaged in 'examples/'
  The scope of these dependencies needs to be 'provided' so that