You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2020/05/29 20:56:31 UTC

[hbase] branch branch-2 updated (6f1992f -> 7ff3e65)

This is an automated email from the ASF dual-hosted git repository.

busbey pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git.


    from 6f1992f  HBASE-22287 inifinite retries on failed server in RSProcedureDispatcher (#1800)
     new 9a77aad  HBASE-19663 javadoc creation needs jsr305.
     new 7ff3e65  HBASE-22033 Update to maven-javadoc-plugin 3.2.0 and switch to non-forking aggregate goals

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)


[hbase] 02/02: HBASE-22033 Update to maven-javadoc-plugin 3.2.0 and switch to non-forking aggregate goals

Posted by bu...@apache.org.
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

commit 7ff3e650c2007e35bed30d9d00918cfc73c710e1
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Sat Mar 16 15:02:22 2019 -0500

    HBASE-22033 Update to maven-javadoc-plugin 3.2.0 and switch to non-forking aggregate goals
    
    closes #1796
    
    Signed-off-by: Viraj Jasani <vj...@apache.org>
    Signed-off-by: Michael Stack <st...@apache.org>
    Signed-off-by: Jan Hentschel <ja...@apache.org>
    (cherry picked from commit 06949ff6a6c6e1f519d0380c0652b18b54cf1a41)
---
 pom.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e314c9a..093a1bc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -559,6 +559,11 @@
             <compilerArgument>-Xlint:-options</compilerArgument>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${maven.javadoc.version}</version>
+        </plugin>
         <!-- Test oriented plugins -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1415,6 +1420,7 @@
     <maven.bundle.version>3.3.0</maven.bundle.version>
     <maven.checkstyle.version>3.1.0</maven.checkstyle.version>
     <maven.eclipse.version>2.10</maven.eclipse.version>
+    <maven.javadoc.version>3.2.0</maven.javadoc.version>
     <maven.warbucks.version>1.1.0</maven.warbucks.version>
     <os.maven.version>1.5.0.Final</os.maven.version>
     <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
@@ -3980,7 +3986,7 @@
           <reportSet>
             <id>devapi</id>
             <reports>
-              <report>aggregate</report>
+              <report>aggregate-no-fork</report>
             </reports>
             <configuration>
               <destDir>devapidocs</destDir>
@@ -4029,7 +4035,7 @@
           <reportSet>
             <id>testdevapi</id>
             <reports>
-              <report>test-aggregate</report>
+              <report>test-aggregate-no-fork</report>
             </reports>
             <configuration>
               <destDir>testdevapidocs</destDir>
@@ -4080,7 +4086,7 @@
           <reportSet>
             <id>userapi</id>
             <reports>
-              <report>aggregate</report>
+              <report>aggregate-no-fork</report>
             </reports>
             <configuration>
               <doclet>
@@ -4140,7 +4146,7 @@
           <reportSet>
             <id>testuserapi</id>
             <reports>
-              <report>test-aggregate</report>
+              <report>test-aggregate-no-fork</report>
             </reports>
             <configuration>
               <doclet>


[hbase] 01/02: HBASE-19663 javadoc creation needs jsr305.

Posted by bu...@apache.org.
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

commit 9a77aad60cfccd2a3fadc97225f09242f484b8d5
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Wed Oct 16 10:31:47 2019 -0500

    HBASE-19663 javadoc creation needs jsr305.
    
    Some javadoc invocations require that annotations we reference can have any
    classes they reference resolved. This includes annotations _they_ have,
    even though annotations are normally optional.
    
    In some cases this showed up as javax.annotation.meta.TypeQualifierNickname
    not found, because some findbugs annotations use it. Other times it was
    javax.annotation.concurrent.Immutable not found, because some old guava
    versions use it.
    
    (updated for master branch by doing the config in report config instead of plugin)
    
    Signed-off-by: Peter Somogyi <ps...@apache.org>
    Signed-off-by: Michael Stack <st...@apache.org>
    (cherry picked from commit f0d66273cdae9ada86b499200042304e22aa1a25)
---
 pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pom.xml b/pom.xml
index 1522f2e..e314c9a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4016,6 +4016,12 @@
                   <artifactId>hamcrest-core</artifactId>
                   <version>${hamcrest.version}</version>
                 </additionalDependency>
+                <!-- javadoc tooling requires jsr305 due to references to it from things we rely on -->
+                <additionalDependency>
+                  <groupId>com.google.code.findbugs</groupId>
+                  <artifactId>jsr305</artifactId>
+                  <version>3.0.2</version>
+                </additionalDependency>
               </additionalDependencies>
               <inherited>false</inherited>
             </configuration>
@@ -4059,6 +4065,12 @@
                   <artifactId>hamcrest-core</artifactId>
                   <version>${hamcrest.version}</version>
                 </additionalDependency>
+                <!-- javadoc tooling requires jsr305 due to references to it from things we rely on -->
+                <additionalDependency>
+                  <groupId>com.google.code.findbugs</groupId>
+                  <artifactId>jsr305</artifactId>
+                  <version>3.0.2</version>
+                </additionalDependency>
               </additionalDependencies>
               <inherited>false</inherited>
             </configuration>
@@ -4114,6 +4126,12 @@
                   <artifactId>hamcrest-core</artifactId>
                   <version>${hamcrest.version}</version>
                 </additionalDependency>
+                <!-- javadoc tooling requires jsr305 due to references to it from things we rely on -->
+                <additionalDependency>
+                  <groupId>com.google.code.findbugs</groupId>
+                  <artifactId>jsr305</artifactId>
+                  <version>3.0.2</version>
+                </additionalDependency>
               </additionalDependencies>
               <inherited>false</inherited>
             </configuration>
@@ -4168,6 +4186,12 @@
                   <artifactId>hamcrest-core</artifactId>
                   <version>${hamcrest.version}</version>
                 </additionalDependency>
+                <!-- javadoc tooling requires jsr305 due to references to it from things we rely on -->
+                <additionalDependency>
+                  <groupId>com.google.code.findbugs</groupId>
+                  <artifactId>jsr305</artifactId>
+                  <version>3.0.2</version>
+                </additionalDependency>
               </additionalDependencies>
               <inherited>false</inherited>
             </configuration>