You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by eo...@apache.org on 2018/12/28 15:07:12 UTC

[maven-assembly-plugin] branch master updated (48252db -> f0eb9e9)

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

eolivelli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.


    from 48252db  [MASSEMBLY-892] - Upgrade maven-plugins parent to version 33
     add c7d1b44  [MASSEMBLY-902]  Some Integration tests fails if launched with an very large UID
     new f0eb9e9  MASSEMBLY-901 Fix trivial javadocs HTML errors

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/it/projects/file-modes/file-set-fileMode/pom.xml                  | 1 +
 src/it/projects/file-modes/fileItem-fileMode/pom.xml                  | 1 +
 .../projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml   | 1 +
 .../apache/maven/plugins/assembly/AssemblerConfigurationSource.java   | 2 +-
 .../org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java | 1 -
 .../org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java   | 2 +-
 src/main/mdo/assembly-component.mdo                                   | 4 ++--
 src/main/mdo/assembly.mdo                                             | 4 ++--
 8 files changed, 9 insertions(+), 7 deletions(-)


[maven-assembly-plugin] 01/01: MASSEMBLY-901 Fix trivial javadocs HTML errors

Posted by eo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f0eb9e9f2818a52abd5a0c2cdbdb7a4137999a42
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Fri Dec 28 09:45:10 2018 +0100

    MASSEMBLY-901 Fix trivial javadocs HTML errors
---
 .../apache/maven/plugins/assembly/AssemblerConfigurationSource.java   | 2 +-
 .../org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java | 1 -
 .../org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java   | 2 +-
 src/main/mdo/assembly-component.mdo                                   | 4 ++--
 src/main/mdo/assembly.mdo                                             | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
index 98fc137..ebadd22 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
@@ -158,7 +158,7 @@ public interface AssemblerConfigurationSource
     /**
      * Maven shared filtering utility.
      *
-     * @ return the maven reader filter
+     * @return the maven reader filter
      */
     MavenReaderFilter getMavenReaderFilter();
 
diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
index bde09fd..2989a41 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
@@ -57,7 +57,6 @@ import java.util.Properties;
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  *
- * @threadSafe
  */
 public abstract class AbstractAssemblyMojo
     extends AbstractMojo
diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java
index 9628cdc..2737c38 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java
@@ -33,7 +33,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom;
  * Assemble an application bundle or distribution from an assembly descriptor. This goal is suitable either for binding
  * to the lifecycle or calling directly from the command line (provided all required files are available before the
  * build starts, or are produced by another goal specified before this one on the command line).
- * <br />
+ * <br >
  * Note that the parameters {@code descriptors}, {@code descriptorRefs}, and {@code descriptorSourceDirectory}
  * are disjoint, i.e., they are not combined during descriptor location calculation.
  *
diff --git a/src/main/mdo/assembly-component.mdo b/src/main/mdo/assembly-component.mdo
index e40933d..b892470 100644
--- a/src/main/mdo/assembly-component.mdo
+++ b/src/main/mdo/assembly-component.mdo
@@ -585,7 +585,7 @@
         a project's pom.xml. This allows you to include sources or binaries
         belonging to a project's &lt;modules&gt;.
 
-        <br/><b>NOTE:</b> When using &lt;moduleSets&gt; from the command-line, it
+        <br><b>NOTE:</b> When using &lt;moduleSets&gt; from the command-line, it
         is required to pass first the package phase by doing: "mvn package
         assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1.
         ]]>
@@ -1010,7 +1010,7 @@
         and also contains both sha1 and md5 checksums. This is useful for creating
         archives which will be deployed to internal repositories.
 
-        <br/><b>NOTE:</b> Currently, only artifacts from the central repository
+        <br><b>NOTE:</b> Currently, only artifacts from the central repository
         are allowed.
         ]]>
       </description>
diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo
index 52c9c7e..f1eaa73 100644
--- a/src/main/mdo/assembly.mdo
+++ b/src/main/mdo/assembly.mdo
@@ -702,7 +702,7 @@
         a project's pom.xml. This allows you to include sources or binaries
         belonging to a project's &lt;modules&gt;.
 
-        <br/><b>NOTE:</b> When using &lt;moduleSets&gt; from the command-line, it
+        <br><b>NOTE:</b> When using &lt;moduleSets&gt; from the command-line, it
         is required to pass first the package phase by doing: "mvn package
         assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1.
         ]]>
@@ -1123,7 +1123,7 @@
         and also contains both sha1 and md5 checksums. This is useful for creating
         archives which will be deployed to internal repositories.
 
-        <br/><b>NOTE:</b> Currently, only artifacts from the central repository
+        <br><b>NOTE:</b> Currently, only artifacts from the central repository
         are allowed.
         ]]>
       </description>