Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Signed-off-by: Jerry He <jerryjch@apache.org>

 Conflicts:
	hbase-common/pom.xml
	hbase-spark/pom.xml
	pom.xml
This commit is contained in:
Sean Busbey 2017-06-16 15:57:00 -07:00
parent d5749bf8ed
commit c6e587c5ac
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hbase-common/pom.xml
View File

@ -279,6 +279,11 @@
<groupId>org.apache.htrace</groupId> <groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId> <artifactId>htrace-core</artifactId>
</dependency> </dependency>
<!-- transitive coalescing -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>

7
pom.xml
View File

@ -1175,6 +1175,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.2</commons-cli.version> <commons-cli.version>1.2</commons-cli.version>
<commons-codec.version>1.9</commons-codec.version> <commons-codec.version>1.9</commons-codec.version>
<!-- pretty outdated --> <!-- pretty outdated -->
@ -1473,6 +1474,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,
yammer and zk.--> yammer and zk.-->
<dependency> <dependency>