[maven-doxia] branch master updated: Cleanups

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git


The following commit(s) were added to refs/heads/master by this push:
     new 2000fe1e Cleanups
2000fe1e is described below

commit 2000fe1e7543d4ab1ebd047e44149e6ca8f04acd
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jul 22 19:34:22 2022 +0200

    Cleanups
---
 .../org/apache/maven/doxia/macro/AbstractMacro.java  | 20 --------------------
 .../org/apache/maven/doxia/macro/MacroRequest.java   |  6 +++---
 .../parser/module/ParserModuleNotFoundException.java |  2 ++
 .../src/test/resources/download.apt.vm               |  2 +-
 pom.xml                                              |  1 -
 5 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java b/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
index fc591620..22d7a5e1 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
@@ -21,10 +21,8 @@ package org.apache.maven.doxia.macro;
 
 import java.util.Map;
 
-import org.apache.commons.lang3.Validate;
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
-import org.codehaus.plexus.util.StringUtils;
 
 /**
  * Abstract base class to execute <code>Macro</code>.
@@ -35,24 +33,6 @@ import org.codehaus.plexus.util.StringUtils;
 public abstract class AbstractMacro
     implements Macro
 {
-    /**
-     * Check if the given parameter is required. Throws an
-     * IllegalArgumentException if paramValue is null or empty.
-     *
-     * @param paramName The name of the parameter to check.
-     * @param paramValue The parameter value.
-     * @since 1.1
-     * @deprecated Not used, use {@link Validate}
-     */
-    @Deprecated
-    protected void required( String paramName, String paramValue )
-    {
-        if ( StringUtils.isEmpty( paramValue ) )
-        {
-            throw new IllegalArgumentException( paramName + " is a required parameter!" );
-        }
-    }
-
     /**
      * Convert the Map of macro parameters to an AttributeSet.
      * No check of validity is done, all parameters are added.
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java b/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java
index 4544f694..53255ad0 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java
@@ -49,12 +49,12 @@ public class MacroRequest
      * @param sourceContent a {@link java.lang.String} object.
      * @param parser a {@link org.apache.maven.doxia.parser.AbstractParser} object.
      * @param param a {@link java.util.Map} object.
-     * @param base a {@link java.io.File} object.
+     * @param basedir a {@link java.io.File} object.
      */
-    public MacroRequest( String sourceContent, AbstractParser parser, Map<String, Object> param, File base )
+    public MacroRequest( String sourceContent, AbstractParser parser, Map<String, Object> param, File basedir )
     {
         this.parameters = param;
-        this.basedir = base;
+        this.basedir = basedir;
         param.put( PARAM_SOURCE_CONTENT, sourceContent );
         parser.setSecondParsing( true );
         param.put( PARAM_PARSER, parser );
diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModuleNotFoundException.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModuleNotFoundException.java
index 758b97a3..ec541197 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModuleNotFoundException.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModuleNotFoundException.java
@@ -28,6 +28,8 @@ package org.apache.maven.doxia.parser.module;
 public class ParserModuleNotFoundException
     extends Exception
 {
+    private static final long serialVersionUID = 8717077929507984309L;
+
     /**
      * Construct a new ParserModuleNotFoundException with the
      * specified detail message.
diff --git a/doxia-modules/doxia-module-xhtml5/src/test/resources/download.apt.vm b/doxia-modules/doxia-module-xhtml5/src/test/resources/download.apt.vm
index 6e09992b..56b62991 100644
--- a/doxia-modules/doxia-module-xhtml5/src/test/resources/download.apt.vm
+++ b/doxia-modules/doxia-module-xhtml5/src/test/resources/download.apt.vm
@@ -63,7 +63,7 @@ Download Maven ${currentVersion}
 
   [[4]] Run <<<mvn --version>>> to verify that it is correctly installed.
 
-** Unix-based Operating Systems (Linux, Solaris and Mac OS X)
+** Unix-like Operating Systems (Linux, Solaris and Mac OS X)
 
   [[1]] Extract the distribution archive to the directory you wish to install Maven ${currentVersion}. These instructions
         assume you chose <<</usr/local/maven-${currentVersion}>>>. The directory <<<maven-${currentVersion}>>> will be created from
diff --git a/pom.xml b/pom.xml
index 14fac022..8e341da1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,7 +283,6 @@ under the License.
       <plugin>
         <groupId>org.eclipse.sisu</groupId>
         <artifactId>sisu-maven-plugin</artifactId>
-        <version>${sisuVersion}</version>
         <executions>
           <execution>
             <goals>