[maven-rar-plugin] branch MRAR-73 updated (0c9413e -> 18fbb07)

[kh...@apache.org]

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

khmarbaise pushed a change to branch MRAR-73
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git.


 discard 0c9413e  [MRAR-73] - Fix JavaDoc issues which fail the site generation
     new 18fbb07  [MRAR-73] - Fix JavaDoc issues which fail the site generation

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (0c9413e)
            \
             N -- N -- N   refs/heads/MRAR-73 (18fbb07)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/main/java/org/apache/maven/plugins/rar/RarMojo.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.

[maven-rar-plugin] 01/01: [MRAR-73] - Fix JavaDoc issues which fail the site generation

[kh...@apache.org]

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

khmarbaise pushed a commit to branch MRAR-73
in repository https://gitbox.apache.org/repos/asf/maven-rar-plugin.git

commit 18fbb07e526c5961a6e51358ef1084568fe9f7dd
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Mar 30 15:19:51 2018 +0200

    [MRAR-73] - Fix JavaDoc issues which fail the site generation
---
 .../java/org/apache/maven/plugins/rar/RarMojo.java  | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/rar/RarMojo.java b/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
index 09bdfa2..05c64d6 100644
--- a/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
@@ -60,7 +60,7 @@ import java.util.Set;
 public class RarMojo
     extends AbstractMojo
 {
-    public static final String RA_XML_URI = "META-INF/ra.xml";
+    private static final String RA_XML_URI = "META-INF/ra.xml";
 
     /**
      * Single directory for extra files to include in the RAR.
@@ -199,8 +199,8 @@ public class RarMojo
      * </p>
      * <pre>
      * &lt;delimiters&gt;
-     *   &lt;delimiter&gt;${*}&lt/delimiter&gt;
-     *   &lt;delimiter&gt;@&lt/delimiter&gt;
+     *   &lt;delimiter&gt;${*}&lt;/delimiter&gt;
+     *   &lt;delimiter&gt;@&lt;/delimiter&gt;
      * &lt;/delimiters&gt;
      * </pre>
      * <p>
@@ -213,16 +213,19 @@ public class RarMojo
     protected LinkedHashSet<String> delimiters;
 
     /**
+     * <p>
      * The list of extra filter properties files to be used along with System properties,
      * project properties, and filter properties files specified in the POM build/filters section,
      * which should be used for the filtering during the current mojo execution.
-     * <br/>
+     * </p>
+     * <p>
      * Normally, these will be configured from a plugin's execution section, to provide a different
      * set of filters for a particular execution. For instance, starting in Maven 2.2.0, you have the
      * option of configuring executions with the id's <code>default-resources</code> and
      * <code>default-testResources</code> to supply different configurations for the two
      * different types of resources. By supplying <code>extraFilters</code> configurations, you
      * can separate which filters are used for which type of resource.
+     * </p>
      *
      * @since 2.3
      */
@@ -291,6 +294,7 @@ public class RarMojo
     private File buildDir;
 
 
+    /** {@inheritDoc} */
     public void execute()
         throws MojoExecutionException
     {
@@ -434,6 +438,9 @@ public class RarMojo
         }
     }
 
+    /**
+     * @return The buildDir.
+     */
     protected File getBuildDir()
     {
         if ( buildDir == null )
@@ -443,6 +450,12 @@ public class RarMojo
         return buildDir;
     }
 
+    /**
+     * @param basedir The basedir.
+     * @param finalName The finalName.
+     * @param classifier The classifier.
+     * @return the resulting file which contains classifier.
+     */
     protected static File getRarFile( File basedir, String finalName, String classifier )
     {
         if ( classifier == null )

-- 
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.