You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/06/19 20:56:42 UTC
hbase git commit: HBASE-16242 Manually resolve transitive Apache Avro
dependency to consistently be ver 1.7.7.
Repository: hbase
Updated Branches:
refs/heads/master ce1ce728c -> 226319036
HBASE-16242 Manually resolve transitive Apache Avro dependency to consistently be ver 1.7.7.
Signed-off-by: Jerry He <je...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/22631903
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/22631903
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/22631903
Branch: refs/heads/master
Commit: 2263190361e26cfb85b0bbfd82cf56f5a6f85ca8
Parents: ce1ce72
Author: Sean Busbey <bu...@apache.org>
Authored: Fri Jun 16 15:57:00 2017 -0700
Committer: Sean Busbey <bu...@apache.org>
Committed: Mon Jun 19 15:50:14 2017 -0500
----------------------------------------------------------------------
hbase-common/pom.xml | 5 +++++
hbase-spark/pom.xml | 3 ---
pom.xml | 7 +++++++
3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/22631903/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index d066904..6e14b02 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -262,6 +262,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-crypto</artifactId>
</dependency>
+ <!-- transitive coalescing -->
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/hbase/blob/22631903/hbase-spark/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml
index 14f4877..980cae0 100644
--- a/hbase-spark/pom.xml
+++ b/hbase-spark/pom.xml
@@ -41,8 +41,6 @@
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>
<top.dir>${project.basedir}/..</top.dir>
- <avro.version>1.7.6</avro.version>
- <avro.mapred.classifier></avro.mapred.classifier>
</properties>
<dependencies>
@@ -526,7 +524,6 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>${avro.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/hbase/blob/22631903/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 02b8d4f..81b9003 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1250,6 +1250,7 @@
<compat.module>hbase-hadoop2-compat</compat.module>
<assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file>
<!-- end HBASE-15925 default hadoop compatibility values -->
+ <avro.version>1.7.7</avro.version>
<commons-cli.version>1.4</commons-cli.version>
<commons-codec.version>1.9</commons-codec.version>
<!-- pretty outdated -->
@@ -1570,6 +1571,12 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</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,
dropwizard and zk.-->
<dependency>