You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by mi...@apache.org on 2020/09/21 09:46:41 UTC

[httpcomponents-client] 06/09: Unify Javadoc report config

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

michaelo pushed a commit to branch pom-cleanup
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git

commit 5a401754c025f9bb95b5b13a9e3701502226851f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Sep 21 11:15:47 2020 +0200

    Unify Javadoc report config
---
 httpclient5-cache/pom.xml   | 23 -----------------------
 httpclient5-fluent/pom.xml  | 23 -----------------------
 httpclient5-testing/pom.xml | 23 -----------------------
 httpclient5-win/pom.xml     | 22 ----------------------
 httpclient5/pom.xml         | 22 ----------------------
 pom.xml                     | 29 ++++++++++++++++++++++-------
 6 files changed, 22 insertions(+), 120 deletions(-)

diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml
index c368c16..cb44c42 100644
--- a/httpclient5-cache/pom.xml
+++ b/httpclient5-cache/pom.xml
@@ -122,29 +122,6 @@
 
   <reporting>
     <plugins>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <!-- reduce console output. Can override with -Dquiet=false -->
-          <quiet>true</quiet>
-          <source>${maven.compiler.source}</source>
-          <links>
-            <link>http://docs.oracle.com/javase/7/docs/api/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-client-5.0.x/httpclient5/apidocs/</link>
-          </links>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <inherited>false</inherited>
diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index 2b609c6..dd74faf 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -116,29 +116,6 @@
 
   <reporting>
     <plugins>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <!-- reduce console output. Can override with -Dquiet=false -->
-          <quiet>true</quiet>
-          <source>${maven.compiler.source}</source>
-          <links>
-            <link>http://docs.oracle.com/javase/7/docs/api/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-client-5.0.x/httpclient5/apidocs/</link>
-          </links>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <inherited>false</inherited>
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index 7b93fc5..1824a74 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -106,29 +106,6 @@
 
   <reporting>
     <plugins>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <!-- reduce console output. Can override with -Dquiet=false -->
-          <quiet>true</quiet>
-          <source>${maven.compiler.source}</source>
-          <links>
-            <link>http://docs.oracle.com/javase/7/docs/api/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-client-5.0.x/httpclient5/apidocs/</link>
-          </links>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <inherited>false</inherited>
diff --git a/httpclient5-win/pom.xml b/httpclient5-win/pom.xml
index 78356a0..282fcfe 100644
--- a/httpclient5-win/pom.xml
+++ b/httpclient5-win/pom.xml
@@ -85,28 +85,6 @@
 
   <reporting>
     <plugins>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <!-- reduce console output. Can override with -Dquiet=false -->
-          <quiet>true</quiet>
-          <source>${maven.compiler.source}</source>
-          <links>
-            <link>http://docs.oracle.com/javase/7/docs/api/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
-          </links>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <inherited>false</inherited>
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index 1f1c564..d4a7148 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -160,28 +160,6 @@
 
   <reporting>
     <plugins>
-
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <!-- reduce console output. Can override with -Dquiet=false -->
-          <quiet>true</quiet>
-          <source>${maven.compiler.source}</source>
-          <links>
-            <link>http://docs.oracle.com/javase/7/docs/api/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
-          </links>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <inherited>false</inherited>
diff --git a/pom.xml b/pom.xml
index 776ace8..40fdb0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,13 +188,10 @@
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <!-- reduce console output. Can override with -Dquiet=false -->
-          <quiet>true</quiet>
-          <source>${maven.compiler.source}</source>
           <links>
-            <link>http://docs.oracle.com/javase/7/docs/api/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
-            <link>http://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
+            <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
+            <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
+            <link>${project.url}/httpclient5/apidocs/</link>
           </links>
         </configuration>
       </plugin>
@@ -301,7 +298,25 @@
           </reportSet>
         </reportSets>
       </plugin>
-
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${hc.javadoc.version}</version>
+        <configuration>
+          <quiet>true</quiet>
+          <links>
+            <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5/apidocs/</link>
+            <link>https://hc.apache.org/httpcomponents-core-5.0.x/httpcore5-h2/apidocs/</link>
+            <link>${project.url}/httpclient5/apidocs/</link>
+          </links>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>javadoc</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
     </plugins>
   </reporting>