[MPIR-432] upgrade to parent POM 39 (#46)

* MPIR-432 upgrade to parent POM 39
apache · Apr 8, 2023 · bb4debd · bb4debd
1 parent 5757c0d
commit bb4debd
Show file tree

Hide file tree

Showing 69 changed files with 3,544 additions and 4,767 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
+<?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>
-    <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>36</version>
+    <artifactId>maven-plugins</artifactId>
+    <version>39</version>
     <relativePath />
   </parent>
 
@@ -34,10 +32,8 @@ under the License.
   <packaging>maven-plugin</packaging>
 
   <name>Apache Maven Project Info Reports Plugin</name>
-  <description>
-    The Maven Project Info Reports Plugin generates standard reports
-    for the specified project.
-  </description>
+  <description>The Maven Project Info Reports Plugin generates standard reports
+    for the specified project.</description>
   <inceptionYear>2005</inceptionYear>
 
   <contributors>
@@ -99,8 +95,8 @@ under the License.
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git</developerConnection>
-    <url>https://github.com/apache/maven-project-info-reports-plugin/tree/${project.scm.tag}</url>
     <tag>HEAD</tag>
+    <url>https://github.com/apache/maven-project-info-reports-plugin/tree/${project.scm.tag}</url>
   </scm>
   <issueManagement>
     <system>JIRA</system>
@@ -118,7 +114,6 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <javaVersion>8</javaVersion>
     <doxiaVersion>1.11.1</doxiaVersion>
     <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
     <mavenVersion>3.2.5</mavenVersion>
@@ -200,7 +195,8 @@ under the License.
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-shared-jar</artifactId>
       <version>1.2</version>
-      <exclusions><!-- Replace problematic BCEL version until MSHARED JAR has been updated -->
+      <exclusions>
+        <!-- Replace problematic BCEL version until MSHARED JAR has been updated -->
         <exclusion>
           <groupId>com.google.code.findbugs</groupId>
           <artifactId>bcel-findbugs</artifactId>
@@ -524,7 +520,8 @@ under the License.
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
-            <exclude>**/DependenciesReportTest*</exclude><!-- FIXME: missing Maven 3 class or conflict -->
+            <exclude>**/DependenciesReportTest*</exclude>
+            <!-- FIXME: missing Maven 3 class or conflict -->
           </excludes>
         </configuration>
       </plugin>
@@ -535,11 +532,11 @@ under the License.
         <executions>
           <execution>
             <id>init</id>
-            <phase>initialize</phase>
             <goals>
               <goal>clean</goal>
               <goal>generateKeyPair</goal>
             </goals>
+            <phase>initialize</phase>
           </execution>
         </executions>
       </plugin>

diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
@@ -1,5 +1,3 @@
-package org.apache.maven.report.projectinfo;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.report.projectinfo;
 
 import java.util.Locale;
 import java.util.regex.Pattern;
@@ -31,9 +30,7 @@
  * @author Hervé Boutemy
  *
  */
-public abstract class AbstractProjectInfoRenderer
-    extends AbstractMavenReportRenderer
-{
+public abstract class AbstractProjectInfoRenderer extends AbstractMavenReportRenderer {
     /**
      * {@link I18N}.
      */
@@ -49,58 +46,48 @@ public abstract class AbstractProjectInfoRenderer
      * @param i18n {@link I18N}
      * @param locale {@link Locale}
      */
-    public AbstractProjectInfoRenderer( Sink sink, I18N i18n, Locale locale )
-    {
-        super( sink );
+    public AbstractProjectInfoRenderer(Sink sink, I18N i18n, Locale locale) {
+        super(sink);
 
         this.i18n = i18n;
 
         this.locale = locale;
     }
 
     @Override
-    public String getTitle()
-    {
-        return getI18nString( "title" );
+    public String getTitle() {
+        return getI18nString("title");
     }
 
     /**
      * @param key The key.
      * @return The translated string.
      */
-    protected String getI18nString( String key )
-    {
-        return getI18nString( getI18Nsection(), key );
+    protected String getI18nString(String key) {
+        return getI18nString(getI18Nsection(), key);
     }
 
     /**
      * @param section The section.
      * @param key The key to translate.
      * @return the translated key.
      */
-    protected String getI18nString( String section, String key )
-    {
-        return i18n.getString( "project-info-reports", locale, "report." + section + '.' + key );
+    protected String getI18nString(String section, String key) {
+        return i18n.getString("project-info-reports", locale, "report." + section + '.' + key);
     }
 
     @Override
-    protected void text( String text )
-    {
-        if ( StringUtils.isEmpty( text ) ) // Take care of spaces
-        {
-            sink.text( "-" );
-        }
-        else
+    protected void text(String text) {
+        if (StringUtils.isEmpty(text)) // Take care of spaces
         {
+            sink.text("-");
+        } else {
             // custombundle text with xml?
             String regex = "(.+?)<(\"[^\"]*\"|'[^']*'|[^'\">])*>(.+?)";
-            if ( Pattern.matches( regex, text ) )
-            {
-                sink.rawText( text );
-            }
-            else
-            {
-                sink.text( text );
+            if (Pattern.matches(regex, text)) {
+                sink.rawText(text);
+            } else {
+                sink.text(text);
             }
         }
     }
@@ -112,11 +99,10 @@ protected void text( String text )
      * {@inheritDoc}
      */
     @Override
-    protected void verbatimText( String text )
-    {
-        sink.verbatim( null );
+    protected void verbatimText(String text) {
+        sink.verbatim(null);
 
-        text( text );
+        text(text);
 
         sink.verbatim_();
     }
@@ -125,17 +111,13 @@ protected void verbatimText( String text )
      * {@inheritDoc}
      */
     @Override
-    protected void verbatimLink( String text, String href )
-    {
-        if ( StringUtils.isEmpty( href ) )
-        {
-            verbatimText( text );
-        }
-        else
-        {
-            sink.verbatim( null );
+    protected void verbatimLink(String text, String href) {
+        if (StringUtils.isEmpty(href)) {
+            verbatimText(text);
+        } else {
+            sink.verbatim(null);
 
-            link( href, text );
+            link(href, text);
 
             sink.verbatim_();
         }