Author: krosenvold Date: Wed Oct 22 21:08:06 2014 New Revision: 1633720 URL: http://svn.apache.org/r1633720 Log: Updated plexus-component-metadata to 1.5.6
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1633720&r1=1633719&r2=1633720&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Wed Oct 22 21:08:06 2014 @@ -249,6 +249,7 @@ under the License. <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> + <version>1.5.6</version> <executions> <execution> <id>descriptors</id> Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java?rev=1633720&r1=1633719&r2=1633720&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java Wed Oct 22 21:08:06 2014 @@ -31,6 +31,8 @@ import org.codehaus.plexus.archiver.Arch import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.logging.AbstractLogEnabled; +import javax.annotation.Nonnull; + /** * Handles the <fileSets/> top-level section of the assembly descriptor. * @@ -45,7 +47,7 @@ public class FileSetAssemblyPhase /** * {@inheritDoc} */ - public void execute( final ResolvedAssembly assembly, final Archiver archiver, + public void execute( @Nonnull final ResolvedAssembly assembly, final Archiver archiver, final AssemblerConfigurationSource configSource ) throws ArchiveCreationException, AssemblyFormattingException {