diff options
| author | Paul Rogers <progers@maprtech.com> | 2016-12-27 17:21:09 -0800 |
|---|---|---|
| committer | Jinfeng Ni <jni@apache.org> | 2017-02-21 00:53:07 -0800 |
| commit | 38f816a45924654efd085bf7f1da7d97a4a51e38 (patch) | |
| tree | 74493766ae8328bd0ceb0c600c9f80402846d03a | |
| parent | 0b8ef9e71f71f41cdc2c6a07d01361ee45199516 (diff) | |
DRILL-5157: Multiple Snappy versions on class path
Multiple Snappy versions on class path; causes unit test failures.
This fix updates the Snappy library and adds dependency management to
exclude older versions brought in by Avro and Parquet.
| -rw-r--r-- | exec/java-exec/pom.xml | 11 | ||||
| -rw-r--r-- | pom.xml | 27 |
2 files changed, 33 insertions, 5 deletions
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 000d447a2..2acda3ad8 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -376,11 +376,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - <version>1.0.5-M3</version> - </dependency> - <dependency> <groupId>com.carrotsearch</groupId> <artifactId>hppc</artifactId> <version>0.7.1</version> @@ -429,6 +424,12 @@ <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> <version>1.7.7</version> + <exclusions> + <exclusion> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.avro</groupId> @@ -609,6 +609,11 @@ <version>0.9.44</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>1.1.2.6</version> + </dependency> </dependencies> @@ -1331,6 +1336,17 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-hadoop</artifactId> + <version>${parquet.version}</version> + <exclusions> + <exclusion> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> <version>${hbase.version}</version> @@ -1772,6 +1788,17 @@ <artifactId>sqlline</artifactId> <version>${sqlline.version}</version> </dependency> + <dependency> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-hadoop</artifactId> + <version>${parquet.version}</version> + <exclusions> + <exclusion> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + </exclusion> + </exclusions> + </dependency> <!-- Test Dependencies --> <dependency> <groupId>org.apache.hadoop</groupId> |