maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject svn commit: r1781812 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java
Date Sun, 05 Feb 2017 21:33:54 GMT
Author: michaelo
Date: Sun Feb  5 21:33:53 2017
New Revision: 1781812

URL: http://svn.apache.org/viewvc?rev=1781812&view=rev
Log:
[MASSEMBLY-643] descriptorSourceDirectory: parameter isn't used

Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java?rev=1781812&r1=1781811&r2=1781812&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java
Sun Feb  5 21:33:53 2017
@@ -33,6 +33,9 @@ import org.codehaus.plexus.util.xml.Xpp3
  * 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 />
+ * Note that the parameters {@code descriptors}, {@code descriptorRefs}, and {@code descriptorSourceDirectory}
+ * are disjoint, i.e., they are not combined during descriptor location calculation.
  *
  * @author <a href="mailto:jdcasey@apache.org">John Casey</a>
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -54,17 +57,17 @@ public class SingleAssemblyMojo
         verifyRemovedParameter( "descriptor" );
         verifyRemovedParameter( "descriptorId" );
         verifyRemovedParameter( "includeSite" );
-        
+
         super.execute();
     }
-    
+
     private void verifyRemovedParameter( String paramName )
     {
         Object pluginConfiguration = plugin.getPlugin().getConfiguration();
         if ( pluginConfiguration instanceof Xpp3Dom )
         {
             Xpp3Dom configDom = (Xpp3Dom) pluginConfiguration;
-            
+
             if ( configDom.getChild( paramName ) != null )
             {
                 throw new IllegalArgumentException( "parameter '" + paramName
@@ -72,7 +75,7 @@ public class SingleAssemblyMojo
             }
         }
     }
-    
+
     /**
      */
     @Parameter( defaultValue = "${project}", readonly = true, required = true )



Mime
View raw message