hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject hbase git commit: HBASE-13990 make maven site generation work with jdk8
Date Wed, 01 Jul 2015 12:59:10 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 85c278a6a -> 6ca337cb3


HBASE-13990 make maven site generation work with jdk8


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6ca337cb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6ca337cb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6ca337cb

Branch: refs/heads/master
Commit: 6ca337cb3eb7496077285c7d9c7ab14c73735ac0
Parents: 85c278a
Author: Sean Busbey <busbey@apache.org>
Authored: Mon Jun 29 12:42:21 2015 -0500
Committer: Sean Busbey <busbey@apache.org>
Committed: Tue Jun 30 21:11:42 2015 -0500

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/io/hfile/HFileBlock.java |  2 +-
 .../master/normalizer/SimpleRegionNormalizer.java    | 14 ++++++++------
 pom.xml                                              | 15 ++++++++++++++-
 3 files changed, 23 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/6ca337cb/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
index f60272f..f3bf0b7 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
@@ -344,7 +344,7 @@ public class HFileBlock implements Cacheable {
   /**
    * Returns the buffer this block stores internally. The clients must not
    * modify the buffer object. This method has to be public because it is
-   * used in {@link org.apache.hadoop.hbase.util.CompoundBloomFilter} to avoid object
+   * used in {@link CompoundBloomFilter} to avoid object
    *  creation on every Bloom filter lookup, but has to be used with caution.
    *   Checksum data is not included in the returned buffer but header data is.
    *

http://git-wip-us.apache.org/repos/asf/hbase/blob/6ca337cb/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
index bf58691..75989d5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
@@ -36,13 +36,15 @@ import java.util.List;
  *
  * Logic in use:
  *
- *  - get all regions of a given table
- *  - get avg size S of each region (by total size of store files reported in RegionLoad)
- *  - If biggest region is bigger than S * 2, it is kindly requested to split,
+ *  <ol>
+ *  <li> get all regions of a given table
+ *  <li> get avg size S of each region (by total size of store files reported in RegionLoad)
+ *  <li> If biggest region is bigger than S * 2, it is kindly requested to split,
  *    and normalization stops
- *  - Otherwise, two smallest region R1 and its smallest neighbor R2 are kindly requested
- *    to merge, if R1 + R1 <  S, and normalization stops
- *  - Otherwise, no action is performed
+ *  <li> Otherwise, two smallest region R1 and its smallest neighbor R2 are kindly
requested
+ *    to merge, if R1 + R1 &lt;  S, and normalization stops
+ *  <li> Otherwise, no action is performed
+ * </ol>
  */
 @InterfaceAudience.Private
 public class SimpleRegionNormalizer implements RegionNormalizer {

http://git-wip-us.apache.org/repos/asf/hbase/blob/6ca337cb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bbb7ff4..5551905 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1195,7 +1195,7 @@
     <maven.antrun.version>1.8</maven.antrun.version>
     <jamon.plugin.version>2.3.4</jamon.plugin.version>
     <findbugs-annotations>1.3.9-1</findbugs-annotations>
-    <javadoc.version>2.9</javadoc.version>
+    <javadoc.version>2.10.3</javadoc.version>
     <!-- General Packaging -->
     <package.prefix>/usr</package.prefix>
     <package.conf.dir>/etc/hbase</package.conf.dir>
@@ -2747,6 +2747,19 @@
           <excludePackageNames>org.apache.hadoop.hbase.generated.master:org.apache.hadoop.hbase.protobuf.generated</excludePackageNames>
           <maxmemory>2048m</maxmemory>
           <notimestamp>true</notimestamp>
+          <!-- JDK8 javadoc requires test scope transitive dependencies due to our custom
doclet -->
+          <additionalDependencies>
+            <additionalDependency>
+              <groupId>org.mockito</groupId>
+              <artifactId>mockito-all</artifactId>
+              <version>${mockito-all.version}</version>
+            </additionalDependency>
+            <additionalDependency>
+              <groupId>org.hamcrest</groupId>
+              <artifactId>hamcrest-core</artifactId>
+              <version>${hamcrest.version}</version>
+            </additionalDependency>
+          </additionalDependencies>
         </configuration>
         <reportSets>
           <reportSet>


Mime
View raw message