maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1691831 - in /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly: archive/ archive/archiver/ archive/phase/ archive/phase/wrappers/ artifact/ filter/ format/ functions/ interpolation/ io/ mojos/
Date Sun, 19 Jul 2015 15:06:13 GMT
Author: rfscholte
Date: Sun Jul 19 15:06:13 2015
New Revision: 1691831

URL: http://svn.apache.org/r1691831
Log:
Add @Override

Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluator.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java Sun Jul 19 15:06:13 2015
@@ -131,6 +131,7 @@ public class DefaultAssemblyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public File createArchive( final Assembly assembly, final String fullName, final String format,
                                final AssemblerConfigurationSource configSource, boolean recompressZippedFiles )
         throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
@@ -526,6 +527,7 @@ public class DefaultAssemblyArchiver
         return tarArchiver;
     }
 
+    @Override
     public void contextualize( final Context context )
         throws ContextException
     {

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java Sun Jul 19 15:06:13 2015
@@ -122,6 +122,7 @@ public class ManifestCreationFinalizer
         }
     }
 
+    @Override
     public List<String> getVirtualFiles()
     {
         if ( archiveConfiguration != null )

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java Sun Jul 19 15:06:13 2015
@@ -140,6 +140,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addArchivedFileSet( @Nonnull final File archiveFile, final String prefix, final String[] includes,
                                     final String[] excludes )
     {
@@ -174,6 +175,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addArchivedFileSet( @Nonnull final File archiveFile, final String prefix )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -197,6 +199,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addArchivedFileSet( final File archiveFile, final String[] includes, final String[] excludes )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -222,6 +225,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addArchivedFileSet( @Nonnull final File archiveFile )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -245,6 +249,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addDirectory( @Nonnull final File directory, final String prefix, final String[] includes,
                               final String[] excludes )
     {
@@ -272,6 +277,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addSymlink( String symlinkName, String symlinkDestination )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -289,6 +295,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addSymlink( String symlinkName, int permissions, String symlinkDestination )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -306,6 +313,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addDirectory( @Nonnull final File directory, final String prefix )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -330,6 +338,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addDirectory( @Nonnull final File directory, final String[] includes, final String[] excludes )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -356,6 +365,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addDirectory( @Nonnull final File directory )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -380,6 +390,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addFile( @Nonnull final File inputFile, @Nonnull final String destFileName, final int permissions )
     {
         if ( acceptFile( inputFile ) )
@@ -401,6 +412,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addFile( @Nonnull final File inputFile, @Nonnull final String destFileName )
     {
         if ( acceptFile( inputFile ) )
@@ -422,6 +434,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void createArchive()
         throws IOException
     {
@@ -440,6 +453,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getDefaultDirectoryMode()
     {
         inPublicApi.set( Boolean.TRUE );
@@ -456,6 +470,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDefaultDirectoryMode( final int mode )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -472,6 +487,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getDefaultFileMode()
     {
         inPublicApi.set( Boolean.TRUE );
@@ -488,6 +504,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDefaultFileMode( final int mode )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -504,6 +521,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public File getDestFile()
     {
         inPublicApi.set( Boolean.TRUE );
@@ -520,6 +538,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDestFile( final File destFile )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -533,6 +552,7 @@ public class AssemblyProxyArchiver
         }
     }
 
+    @Override
     @SuppressWarnings( { "rawtypes", "deprecation" } )
     /** {@inheritDoc} */ public Map<String, ArchiveEntry> getFiles()
     {
@@ -550,6 +570,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean getIncludeEmptyDirs()
     {
         inPublicApi.set( Boolean.TRUE );
@@ -566,6 +587,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setIncludeEmptyDirs( final boolean includeEmptyDirs )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -582,6 +604,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isForced()
     {
         inPublicApi.set( Boolean.TRUE );
@@ -598,6 +621,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setForced( final boolean forced )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -615,6 +639,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isSupportingForced()
     {
         inPublicApi.set( Boolean.TRUE );
@@ -631,6 +656,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDotFileDirectory( final File dotFileDirectory )
     {
         throw new UnsupportedOperationException(
@@ -640,6 +666,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addArchivedFileSet( final ArchivedFileSet fileSet )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -657,6 +684,7 @@ public class AssemblyProxyArchiver
         }
     }
 
+    @Override
     public void addArchivedFileSet( ArchivedFileSet archivedFileSet, Charset charset )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -678,6 +706,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addFileSet( @Nonnull final FileSet fileSet )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -782,6 +811,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions )
     {
         File file = new File( resource.getName() ); // zOMG.
@@ -803,6 +833,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void addResources( final PlexusIoResourceCollection resources )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -819,6 +850,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     @Nonnull
     public ResourceIterator getResources()
     {
@@ -828,6 +860,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getDuplicateBehavior()
     {
         return delegate.getDuplicateBehavior();
@@ -836,6 +869,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDuplicateBehavior( final String duplicate )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -852,6 +886,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getDirectoryMode()
     {
         return delegate.getDirectoryMode();
@@ -860,6 +895,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setDirectoryMode( final int mode )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -876,6 +912,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getFileMode()
     {
         return delegate.getFileMode();
@@ -884,6 +921,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setFileMode( final int mode )
     {
         inPublicApi.set( Boolean.TRUE );
@@ -900,6 +938,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getOverrideDirectoryMode()
     {
         return delegate.getOverrideDirectoryMode();
@@ -908,6 +947,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public int getOverrideFileMode()
     {
         return delegate.getOverrideFileMode();
@@ -916,6 +956,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isUseJvmChmod()
     {
         return useJvmChmod;
@@ -924,6 +965,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setUseJvmChmod( final boolean useJvmChmod )
     {
         this.useJvmChmod = useJvmChmod;
@@ -932,6 +974,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isIgnorePermissions()
     {
         return delegate.isIgnorePermissions();
@@ -940,6 +983,7 @@ public class AssemblyProxyArchiver
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setIgnorePermissions( final boolean ignorePermissions )
     {
         delegate.setIgnorePermissions( ignorePermissions );
@@ -956,27 +1000,32 @@ public class AssemblyProxyArchiver
             this.inputFile = inputFile;
         }
 
+        @Override
         public InputStream getContents()
             throws IOException
         {
             return new FileInputStream( inputFile );
         }
 
+        @Override
         public String getName()
         {
             return inputFile.getName();
         }
 
+        @Override
         public boolean isDirectory()
         {
             return inputFile.isDirectory();
         }
 
+        @Override
         public boolean isFile()
         {
             return inputFile.isFile();
         }
 
+        @Override
         public boolean isSymbolicLink()
         {
             return false;

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java Sun Jul 19 15:06:13 2015
@@ -61,6 +61,7 @@ class PrefixedArchivedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public File getArchive()
     {
         return fileSet.getArchive();
@@ -69,6 +70,7 @@ class PrefixedArchivedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public String[] getExcludes()
     {
         return fileSet.getExcludes();
@@ -77,6 +79,7 @@ class PrefixedArchivedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public FileSelector[] getFileSelectors()
     {
         return PrefixedFileSet.combineSelectors( fileSet.getFileSelectors(), selectors );
@@ -85,6 +88,7 @@ class PrefixedArchivedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public String[] getIncludes()
     {
         return fileSet.getIncludes();
@@ -93,6 +97,7 @@ class PrefixedArchivedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getPrefix()
     {
         String prefix = fileSet.getPrefix();
@@ -114,6 +119,7 @@ class PrefixedArchivedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isCaseSensitive()
     {
         return fileSet.isCaseSensitive();
@@ -122,6 +128,7 @@ class PrefixedArchivedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isIncludingEmptyDirectories()
     {
         return fileSet.isIncludingEmptyDirectories();
@@ -130,11 +137,13 @@ class PrefixedArchivedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isUsingDefaultExcludes()
     {
         return fileSet.isUsingDefaultExcludes();
     }
 
+    @Override
     public InputStreamTransformer getStreamTransformer()
     {
         return fileSet.getStreamTransformer();

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java Sun Jul 19 15:06:13 2015
@@ -83,6 +83,7 @@ class PrefixedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public String[] getExcludes()
     {
         return fileSet.getExcludes();
@@ -91,6 +92,7 @@ class PrefixedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public FileSelector[] getFileSelectors()
     {
         FileSelector[] sel = fileSet.getFileSelectors();
@@ -101,6 +103,7 @@ class PrefixedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public String[] getIncludes()
     {
         return fileSet.getIncludes();
@@ -109,6 +112,7 @@ class PrefixedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getPrefix()
     {
         String prefix = fileSet.getPrefix();
@@ -135,6 +139,7 @@ class PrefixedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isCaseSensitive()
     {
         return fileSet.isCaseSensitive();
@@ -143,6 +148,7 @@ class PrefixedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isIncludingEmptyDirectories()
     {
         return fileSet.isIncludingEmptyDirectories();
@@ -151,6 +157,7 @@ class PrefixedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isUsingDefaultExcludes()
     {
         return fileSet.isUsingDefaultExcludes();
@@ -159,11 +166,13 @@ class PrefixedFileSet
     /**
      * {@inheritDoc}
      */
+    @Override
     public File getDirectory()
     {
         return fileSet.getDirectory();
     }
 
+    @Override
     public InputStreamTransformer getStreamTransformer()
     {
         return fileSet.getStreamTransformer();

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java Sun Jul 19 15:06:13 2015
@@ -27,6 +27,7 @@ import java.util.Comparator;
 public class AssemblyArchiverPhaseComparator
     implements Comparator<AssemblyArchiverPhase>
 {
+    @Override
     public int compare( AssemblyArchiverPhase o1, AssemblyArchiverPhase o2 )
     {
         boolean o1hasOrder = o1 instanceof PhaseOrder;

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java Sun Jul 19 15:06:13 2015
@@ -85,6 +85,7 @@ public class DependencySetAssemblyPhase
     /**
      * {@inheritDoc}
      */
+    @Override
     public void execute( final Assembly assembly, final Archiver archiver,
                          final AssemblerConfigurationSource configSource )
         throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
@@ -104,6 +105,7 @@ public class DependencySetAssemblyPhase
         }
     }
 
+    @Override
     public int order()
     {
         // CHECKSTYLE_OFF: MagicNumber

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java Sun Jul 19 15:06:13 2015
@@ -54,6 +54,7 @@ public class FileItemAssemblyPhase
     /**
      * {@inheritDoc}
      */
+    @Override
     public void execute( final Assembly assembly, final Archiver archiver,
                          final AssemblerConfigurationSource configSource )
         throws ArchiveCreationException, AssemblyFormattingException
@@ -132,6 +133,7 @@ public class FileItemAssemblyPhase
         }
     }
 
+    @Override
     public int order()
     {
         return 10;

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java Sun Jul 19 15:06:13 2015
@@ -46,6 +46,7 @@ public class FileSetAssemblyPhase
     /**
      * {@inheritDoc}
      */
+    @Override
     public void execute( @Nonnull final Assembly assembly, final Archiver archiver,
                          final AssemblerConfigurationSource configSource )
         throws ArchiveCreationException, AssemblyFormattingException
@@ -62,6 +63,7 @@ public class FileSetAssemblyPhase
     }
 
 
+    @Override
     public int order()
     {
         // CHECKSTYLE_OFF: MagicNumber

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java Sun Jul 19 15:06:13 2015
@@ -176,6 +176,7 @@ public class ModuleSetAssemblyPhase
     /**
      * {@inheritDoc}
      */
+    @Override
     public void execute( final Assembly assembly, final Archiver archiver,
                          final AssemblerConfigurationSource configSource )
         throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
@@ -183,6 +184,7 @@ public class ModuleSetAssemblyPhase
     {
         Assemblies.forEachModuleSet( assembly, new ModuleSetConsumer()
         {
+            @Override
             public void accept( ModuleSet resolvedModule )
                 throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException,
                 DependencyResolutionException
@@ -577,6 +579,7 @@ public class ModuleSetAssemblyPhase
         return fs;
     }
 
+    @Override
     public int order()
     {
         // CHECKSTYLE_OFF: MagicNumber

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java Sun Jul 19 15:06:13 2015
@@ -68,6 +68,7 @@ public class RepositoryAssemblyPhase
     /**
      * {@inheritDoc}
      */
+    @Override
     @SuppressWarnings( "ResultOfMethodCallIgnored" )
     public void execute( final Assembly assembly, final Archiver archiver,
                          final AssemblerConfigurationSource configSource )
@@ -133,6 +134,7 @@ public class RepositoryAssemblyPhase
         return new RepoInfoWrapper( repository );
     }
 
+    @Override
     public int order()
     {
         // CHECKSTYLE_OFF: MagicNumber

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java Sun Jul 19 15:06:13 2015
@@ -43,6 +43,7 @@ class GroupVersionAlignmentWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<String> getExcludes()
     {
         return alignment.getExcludes();
@@ -51,6 +52,7 @@ class GroupVersionAlignmentWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getId()
     {
         return alignment.getId();
@@ -59,6 +61,7 @@ class GroupVersionAlignmentWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getVersion()
     {
         return alignment.getVersion();

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java Sun Jul 19 15:06:13 2015
@@ -38,11 +38,13 @@ public class RepoBuilderConfigSourceWrap
         this.configSource = configSource;
     }
 
+    @Override
     public ArtifactRepository getLocalRepository()
     {
         return configSource.getLocalRepository();
     }
 
+    @Override
     public MavenProject getProject()
     {
         return configSource.getProject();

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java Sun Jul 19 15:06:13 2015
@@ -48,6 +48,7 @@ public class RepoInfoWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<String> getExcludes()
     {
         return repo.getExcludes();
@@ -56,6 +57,7 @@ public class RepoInfoWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<GroupVersionAlignmentWrapper> getGroupVersionAlignments()
     {
         final List<GroupVersionAlignment> alignments = repo.getGroupVersionAlignments();
@@ -79,6 +81,7 @@ public class RepoInfoWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public List<String> getIncludes()
     {
         return repo.getIncludes();
@@ -87,6 +90,7 @@ public class RepoInfoWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getScope()
     {
         return repo.getScope();
@@ -95,6 +99,7 @@ public class RepoInfoWrapper
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isIncludeMetadata()
     {
         return repo.isIncludeMetadata();

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java Sun Jul 19 15:06:13 2015
@@ -85,6 +85,7 @@ public class DefaultDependencyResolver
         enableLogging( logger );
     }
 
+    @Override
     public Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly, ModuleSet moduleSet,
                                                                     final AssemblerConfigurationSource configSource,
                                                                     List<DependencySet> dependencySets )
@@ -140,6 +141,7 @@ public class DefaultDependencyResolver
         result.put( dependencySet, artifacts );
     }
 
+    @Override
     public Map<DependencySet, Set<Artifact>> resolveDependencySets( final Assembly assembly,
                                                                     final AssemblerConfigurationSource configSource,
                                                                     List<DependencySet> dependencySets )
@@ -210,7 +212,6 @@ public class DefaultDependencyResolver
         return resolved;
     }
 
-    @SuppressWarnings( "unchecked" )
     private Set<Artifact> resolveTransitively( final Set<Artifact> dependencyArtifacts,
                                                final List<ArtifactRepository> repos,
                                                final ResolutionManagementInfo info,
@@ -312,8 +313,6 @@ public class DefaultDependencyResolver
         }
     }
 
-
-    @SuppressWarnings( "unchecked" )
     void updateDependencySetResolutionRequirements( final DependencySet set,
                                                     final ResolutionManagementInfo requirements, AssemblyId assemblyId,
                                                     final MavenProject... projects )
@@ -377,7 +376,6 @@ public class DefaultDependencyResolver
         }
     }
 
-    @SuppressWarnings( "unchecked" )
     List<ArtifactRepository> aggregateRemoteArtifactRepositories( final List<ArtifactRepository> remoteRepositories,
                                                                   final Set<MavenProject> projects )
     {

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java Sun Jul 19 15:06:13 2015
@@ -57,6 +57,7 @@ abstract class AbstractLineAggregatingHa
         return "UTF-8";
     }
 
+    @Override
     public void finalizeArchiveCreation( final Archiver archiver )
     {
         // this will prompt the isSelected() call, below, for all resources added to the archive.
@@ -109,15 +110,18 @@ abstract class AbstractLineAggregatingHa
         }
     }
 
+    @Override
     public void finalizeArchiveExtraction( final UnArchiver unArchiver )
     {
     }
 
+    @Override
     public List<String> getVirtualFiles()
     {
         return new ArrayList<String>( catalog.keySet() );
     }
 
+    @Override
     public boolean isSelected( @Nonnull final FileInfo fileInfo )
         throws IOException
     {

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java Sun Jul 19 15:06:13 2015
@@ -34,6 +34,7 @@ import org.codehaus.plexus.util.xml.Xpp3
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import javax.annotation.Nonnull;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -139,6 +140,7 @@ public class ComponentsXmlArchiverFileFi
         }
     }
 
+    @Override
     public void finalizeArchiveCreation( final Archiver archiver )
     {
         // this will prompt the isSelected() call, below, for all resources added to the archive.
@@ -161,6 +163,7 @@ public class ComponentsXmlArchiverFileFi
         }
     }
 
+    @Override
     public List<String> getVirtualFiles()
     {
         if ( ( components != null ) && !components.isEmpty() )
@@ -171,6 +174,7 @@ public class ComponentsXmlArchiverFileFi
         return null;
     }
 
+    @Override
     public boolean isSelected( @Nonnull final FileInfo fileInfo )
         throws IOException
     {
@@ -226,6 +230,7 @@ public class ComponentsXmlArchiverFileFi
         }
     }
 
+    @Override
     public void finalizeArchiveExtraction( final UnArchiver unarchiver )
     {
     }

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java Sun Jul 19 15:06:13 2015
@@ -73,6 +73,7 @@ public class SimpleAggregatingDescriptor
 
     private Logger logger;
 
+    @Override
     public void finalizeArchiveCreation( final Archiver archiver )
     {
         checkConfig();
@@ -138,10 +139,12 @@ public class SimpleAggregatingDescriptor
         return f;
     }
 
+    @Override
     public void finalizeArchiveExtraction( final UnArchiver unarchiver )
     {
     }
 
+    @Override
     public List<String> getVirtualFiles()
     {
         checkConfig();
@@ -149,6 +152,7 @@ public class SimpleAggregatingDescriptor
         return Collections.singletonList( outputPath );
     }
 
+    @Override
     public boolean isSelected( @Nonnull final FileInfo fileInfo )
         throws IOException
     {
@@ -218,6 +222,7 @@ public class SimpleAggregatingDescriptor
         return logger;
     }
 
+    @Override
     public void enableLogging( final Logger logger )
     {
         this.logger = logger;

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java Sun Jul 19 15:06:13 2015
@@ -126,6 +126,7 @@ public class ReaderFormatter
         {
             return new InputStreamTransformer()
             {
+                @Override
                 @Nonnull
                 public InputStream transform( @Nonnull PlexusIoResource plexusIoResource,
                                               @Nonnull InputStream inputStream )

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/functions/MavenProjects.java Sun Jul 19 15:06:13 2015
@@ -93,6 +93,7 @@ public class MavenProjects
     {
         return new MavenProjectConsumer()
         {
+            @Override
             public void accept( MavenProject project )
             {
                 final String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
@@ -106,6 +107,7 @@ public class MavenProjects
     {
         return new MavenProjectConsumer()
         {
+            @Override
             public void accept( MavenProject project )
             {
                 set.add( project );

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluator.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyExpressionEvaluator.java Sun Jul 19 15:06:13 2015
@@ -55,6 +55,7 @@ public class AssemblyExpressionEvaluator
         interceptor = new PrefixAwareRecursionInterceptor( InterpolationConstants.PROJECT_PREFIXES, true );
     }
 
+    @Override
     public File alignToBaseDirectory( File f )
     {
         String basePath = configSource.getBasedir().getAbsolutePath();
@@ -70,6 +71,7 @@ public class AssemblyExpressionEvaluator
         }
     }
 
+    @Override
     public Object evaluate( String expression )
         throws ExpressionEvaluationException
     {

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java Sun Jul 19 15:06:13 2015
@@ -70,6 +70,7 @@ public class AssemblyInterpolator
 
         return new AssemblyXpp3Reader.ContentTransformer()
         {
+            @Override
             public String transform( String source, String contextDescription )
             {
                 if ( blacklistFields.contains( contextDescription ) )
@@ -97,6 +98,7 @@ public class AssemblyInterpolator
 
         return new ComponentXpp3Reader.ContentTransformer()
         {
+            @Override
             public String transform( String source, String contextDescription )
             {
                 if ( blacklistFields.contains( contextDescription ) )
@@ -161,6 +163,7 @@ public class AssemblyInterpolator
             this.basedir = basedir;
         }
 
+        @Override
         public Object execute( final String expression, final Object value )
         {
             final String path = String.valueOf( value );

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java Sun Jul 19 15:06:13 2015
@@ -87,6 +87,7 @@ public class DefaultAssemblyReader
             new PrefixedObjectValueSource( InterpolationConstants.PROJECT_PREFIXES, project, true ) );
     }
 
+    @Override
     public List<Assembly> readAssemblies( final AssemblerConfigurationSource configSource )
         throws AssemblyReadException, InvalidAssemblerConfigurationException
     {
@@ -184,6 +185,7 @@ public class DefaultAssemblyReader
         return assemblies;
     }
 
+    @Override
     public Assembly getAssemblyForDescriptorReference( final String ref,
                                                        final AssemblerConfigurationSource configSource )
         throws AssemblyReadException, InvalidAssemblerConfigurationException
@@ -191,6 +193,7 @@ public class DefaultAssemblyReader
         return addAssemblyForDescriptorReference( ref, configSource, new ArrayList<Assembly>( 1 ) );
     }
 
+    @Override
     public Assembly getAssemblyFromDescriptorFile( final File file, final AssemblerConfigurationSource configSource )
         throws AssemblyReadException, InvalidAssemblerConfigurationException
     {
@@ -522,6 +525,7 @@ public class DefaultAssemblyReader
         }
     }
 
+    @Override
     public void includeSiteInAssembly( final Assembly assembly, final AssemblerConfigurationSource configSource )
         throws InvalidAssemblerConfigurationException
     {

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java Sun Jul 19 15:06:13 2015
@@ -52,6 +52,7 @@ class PrefixedClasspathLocatorStrategy
         return prefix;
     }
 
+    @Override
     public Location resolve( String locationSpecification, MessageHolder messageHolder )
     {
         String spec = formatLocation( locationSpecification );

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java Sun Jul 19 15:06:13 2015
@@ -40,6 +40,7 @@ class RelativeFileLocatorStrategy
         this.basedir = basedir;
     }
 
+    @Override
     public Location resolve( String locationSpecification, MessageHolder messageHolder )
     {
         File file = new File( basedir, locationSpecification );

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java?rev=1691831&r1=1691830&r2=1691831&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java Sun Jul 19 15:06:13 2015
@@ -445,6 +445,7 @@ public abstract class AbstractAssemblyMo
      *
      * @throws org.apache.maven.plugin.MojoExecutionException
      */
+    @Override
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
@@ -642,6 +643,7 @@ public abstract class AbstractAssemblyMo
         return result;
     }
 
+    @Override
     public File getBasedir()
     {
         return basedir;
@@ -657,6 +659,7 @@ public abstract class AbstractAssemblyMo
      *
      * @deprecated This has been replaced by {@link #getDescriptors()}
      */
+    @Override
     @Deprecated
     public String getDescriptor()
     {
@@ -668,6 +671,7 @@ public abstract class AbstractAssemblyMo
      *
      * @deprecated This has been replaced by {@link #getDescriptorReferences()}
      */
+    @Override
     @Deprecated
     public String getDescriptorId()
     {
@@ -675,16 +679,19 @@ public abstract class AbstractAssemblyMo
     }
 
 
+    @Override
     public String[] getDescriptorReferences()
     {
         return descriptorRefs;
     }
 
+    @Override
     public File getDescriptorSourceDirectory()
     {
         return descriptorSourceDirectory;
     }
 
+    @Override
     public String[] getDescriptors()
     {
         return descriptors;
@@ -695,8 +702,10 @@ public abstract class AbstractAssemblyMo
         this.descriptors = descriptors;
     }
 
+    @Override
     public abstract MavenProject getProject();
 
+    @Override
     public File getSiteDirectory()
     {
         return siteDirectory;
@@ -707,11 +716,13 @@ public abstract class AbstractAssemblyMo
         this.siteDirectory = siteDirectory;
     }
 
+    @Override
     public boolean isSiteIncluded()
     {
         return includeSite;
     }
 
+    @Override
     public String getFinalName()
     {
         return finalName;
@@ -722,11 +733,13 @@ public abstract class AbstractAssemblyMo
         this.finalName = finalName;
     }
 
+    @Override
     public boolean isAssemblyIdAppended()
     {
         return appendAssemblyId;
     }
 
+    @Override
     public String getTarLongFileMode()
     {
         return tarLongFileMode;
@@ -737,6 +750,7 @@ public abstract class AbstractAssemblyMo
         this.tarLongFileMode = tarLongFileMode;
     }
 
+    @Override
     public File getOutputDirectory()
     {
         return outputDirectory;
@@ -747,16 +761,19 @@ public abstract class AbstractAssemblyMo
         this.outputDirectory = outputDirectory;
     }
 
+    @Override
     public MavenArchiveConfiguration getJarArchiveConfiguration()
     {
         return archive;
     }
 
+    @Override
     public File getWorkingDirectory()
     {
         return workDirectory;
     }
 
+    @Override
     public ArtifactRepository getLocalRepository()
     {
         return localRepository;
@@ -767,16 +784,19 @@ public abstract class AbstractAssemblyMo
         this.localRepository = localRepository;
     }
 
+    @Override
     public File getTemporaryRootDirectory()
     {
         return tempRoot;
     }
 
+    @Override
     public File getArchiveBaseDirectory()
     {
         return archiveBaseDirectory;
     }
 
+    @Override
     public List<String> getFilters()
     {
         if ( filters == null )
@@ -795,11 +815,13 @@ public abstract class AbstractAssemblyMo
         this.filters = filters;
     }
 
+    @Override
     public boolean isIncludeProjectBuildFilters()
     {
         return includeProjectBuildFilters;
     }
 
+    @Override
     public List<MavenProject> getReactorProjects()
     {
         return reactorProjects;
@@ -810,6 +832,7 @@ public abstract class AbstractAssemblyMo
         this.reactorProjects = reactorProjects;
     }
 
+    @Override
     public String getClassifier()
     {
         // TODO Auto-generated method stub
@@ -851,56 +874,67 @@ public abstract class AbstractAssemblyMo
         this.workDirectory = workDirectory;
     }
 
+    @Override
     public List<ArtifactRepository> getRemoteRepositories()
     {
         return remoteRepositories;
     }
 
+    @Override
     public boolean isDryRun()
     {
         return dryRun;
     }
 
+    @Override
     public boolean isIgnoreDirFormatExtensions()
     {
         return ignoreDirFormatExtensions;
     }
 
+    @Override
     public boolean isIgnoreMissingDescriptor()
     {
         return ignoreMissingDescriptor;
     }
 
+    @Override
     public MavenSession getMavenSession()
     {
         return mavenSession;
     }
 
+    @Override
     public String getArchiverConfig()
     {
         return archiverConfig == null ? null : archiverConfig.toString();
     }
 
+    @Override
     public MavenReaderFilter getMavenReaderFilter()
     {
         return mavenReaderFilter;
     }
 
+    @Override
     public boolean isUpdateOnly()
     {
         return updateOnly;
     }
 
+    @Override
     public boolean isUseJvmChmod()
     {
         return useJvmChmod;
     }
 
+    @Override
     public boolean isIgnorePermissions()
     {
         return ignorePermissions;
     }
 
+    @Override
     public String getEncoding()
     {
         return encoding;
@@ -911,11 +945,13 @@ public abstract class AbstractAssemblyMo
         return recompressZippedFiles;
     }
 
+    @Override
     public String getEscapeString()
     {
         return escapeString;
     }
 
+    @Override
     public List<String> getDelimiters()
     {
         return delimiters;
@@ -926,6 +962,7 @@ public abstract class AbstractAssemblyMo
         this.delimiters = delimiters;
     }
 
+    @Override
     @Nonnull
     public FixedStringSearchInterpolator getCommandLinePropsInterpolator()
     {
@@ -936,6 +973,7 @@ public abstract class AbstractAssemblyMo
         return commanndLinePropertiesInterpolator;
     }
 
+    @Override
     @Nonnull
     public FixedStringSearchInterpolator getEnvInterpolator()
     {
@@ -946,6 +984,7 @@ public abstract class AbstractAssemblyMo
         return envInterpolator;
     }
 
+    @Override
     @Nonnull
     public FixedStringSearchInterpolator getRepositoryInterpolator()
     {
@@ -956,6 +995,7 @@ public abstract class AbstractAssemblyMo
         return rootInterpolator;
     }
 
+    @Override
     @Nonnull
     public FixedStringSearchInterpolator getMainProjectInterpolator()
     {



Mime
View raw message