[MSITE-927] Upgrade Parent to 39

apache · Feb 11, 2023 · 476c44f · 476c44f
1 parent 9293e57
commit 476c44f
Show file tree

Hide file tree

Showing 31 changed files with 1,419 additions and 2,023 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -18,14 +17,13 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>36</version>
+    <version>39</version>
     <relativePath />
   </parent>
 
@@ -176,8 +174,8 @@ under the License.
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-site-plugin.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-site-plugin.git</developerConnection>
-    <url>https://github.com/apache/maven-site-plugin/tree/${project.scm.tag}</url>
     <tag>HEAD</tag>
+    <url>https://github.com/apache/maven-site-plugin/tree/${project.scm.tag}</url>
   </scm>
   <issueManagement>
     <system>JIRA</system>
@@ -526,14 +524,6 @@ under the License.
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>mrm-maven-plugin</artifactId>
             <version>1.4.1</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>start</goal>
-                  <goal>stop</goal>
-                </goals>
-              </execution>
-            </executions>
             <configuration>
               <repositories>
                 <mockRepo>
@@ -542,6 +532,14 @@ under the License.
                 <proxyRepo />
               </repositories>
             </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>start</goal>
+                  <goal>stop</goal>
+                </goals>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>

diff --git a/src/it/projects/effective-site/pom.xml b/src/it/projects/effective-site/pom.xml
@@ -27,7 +27,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>31</version>
+    <version>39</version>
   </parent>
 
   <groupId>org.apache.maven.plugins.site.its</groupId>

diff --git a/src/it/projects/site-sd-lang/src/site/site.xml b/src/it/projects/site-sd-lang/src/site/site.xml
@@ -25,19 +25,19 @@ under the License.
     <artifactId>maven-fluido-skin</artifactId>
     <version>${fluidoSkinVersion}</version>
   </skin>
-	<version position="left" />
-	
-	<body>
-		<menu name="${project.name}">
-			<item name="Accueil" href="index.html" />
-			<item name="Contacts" href="contact.html" />
-			<item name="Retour" href="../index.html" />
-		</menu>
-		<menu name="Doc">
-			<item name="specs" href="doc.html" />
-			<item name="guide" href="gettingstarted.html" />
-		</menu>
-        <menu ref="modules"/> 
-	<menu ref="reports"/>
-	</body>
+  <version position="left" />
+
+  <body>
+    <menu name="${project.name}">
+      <item name="Accueil" href="index.html" />
+      <item name="Contacts" href="contact.html" />
+      <item name="Retour" href="../index.html" />
+    </menu>
+    <menu name="Doc">
+      <item name="specs" href="doc.html" />
+      <item name="guide" href="gettingstarted.html" />
+    </menu>
+    <menu ref="modules"/>
+    <menu ref="reports"/>
+  </body>
 </project>
diff --git a/src/it/projects/site-sd-lang/src/site/site_fr.xml b/src/it/projects/site-sd-lang/src/site/site_fr.xml
@@ -26,19 +26,19 @@ under the License.
     <version>${fluidoSkinVersion}</version>
   </skin>
 
-	<version position="left" />
-	
-	<body>
-		<menu name="${project.name}">
-			<item name="Accueil" href="index.html" />
-			<item name="Contacts" href="contact.html" />
-			<item name="Retour" href="../index.html" />
-		</menu>
-		<menu name="Doc">
-			<item name="specs" href="doc.html" />
-			<item name="guide" href="gettingstarted.html" />
-		</menu>
-        <menu ref="modules"/> 
-	<menu ref="reports"/>
-	</body>
+  <version position="left" />
+
+  <body>
+    <menu name="${project.name}">
+      <item name="Accueil" href="index.html" />
+      <item name="Contacts" href="contact.html" />
+      <item name="Retour" href="../index.html" />
+    </menu>
+    <menu name="Doc">
+      <item name="specs" href="doc.html" />
+      <item name="guide" href="gettingstarted.html" />
+    </menu>
+    <menu ref="modules"/>
+    <menu ref="reports"/>
+  </body>
 </project>
diff --git a/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java b/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.plugins.site;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.plugins.site;
+
+import java.util.List;
+import java.util.Locale;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.doxia.tools.SiteTool;
@@ -28,32 +30,27 @@
 import org.apache.maven.rtinfo.RuntimeInformation;
 import org.codehaus.plexus.i18n.I18N;
 
-import java.util.List;
-import java.util.Locale;
-
 /**
  * Base class for site mojos.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public abstract class AbstractSiteMojo
-    extends AbstractMojo
-{
+public abstract class AbstractSiteMojo extends AbstractMojo {
     /**
      * A comma separated list of locales to render. The first valid token will be the default Locale
      * for this site.
      *
      * @since 2.3
      */
-    @Parameter( property = "locales", defaultValue = "default" )
+    @Parameter(property = "locales", defaultValue = "default")
     private String locales;
 
     /**
      * Set this to 'true' to skip site generation and staging.
      *
      * @since 3.0
      */
-    @Parameter( property = "maven.site.skip", defaultValue = "false" )
+    @Parameter(property = "maven.site.skip", defaultValue = "false")
     protected boolean skip;
 
     /**
@@ -71,32 +68,30 @@ public abstract class AbstractSiteMojo
     /**
      * The Maven project.
      */
-    @Parameter( defaultValue = "${project}", readonly = true )
+    @Parameter(defaultValue = "${project}", readonly = true)
     protected MavenProject project;
 
     /**
      * The local repository.
      */
-    @Parameter( defaultValue = "${localRepository}", readonly = true )
+    @Parameter(defaultValue = "${localRepository}", readonly = true)
     protected ArtifactRepository localRepository;
 
     /**
      * The reactor projects.
      */
-    @Parameter( defaultValue = "${reactorProjects}", required = true, readonly = true )
+    @Parameter(defaultValue = "${reactorProjects}", required = true, readonly = true)
     protected List<MavenProject> reactorProjects;
 
     @Component
     protected RuntimeInformation runtimeInformation;
 
     @Deprecated
-    protected String getMavenVersion()
-    {
+    protected String getMavenVersion() {
         return runtimeInformation.getMavenVersion();
     }
 
-    protected List<Locale> getLocales()
-    {
-        return siteTool.getSiteLocales( locales );
+    protected List<Locale> getLocales() {
+        return siteTool.getSiteLocales(locales);
     }
 }