From 6f253c55d878cdf02042049fae16439fe5fb0b87 Mon Sep 17 00:00:00 2001
From: Lars Hofhansl <larsh@apache.org>
Date: Thu, 25 Jan 2018 09:50:14 -0800
Subject: [PATCH] HBASE-19631 Allow building HBase 1.5.x against Hadoop 3.0.0.

---
 .../src/main/resources/supplemental-models.xml    | 15 +++++++++++++++
 pom.xml                                           |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index bb24b0c3d63..b164c585eab 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2079,6 +2079,21 @@ Copyright 2005 Sun Microsystems, Inc. and portions Copyright Apache Software Fou
       </licenses>
     </project>
   </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>
diff --git a/pom.xml b/pom.xml
index 30889e98c4c..6b700a820f6 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. -->