You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/12/14 00:40:46 UTC
[1/2] hbase git commit: HBASE-21359 Fix build problem against Hadoop
2.8.5
Repository: hbase
Updated Branches:
refs/heads/branch-1.3 d37294174 -> c4ed66a05
HBASE-21359 Fix build problem against Hadoop 2.8.5
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e7563cce
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e7563cce
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e7563cce
Branch: refs/heads/branch-1.3
Commit: e7563cce32d54e41d5536b4b50e703fed42b349b
Parents: d372941
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Nov 30 12:03:36 2018 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Dec 13 16:35:22 2018 -0800
----------------------------------------------------------------------
.../src/main/resources/supplemental-models.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e7563cce/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 eac4cad..9c4ceea 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -1351,6 +1351,24 @@ Copyright (c) 2000-2005 INRIA, France Telecom
</supplement>
<supplement>
<project>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <name>ASM: a very small and fast Java bytecode manipulation framework</name>
+
+ <licenses>
+ <license>
+ <name>BSD 3-Clause License</name>
+ <url>http://cvs.forge.objectweb.org/cgi-bin/viewcvs.cgi/*checkout*/asm/asm/LICENSE.txt?rev=1.3&only_with_tag=ASM_3_1_MVN</url>
+ <distribution>repo</distribution>
+ <comments>
+Copyright (c) 2000-2005 INRIA, France Telecom
+</comments>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
<groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-all</artifactId>
[2/2] hbase git commit: HBASE-19458 Allow building HBase 1.3.x
against Hadoop 2.8 (Lars Hofhansl)
Posted by ap...@apache.org.
HBASE-19458 Allow building HBase 1.3.x against Hadoop 2.8 (Lars Hofhansl)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c4ed66a0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c4ed66a0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c4ed66a0
Branch: refs/heads/branch-1.3
Commit: c4ed66a05a11e196ac5f5df3436132af28db707f
Parents: e7563cc
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Dec 13 16:28:47 2018 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Dec 13 16:35:23 2018 -0800
----------------------------------------------------------------------
.../src/main/resources/supplemental-models.xml | 46 ++++++++++++++++++++
1 file changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c4ed66a0/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 9c4ceea..9db6f94 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -1082,6 +1082,34 @@ Copyright 2006 Envoi Solutions LLC
</licenses>
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>com.squareup.okhttp</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>2.4.0</version>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>1.4.0</version>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
<!-- Permissive licenses that need text in LICENSE -->
<supplement>
<project>
@@ -2066,4 +2094,22 @@ Copyright (c) 2007-2011 The JRuby project
</licenses>
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>net.jcip</groupId>
+ <artifactId>jcip-annotations</artifactId>
+ <version>1.0</version>
+ <organization>
+ <name>Brian Goetz and Tim Peierls</name>
+ <url>http://www.jcip.net</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Creative Commons Attribution License, Version 2.5</name>
+ <url>http://creativecommons.org/licenses/by/2.5</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
</supplementalDataModels>