From dda1c216a3f771ade0a09d0998fe5dd9d98a93b2 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Fri, 27 May 2022 17:30:09 +0200
Subject: [PATCH] [MENFORCER-418] Upgrade Parent to 36

- use plugins versions and configurations from parent
- use site config from parent
- maven core artifacts in provided scope in plugin
---
 maven-enforcer-extension/pom.xml | 15 +++------------
 maven-enforcer-plugin/pom.xml    | 25 ++++++++++++++++---------
 pom.xml                          | 32 ++------------------------------
 src/site/site.xml                |  9 ---------
 4 files changed, 21 insertions(+), 60 deletions(-)

diff --git a/maven-enforcer-extension/pom.xml b/maven-enforcer-extension/pom.xml
index 9d7d445c..38bd1f1a 100644
--- a/maven-enforcer-extension/pom.xml
+++ b/maven-enforcer-extension/pom.xml
@@ -34,15 +34,6 @@
       <plugin>
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>sisu-maven-plugin</artifactId>
-        <version>0.3.5</version>
-        <executions>
-          <execution>
-            <id>index-project</id>
-            <goals>
-              <goal>main-index</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
@@ -78,7 +69,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
-            <version>3.2.2</version>
             <configuration>
               <showErrors>true</showErrors>
               <projectsDirectory>src/it/projects</projectsDirectory>
@@ -97,7 +87,8 @@
                 <id>integration-test</id>
                 <goals>
                   <goal>install</goal>
-                  <goal>run</goal>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
                 </goals>
               </execution>
             </executions>
@@ -128,4 +119,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-enforcer-plugin/pom.xml b/maven-enforcer-plugin/pom.xml
index 0163b6ab..c57c9751 100644
--- a/maven-enforcer-plugin/pom.xml
+++ b/maven-enforcer-plugin/pom.xml
@@ -42,11 +42,24 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.maven.enforcer</groupId>
       <artifactId>enforcer-api</artifactId>
@@ -55,16 +68,12 @@
       <groupId>org.apache.maven.enforcer</groupId>
       <artifactId>enforcer-rules</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.apache.maven.enforcer</groupId>
       <artifactId>enforcer-rules</artifactId>
       <type>test-jar</type>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
@@ -107,7 +116,6 @@
             <id>descriptor-help</id>
             <goals>
               <goal>helpmojo</goal>
-              <goal>descriptor</goal>
             </goals>
           </execution>
         </executions>
@@ -160,8 +168,6 @@
                 <goal>validate</goal>
               </goals>
               <properties>
-                <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
-                <https.protocols>${https.protocols}</https.protocols>
                 <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
                 <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
               </properties>
@@ -171,7 +177,8 @@
                 <id>integration-test</id>
                 <goals>
                   <goal>install</goal>
-                  <goal>run</goal>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
                 </goals>
               </execution>
             </executions>
diff --git a/pom.xml b/pom.xml
index 61a6feb6..d186c4d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>maven-parent</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>34</version>
+    <version>36</version>
     <relativePath />
   </parent>
   <groupId>org.apache.maven.enforcer</groupId>
@@ -55,7 +55,7 @@
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
-    <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-enforcer/</url>
+    <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-enforcer/</url>
   </ciManagement>
   <distributionManagement>
     <site>
@@ -195,15 +195,6 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.4.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.3.0</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
@@ -218,11 +209,6 @@
             <topSiteURL>scm:svn:https://svn.apache.org/repos/asf/maven/website/components/${maven.site.path}</topSiteURL>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jxr-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -230,20 +216,6 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>extra-enforcer-rules</artifactId>
-            <version>1.5.1</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
   </build>
 
   <reporting>
diff --git a/src/site/site.xml b/src/site/site.xml
index 273dd8e5..414313ac 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -18,15 +18,6 @@ specific language governing permissions and limitations
 under the License.
 -->
 <project>
-  <custom>
-    <fluidoSkin>
-      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-      <googlePlusOne />
-      <googleSearch>
-        <sitesearch>https://maven.apache.org/enforcer/</sitesearch>
-      </googleSearch>
-    </fluidoSkin>
-  </custom>
 
   <body>
     <breadcrumbs>