You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2018/01/25 17:50:08 UTC
hbase git commit: HBASE-19631 Allow building HBase 1.5.x against
Hadoop 3.0.0.
Repository: hbase
Updated Branches:
refs/heads/branch-1 2c5140e15 -> 6f253c55d
HBASE-19631 Allow building HBase 1.5.x against Hadoop 3.0.0.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6f253c55
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6f253c55
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6f253c55
Branch: refs/heads/branch-1
Commit: 6f253c55d878cdf02042049fae16439fe5fb0b87
Parents: 2c5140e
Author: Lars Hofhansl <la...@apache.org>
Authored: Thu Jan 25 09:50:14 2018 -0800
Committer: Lars Hofhansl <la...@apache.org>
Committed: Thu Jan 25 09:50:14 2018 -0800
----------------------------------------------------------------------
.../src/main/resources/supplemental-models.xml | 15 +++++++++++++++
pom.xml | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/6f253c55/hbase-resource-bundle/src/main/resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index bb24b0c..b164c58 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2081,6 +2081,21 @@ Copyright 2005 Sun Microsystems, Inc. and portions Copyright Apache Software Fou
</supplement>
<supplement>
<project>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <url>http://asm.objectweb.org/asm/</url>
+
+ <licenses>
+ <license>
+ <url>http://www.mozilla.org/MPL/2.0</url>
+ <name>Mozilla Public License Version 2.0</name>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
<groupId>org.jamon</groupId>
<artifactId>jamon-runtime</artifactId>
<name>Jamon runtime support classes</name>
http://git-wip-us.apache.org/repos/asf/hbase/blob/6f253c55/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 30889e9..6b700a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1241,7 +1241,7 @@
<hadoop-two.version>2.7.4</hadoop-two.version>
<!-- minikdc introduced in hadoop-2.3; override when building earlier versions -->
<hadoop-two-minikdc.version>${hadoop-two.version}</hadoop-two-minikdc.version>
- <hadoop-three.version>3.0.0-SNAPSHOT</hadoop-three.version>
+ <hadoop-three.version>3.0.0</hadoop-three.version>
<!-- These must be defined here for downstream build tools that don't look at profiles.
They ought to match the values found in our default hadoop profile, which is
currently "hadoop-2.0". See HBASE-15925 for more info. -->