Repository: flink Updated Branches: refs/heads/master 10a42f951 -> 417c5a4b4
[FLINK-4737] [core] Ensure that Flink and its Hadoop dependency pull the same version of 'commons-compress' Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7a76328d Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7a76328d Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7a76328d Branch: refs/heads/master Commit: 7a76328d4ec984aaa93d3e3181873254a6b85eed Parents: 81aec41 Author: Stephan Ewen <[email protected]> Authored: Tue Oct 4 18:18:09 2016 +0200 Committer: Stephan Ewen <[email protected]> Committed: Wed Oct 5 19:36:13 2016 +0200 ---------------------------------------------------------------------- flink-core/pom.xml | 31 +++++++++----------- .../flink-shaded-hadoop2/pom.xml | 8 +++++ pom.xml | 6 ++++ 3 files changed, 28 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/7a76328d/flink-core/pom.xml ---------------------------------------------------------------------- diff --git a/flink-core/pom.xml b/flink-core/pom.xml index 40e5a2e..865a253 100644 --- a/flink-core/pom.xml +++ b/flink-core/pom.xml @@ -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> @@ -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> http://git-wip-us.apache.org/repos/asf/flink/blob/7a76328d/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml ---------------------------------------------------------------------- diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml index 8a7b101..7df2578 100644 --- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml +++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/flink/blob/7a76328d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d127ccb..330debe 100644 --- a/pom.xml +++ b/pom.xml @@ -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>
