From e13e4ff548199acb5eeaf7367a182f371ca2a63e Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Mon, 21 Sep 2020 11:22:24 +0200
Subject: [PATCH] Unify JXR and Surefire report config

---
 httpclient5-cache/pom.xml   |  9 ---------
 httpclient5-fluent/pom.xml  |  9 ---------
 httpclient5-testing/pom.xml |  1 -
 httpclient5-win/pom.xml     |  9 ---------
 httpclient5/pom.xml         |  9 ---------
 pom.xml                     | 10 ++++++++--
 6 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml
index cb44c42a0..e3b34509e 100644
--- a/httpclient5-cache/pom.xml
+++ b/httpclient5-cache/pom.xml
@@ -135,15 +135,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-
     </plugins>
   </reporting>
 
diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml
index dd74faf80..9ba56bd44 100644
--- a/httpclient5-fluent/pom.xml
+++ b/httpclient5-fluent/pom.xml
@@ -129,15 +129,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-
     </plugins>
   </reporting>
 
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
index 1824a7413..93fdb9518 100644
--- a/httpclient5-testing/pom.xml
+++ b/httpclient5-testing/pom.xml
@@ -119,7 +119,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-
     </plugins>
   </reporting>
 
diff --git a/httpclient5-win/pom.xml b/httpclient5-win/pom.xml
index 282fcfe83..b32c94a2f 100644
--- a/httpclient5-win/pom.xml
+++ b/httpclient5-win/pom.xml
@@ -98,15 +98,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-
     </plugins>
   </reporting>
 
diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml
index d4a714875..7a3d6af67 100644
--- a/httpclient5/pom.xml
+++ b/httpclient5/pom.xml
@@ -173,15 +173,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-      </plugin>
-
     </plugins>
   </reporting>
 
diff --git a/pom.xml b/pom.xml
index 40fdb0dbb..fd067f829 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,7 +271,6 @@
 
   <reporting>
     <plugins>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>clirr-maven-plugin</artifactId>
@@ -280,7 +279,6 @@
           <comparisonVersion>${api.comparison.version}</comparisonVersion>
         </configuration>
       </plugin>
-
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <inherited>false</inherited>
@@ -317,6 +315,14 @@
           </reportSet>
         </reportSets>
       </plugin>
+      <plugin>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>${hc.jxr.version}</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>${hc.surefire.version}</version>
+      </plugin>
     </plugins>
   </reporting>