[MINVOKER-301] Upgrade Parent to 36

apache · May 15, 2022 · e13fec8 · e13fec8
1 parent ac218a2
commit e13fec8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 45 deletions.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>34</version>
+    <version>36</version>
     <relativePath />
   </parent>
 
@@ -99,7 +99,7 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>${mavenVersion}</version>
-      <scope>compile</scope> <!-- set to provided once MPLUGIN-372 fixed -->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -279,18 +279,6 @@ under the License.
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
           </configuration>
         </plugin>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.10.0</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.1.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.2.2</version>
-        </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
@@ -303,21 +291,6 @@ under the License.
     </pluginManagement>
 
     <plugins>
-      <plugin> <!-- Remove once MPOM-270 fixed -->
-        <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>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
@@ -346,7 +319,6 @@ under the License.
             <model>src/main/mdo/invocation.mdo</model>
           </models>
           <version>1.0.0</version>
-          <useJava5>true</useJava5>
         </configuration>
       </plugin>
     </plugins>

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -22,21 +22,6 @@ under the License.
 <project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
 
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-fluido-skin</artifactId>
-    <version>1.9</version>
-  </skin>
-
-  <custom>
-    <fluidoSkin>
-      <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
-      <googleSearch>
-        <sitesearch>maven.apache.org/plugins/maven-invoker-plugin/</sitesearch>
-      </googleSearch>
-    </fluidoSkin>
-  </custom>
-
   <body>
     <menu name="Overview">
       <item name="Introduction" href="index.html"/>
@@ -47,6 +32,7 @@ under the License.
       <item name="License" href="https://www.apache.org/licenses/"/>
       <item name="Download" href="download.html"/>
     </menu>
+
     <menu name="reference">
       <item name="build-job.xml" href="build-job.html"/>
     </menu>