Skip to content

Commit

Permalink
[FLINK-4737] [core] Ensure that Flink and its Hadoop dependency pull …
Browse files Browse the repository at this point in the history
…the same version of 'commons-compress'
  • Loading branch information
StephanEwen authored and yuzhongliu committed Dec 5, 2016
1 parent 1043aef commit b8b2c1b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 17 deletions.
31 changes: 14 additions & 17 deletions flink-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,20 @@ under the License.
<!-- managed version -->
</dependency>

<!-- The common collections are needed for some hash tables used in the collection execution -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<!-- managed version -->
</dependency>

<!-- Commons compression, for additional decompressors -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<!-- managed version -->
</dependency>

<!-- Avro is needed for the interoperability with Avro types for serialization -->
<dependency>
<groupId>org.apache.avro</groupId>
Expand All @@ -63,26 +77,9 @@ under the License.
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- The common collections are needed for some hash tables used in the collection execution -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>

<!-- Commons compression, for additional decompressors -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.4</version>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>org.apache.flink</groupId>
Expand Down
8 changes: 8 additions & 0 deletions flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ under the License.
<packaging>jar</packaging>

<dependencies>

<!-- explicitly include commons-compress to force Flink's managed version -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<!-- managed version -->
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,12 @@ under the License.
<version>3.5</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.4.1</version>
</dependency>

<!-- Managed dependency required for HBase in flink-hbase -->
<dependency>
<groupId>org.javassist</groupId>
Expand Down

0 comments on commit b8b2c1b

Please sign in to comment.