This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 3b0310c HBASE-22222 Site build fails after hbase-thirdparty upgrade
3b0310c is described below
commit 3b0310c14c159a138d0b6b02c2bbd2b9b71ced85
Author: zhangduo <[email protected]>
AuthorDate: Sat Apr 13 21:50:59 2019 +0800
HBASE-22222 Site build fails after hbase-thirdparty upgrade
(with addendum)
Signed-off-by: Guanghao Zhang <[email protected]>
Signed-off-by: Sean Busbey <[email protected]>
(cherry picked from commit 1e821aa9ce7ccfe2a6657f9297643eba7d6a7547)
---
hbase-resource-bundle/src/main/resources/supplemental-models.xml | 6 ++++++
pom.xml | 2 +-
2 files changed, 7 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 4e4c089..27e15ac 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -2945,8 +2945,14 @@ Copyright (c) 2007-2017 The JRuby project
<project>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
+
+ <organization>
+ <name>Google</name>
+ <url>http://www.google.com</url>
+ </organization>
<licenses>
<license>
+ <!-- It has been incorrectly called Apache 2.0 in the original pom-->
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
diff --git a/pom.xml b/pom.xml
index 0f0beb7..1310302 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1446,7 +1446,7 @@
<spotbugs.version>3.1.11</spotbugs.version>
<wagon.ssh.version>2.12</wagon.ssh.version>
<xml.maven.version>1.0.1</xml.maven.version>
- <hbase-thirdparty.version>2.2.0</hbase-thirdparty.version>
+ <hbase-thirdparty.version>2.2.1</hbase-thirdparty.version>
<!-- Intraproject jar naming properties -->
<!-- TODO this is pretty ugly, but works for the moment.
Modules are pretty heavy-weight things, so doing this work isn't too
bad. -->
