Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22222 Site build fails after hbase-thirdparty upgrade

Browse Source 
(with addendum)

Signed-off-by: Guanghao Zhang <zghao@apache.org>
Signed-off-by: Sean Busbey <busbey@apache.org>
(cherry picked from commit 1e821aa9ce7ccfe2a6657f9297643eba7d6a7547)
This commit is contained in:
zhangduo 2019-04-13 21:50:59 +08:00 committed by Sean Busbey
parent ca7bfd3943
commit 39f2f3acae
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hbase-resource-bundle/src/main/resources/supplemental-models.xml
View File

@ -2928,4 +2928,23 @@ Copyright (c) 2007-2017 The JRuby project
</licenses>
</project>
</supplement>
<supplement>
<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>
</license>
</licenses>
</project>
</supplement>
</supplementalDataModels>

2
pom.xml
View File

@ -1443,7 +1443,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. -->