HBASE-16242 Manually resolve transitive Apache Avro dependency to consistently be ver 1.7.7.

Signed-off-by: Jerry He <jerryjch@apache.org>
This commit is contained in:
Sean Busbey 2017-06-16 15:57:00 -07:00
parent ce1ce728c6
commit 2263190361
3 changed files with 12 additions and 3 deletions

View File

@ -262,6 +262,11 @@
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-crypto</artifactId> <artifactId>commons-crypto</artifactId>
</dependency> </dependency>
<!-- transitive coalescing -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>

View File

@ -41,8 +41,6 @@
<scala.version>2.10.4</scala.version> <scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version> <scala.binary.version>2.10</scala.binary.version>
<top.dir>${project.basedir}/..</top.dir> <top.dir>${project.basedir}/..</top.dir>
<avro.version>1.7.6</avro.version>
<avro.mapred.classifier></avro.mapred.classifier>
</properties> </properties>
<dependencies> <dependencies>
@ -526,7 +524,6 @@
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
<version>${avro.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -1250,6 +1250,7 @@
<compat.module>hbase-hadoop2-compat</compat.module> <compat.module>hbase-hadoop2-compat</compat.module>
<assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file> <assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file>
<!-- end HBASE-15925 default hadoop compatibility values --> <!-- end HBASE-15925 default hadoop compatibility values -->
<avro.version>1.7.7</avro.version>
<commons-cli.version>1.4</commons-cli.version> <commons-cli.version>1.4</commons-cli.version>
<commons-codec.version>1.9</commons-codec.version> <commons-codec.version>1.9</commons-codec.version>
<!-- pretty outdated --> <!-- pretty outdated -->
@ -1570,6 +1571,12 @@
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>${log4j.version}</version> <version>${log4j.version}</version>
</dependency> </dependency>
<!-- Avro dependencies we mostly get transitively, manual version coallescing -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
</dependency>
<!--This is not used by hbase directly. Used by thrift, <!--This is not used by hbase directly. Used by thrift,
dropwizard and zk.--> dropwizard and zk.-->
<dependency> <dependency>