You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2014/10/23 17:03:49 UTC
svn commit: r1633832 [1/2] - in
/maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/archive/
main/java/org/apache/maven/plugin/assembly/archive/archiver/
main/java/org/apache/maven/plugin/assembly/archive/phase/ m...
Author: krosenvold
Date: Thu Oct 23 15:03:47 2014
New Revision: 1633832
URL: http://svn.apache.org/r1633832
Log:
Fixed intellij code style warnings
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/ResolvedAssembly.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilterTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/ConfigSourceStub.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TestFileManager.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/testutils/TrackingArchiverStub.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LineEndingsUtilsTest.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/LinuxLineFeedInputStreamTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Thu Oct 23 15:03:47 2014
@@ -107,12 +107,9 @@ public class DefaultAssemblyArchiver
private PlexusContainer container;
- /**
- * create instance.
- */
+ @SuppressWarnings( "UnusedDeclaration" )
public DefaultAssemblyArchiver()
{
- // needed for plexus
}
// introduced for testing.
@@ -440,9 +437,9 @@ public class DefaultAssemblyArchiver
try
{
final Method configureComponent =
- ComponentConfigurator.class.getMethod( "configureComponent", new Class[] { Object.class,
- PlexusConfiguration.class, ExpressionEvaluator.class, (Class<?>) containerRealm[1],
- ConfigurationListener.class } );
+ ComponentConfigurator.class.getMethod( "configureComponent", Object.class, PlexusConfiguration.class,
+ ExpressionEvaluator.class, (Class<?>) containerRealm[1],
+ ConfigurationListener.class );
configureComponent.invoke( configurator, component, configuration, expressionEvaluator, containerRealm[0],
listener );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java Thu Oct 23 15:03:47 2014
@@ -133,10 +133,10 @@ public class ManifestCreationFinalizer
return Collections.singletonList( "META-INF/MANIFEST.MF" );
}
}
- catch ( final ManifestException e )
+ catch ( final ManifestException ignore )
{
}
- catch ( final DependencyResolutionRequiredException e )
+ catch ( final DependencyResolutionRequiredException ignore )
{
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java Thu Oct 23 15:03:47 2014
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.assembly
*/
import org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler;
+import org.codehaus.plexus.archiver.ArchiveEntry;
import org.codehaus.plexus.archiver.ArchiveFinalizer;
import org.codehaus.plexus.archiver.ArchivedFileSet;
import org.codehaus.plexus.archiver.Archiver;
@@ -35,6 +36,7 @@ import org.codehaus.plexus.components.io
import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
import org.codehaus.plexus.logging.Logger;
+import javax.annotation.Nonnull;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -53,7 +55,7 @@ import java.util.Set;
* <li>prefixing (where all paths have a set global prefix prepended before addition)</li>
* <li>duplication checks on archive additions (for archive-file path + prefix)</li>
* </ul>
- *
+ *
* @author jdcasey
* @version $Id$
*/
@@ -86,9 +88,8 @@ public class AssemblyProxyArchiver
public AssemblyProxyArchiver( final String rootPrefix, final Archiver delegate,
final List<ContainerDescriptorHandler> containerDescriptorHandlers,
- final List<FileSelector> extraSelectors,
- final List<ArchiveFinalizer> extraFinalizers, final File assemblyWorkDir,
- final Logger logger, final boolean dryRun )
+ final List<FileSelector> extraSelectors, final List<ArchiveFinalizer> extraFinalizers,
+ final File assemblyWorkDir, final Logger logger, final boolean dryRun )
{
this.rootPrefix = rootPrefix;
this.delegate = delegate;
@@ -105,7 +106,7 @@ public class AssemblyProxyArchiver
final List<FileSelector> selectors = new ArrayList<FileSelector>();
- final boolean isFinalizerEnabled = ( delegate instanceof FinalizerEnabled );
+ FinalizerEnabled finalizer = ( delegate instanceof FinalizerEnabled ) ? (FinalizerEnabled) delegate : null;
if ( containerDescriptorHandlers != null )
{
@@ -113,9 +114,9 @@ public class AssemblyProxyArchiver
{
selectors.add( handler );
- if ( isFinalizerEnabled )
+ if ( finalizer != null )
{
- ( (FinalizerEnabled) delegate ).addArchiveFinalizer( handler );
+ finalizer.addArchiveFinalizer( handler );
}
}
}
@@ -128,11 +129,11 @@ public class AssemblyProxyArchiver
}
}
- if ( ( extraFinalizers != null ) && isFinalizerEnabled )
+ if ( ( extraFinalizers != null ) && finalizer != null )
{
for ( ArchiveFinalizer extraFinalizer : extraFinalizers )
{
- ( (FinalizerEnabled) delegate ).addArchiveFinalizer( extraFinalizer );
+ finalizer.addArchiveFinalizer( extraFinalizer );
}
}
@@ -142,8 +143,10 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public void addArchivedFileSet( final File archiveFile, final String prefix, final String[] includes,
+ /**
+ * {@inheritDoc}
+ */
+ public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix, final String[] includes,
final String[] excludes )
{
final String archiveKey = getArchiveKey( archiveFile, prefix );
@@ -203,8 +206,10 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public void addArchivedFileSet( final File archiveFile, final String prefix )
+ /**
+ * {@inheritDoc}
+ */
+ public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix )
throws ArchiverException
{
final String archiveKey = getArchiveKey( archiveFile, prefix );
@@ -241,7 +246,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void addArchivedFileSet( final File archiveFile, final String[] includes, final String[] excludes )
throws ArchiverException
{
@@ -281,8 +288,10 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public void addArchivedFileSet( final File archiveFile )
+ /**
+ * {@inheritDoc}
+ */
+ public void addArchivedFileSet( final @Nonnull File archiveFile )
throws ArchiverException
{
final String archiveKey = getArchiveKey( archiveFile, "" );
@@ -319,8 +328,10 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public void addDirectory( final File directory, final String prefix, final String[] includes,
+ /**
+ * {@inheritDoc}
+ */
+ public void addDirectory( final @Nonnull File directory, final String prefix, final String[] includes,
final String[] excludes )
throws ArchiverException
{
@@ -352,7 +363,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void addSymlink( String symlinkName, String symlinkDestination )
throws ArchiverException
{
@@ -375,7 +388,9 @@ public class AssemblyProxyArchiver
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void addSymlink( String symlinkName, int permissions, String symlinkDestination )
throws ArchiverException
{
@@ -399,8 +414,10 @@ public class AssemblyProxyArchiver
}
- /** {@inheritDoc} */
- public void addDirectory( final File directory, final String prefix )
+ /**
+ * {@inheritDoc}
+ */
+ public void addDirectory( final @Nonnull File directory, final String prefix )
throws ArchiverException
{
inPublicApi.set( Boolean.TRUE );
@@ -429,8 +446,10 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public void addDirectory( final File directory, final String[] includes, final String[] excludes )
+ /**
+ * {@inheritDoc}
+ */
+ public void addDirectory( final @Nonnull File directory, final String[] includes, final String[] excludes )
throws ArchiverException
{
inPublicApi.set( Boolean.TRUE );
@@ -461,8 +480,10 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public void addDirectory( final File directory )
+ /**
+ * {@inheritDoc}
+ */
+ public void addDirectory( final @Nonnull File directory )
throws ArchiverException
{
inPublicApi.set( Boolean.TRUE );
@@ -491,8 +512,10 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public void addFile( final File inputFile, final String destFileName, final int permissions )
+ /**
+ * {@inheritDoc}
+ */
+ public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName, final int permissions )
throws ArchiverException
{
if ( acceptFile( inputFile ) )
@@ -518,8 +541,10 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public void addFile( final File inputFile, final String destFileName )
+ /**
+ * {@inheritDoc}
+ */
+ public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName )
throws ArchiverException
{
if ( acceptFile( inputFile ) )
@@ -545,7 +570,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void createArchive()
throws ArchiverException, IOException
{
@@ -568,7 +595,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public int getDefaultDirectoryMode()
{
inPublicApi.set( Boolean.TRUE );
@@ -582,7 +611,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public int getDefaultFileMode()
{
inPublicApi.set( Boolean.TRUE );
@@ -596,7 +627,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public File getDestFile()
{
inPublicApi.set( Boolean.TRUE );
@@ -611,8 +644,7 @@ public class AssemblyProxyArchiver
}
@SuppressWarnings( { "rawtypes", "deprecation" } )
- /** {@inheritDoc} */
- public Map getFiles()
+ /** {@inheritDoc} */ public Map<String, ArchiveEntry> getFiles()
{
inPublicApi.set( Boolean.TRUE );
try
@@ -625,7 +657,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean getIncludeEmptyDirs()
{
inPublicApi.set( Boolean.TRUE );
@@ -639,7 +673,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isForced()
{
inPublicApi.set( Boolean.TRUE );
@@ -653,7 +689,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isSupportingForced()
{
inPublicApi.set( Boolean.TRUE );
@@ -667,7 +705,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setDefaultDirectoryMode( final int mode )
{
inPublicApi.set( Boolean.TRUE );
@@ -681,7 +721,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setDefaultFileMode( final int mode )
{
inPublicApi.set( Boolean.TRUE );
@@ -695,7 +737,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setDestFile( final File destFile )
{
inPublicApi.set( Boolean.TRUE );
@@ -709,7 +753,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setForced( final boolean forced )
{
inPublicApi.set( Boolean.TRUE );
@@ -724,7 +770,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setIncludeEmptyDirs( final boolean includeEmptyDirs )
{
inPublicApi.set( Boolean.TRUE );
@@ -738,13 +786,18 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setDotFileDirectory( final File dotFileDirectory )
{
- throw new UnsupportedOperationException( "Undocumented feature of plexus-archiver; this is not yet supported." );
+ throw new UnsupportedOperationException(
+ "Undocumented feature of plexus-archiver; this is not yet supported." );
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void addArchivedFileSet( final ArchivedFileSet fileSet )
throws ArchiverException
{
@@ -778,8 +831,10 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public void addFileSet( final FileSet fileSet )
+ /**
+ * {@inheritDoc}
+ */
+ public void addFileSet( final @Nonnull FileSet fileSet )
throws ArchiverException
{
inPublicApi.set( Boolean.TRUE );
@@ -823,8 +878,9 @@ public class AssemblyProxyArchiver
final String workDirExclude = assemblyWorkPath.substring( fsPath.length() + 1 );
- logger.debug( "Adding exclude for assembly working-directory: " + workDirExclude
- + "\nFile-Set source directory: " + fsPath );
+ logger.debug(
+ "Adding exclude for assembly working-directory: " + workDirExclude + "\nFile-Set source directory: "
+ + fsPath );
newEx.add( workDirExclude );
@@ -889,8 +945,8 @@ public class AssemblyProxyArchiver
}
catch ( final IOException e )
{
- throw new ArchiverException( "Error processing file: " + inputFile + " using selector: "
- + selector, e );
+ throw new ArchiverException(
+ "Error processing file: " + inputFile + " using selector: " + selector, e );
}
}
}
@@ -937,7 +993,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions )
throws ArchiverException
{
@@ -952,7 +1010,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void addResources( final PlexusIoResourceCollection resources )
throws ArchiverException
{
@@ -967,20 +1027,28 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
- public ResourceIterator getResources()
+ /**
+ * {@inheritDoc}
+ */
+ public
+ @Nonnull
+ ResourceIterator getResources()
throws ArchiverException
{
return delegate.getResources();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public String getDuplicateBehavior()
{
return delegate.getDuplicateBehavior();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setDuplicateBehavior( final String duplicate )
{
inPublicApi.set( Boolean.TRUE );
@@ -994,31 +1062,41 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public int getDirectoryMode()
{
return delegate.getDirectoryMode();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public int getFileMode()
{
return delegate.getFileMode();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public int getOverrideDirectoryMode()
{
return delegate.getOverrideDirectoryMode();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public int getOverrideFileMode()
{
return delegate.getOverrideFileMode();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setDirectoryMode( final int mode )
{
inPublicApi.set( Boolean.TRUE );
@@ -1032,7 +1110,9 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setFileMode( final int mode )
{
inPublicApi.set( Boolean.TRUE );
@@ -1046,25 +1126,33 @@ public class AssemblyProxyArchiver
}
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isUseJvmChmod()
{
return useJvmChmod;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setUseJvmChmod( final boolean useJvmChmod )
{
this.useJvmChmod = useJvmChmod;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public boolean isIgnorePermissions()
{
return delegate.isIgnorePermissions();
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void setIgnorePermissions( final boolean ignorePermissions )
{
delegate.setIgnorePermissions( ignorePermissions );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java Thu Oct 23 15:03:47 2014
@@ -30,7 +30,7 @@ import java.io.File;
/**
* @version $Id$
*/
-public class PrefixedArchivedFileSet
+class PrefixedArchivedFileSet
implements ArchivedFileSet
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java Thu Oct 23 15:03:47 2014
@@ -28,7 +28,7 @@ import java.io.File;
/**
* @version $Id$
*/
-public class PrefixedFileSet
+class PrefixedFileSet
implements FileSet
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java Thu Oct 23 15:03:47 2014
@@ -26,7 +26,7 @@ import org.codehaus.plexus.archiver.zip.
* @version $Id$
* @todo delete this class once the plexus maven plugin can merge a generated components.xml with an existing one.
*/
-public class SarUnArchiver
+class SarUnArchiver
extends ZipUnArchiver
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java Thu Oct 23 15:03:47 2014
@@ -77,7 +77,7 @@ public class ModuleSetAssemblyPhase
/**
* The line separator.
*/
- public static final String LINE_SEPARATOR = System.getProperty( "line.separator" );
+ private static final String LINE_SEPARATOR = System.getProperty( "line.separator" );
@Requirement
private MavenProjectBuilder projectBuilder;
@@ -170,9 +170,9 @@ public class ModuleSetAssemblyPhase
}
}
- protected void addModuleBinaries( ResolvedModuleSet resolvedModule, final ModuleBinaries binaries,
- final Set<MavenProject> projects, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
+ void addModuleBinaries( ResolvedModuleSet resolvedModule, final ModuleBinaries binaries,
+ final Set<MavenProject> projects, final Archiver archiver,
+ final AssemblerConfigurationSource configSource )
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
{
if ( binaries == null )
@@ -352,8 +352,8 @@ public class ModuleSetAssemblyPhase
// return excludes;
// }
- protected void addModuleArtifact( final Artifact artifact, final MavenProject project, final Archiver archiver,
- final AssemblerConfigurationSource configSource, final ModuleBinaries binaries )
+ void addModuleArtifact( final Artifact artifact, final MavenProject project, final Archiver archiver,
+ final AssemblerConfigurationSource configSource, final ModuleBinaries binaries )
throws ArchiveCreationException, AssemblyFormattingException
{
if ( artifact.getFile() == null )
@@ -394,8 +394,8 @@ public class ModuleSetAssemblyPhase
task.execute( archiver, configSource );
}
- protected void addModuleSourceFileSets( final ModuleSources sources, final Set<MavenProject> moduleProjects,
- final Archiver archiver, final AssemblerConfigurationSource configSource )
+ void addModuleSourceFileSets( final ModuleSources sources, final Set<MavenProject> moduleProjects,
+ final Archiver archiver, final AssemblerConfigurationSource configSource )
throws ArchiveCreationException, AssemblyFormattingException
{
if ( sources == null )
@@ -452,8 +452,7 @@ public class ModuleSetAssemblyPhase
/**
* Determine whether the deprecated file-set configuration directly within the ModuleSources object is present.
*/
- protected boolean isDeprecatedModuleSourcesConfigPresent( @Nonnull
- final ModuleSources sources )
+ boolean isDeprecatedModuleSourcesConfigPresent( @Nonnull final ModuleSources sources )
{
boolean result = false;
@@ -474,11 +473,9 @@ public class ModuleSetAssemblyPhase
}
@Nonnull
- protected FileSet createFileSet( @Nonnull
- final FileSet fileSet, @Nonnull
- final ModuleSources sources, @Nonnull
- final MavenProject moduleProject, @Nonnull
- final AssemblerConfigurationSource configSource )
+ FileSet createFileSet( @Nonnull final FileSet fileSet, @Nonnull final ModuleSources sources,
+ @Nonnull final MavenProject moduleProject,
+ @Nonnull final AssemblerConfigurationSource configSource )
throws AssemblyFormattingException
{
final FileSet fs = new FileSet();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java Thu Oct 23 15:03:47 2014
@@ -116,7 +116,7 @@ public class RepositoryAssemblyPhase
task.setOutputDirectory( outputDirectory );
- task.execute( archiver, configSource );
+ task.execute( archiver );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java Thu Oct 23 15:03:47 2014
@@ -26,7 +26,7 @@ import java.util.List;
/**
* @version $Id$
*/
-public class GroupVersionAlignmentWrapper
+class GroupVersionAlignmentWrapper
implements org.apache.maven.shared.repository.model.GroupVersionAlignment
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java Thu Oct 23 15:03:47 2014
@@ -40,7 +40,6 @@ import java.util.List;
* @version $Id$
*/
public class AddArtifactTask
- implements ArchiverTask
{
public static final String[] DEFAULT_INCLUDES_ARRAY = { "**/*" };
@@ -270,21 +269,11 @@ public class AddArtifactTask
setFileNameMapping( outputFileNameMapping == null ? defaultOutputFileNameMapping : outputFileNameMapping );
}
- public MavenProject getModuleProject()
- {
- return moduleProject;
- }
-
public void setModuleProject( final MavenProject moduleProject )
{
this.moduleProject = moduleProject;
}
- public Artifact getModuleArtifact()
- {
- return moduleArtifact;
- }
-
public void setModuleArtifact( final Artifact moduleArtifact )
{
this.moduleArtifact = moduleArtifact;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java Thu Oct 23 15:03:47 2014
@@ -54,7 +54,6 @@ import org.codehaus.plexus.logging.Logge
* @version $Id$
*/
public class AddDependencySetsTask
- implements ArchiverTask
{
private static final List<String> NON_ARCHIVE_DEPENDENCY_TYPES;
@@ -122,8 +121,8 @@ public class AddDependencySetsTask
}
}
- protected void addDependencySet( final DependencySet dependencySet, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
+ void addDependencySet( final DependencySet dependencySet, final Archiver archiver,
+ final AssemblerConfigurationSource configSource )
throws AssemblyFormattingException, ArchiveCreationException, InvalidAssemblerConfigurationException
{
logger.debug( "Processing DependencySet (output=" + dependencySet.getOutputDirectory() + ")" );
@@ -207,6 +206,7 @@ public class AddDependencySetsTask
}
}
+ @SuppressWarnings( "ResultOfMethodCallIgnored" )
private void addFilteredUnpackedArtifact( final DependencySet dependencySet, final Artifact depArtifact,
final MavenProject depProject, final Archiver archiver,
final AssemblerConfigurationSource configSource )
@@ -358,7 +358,7 @@ public class AddDependencySetsTask
return project;
}
- protected Set<Artifact> resolveDependencyArtifacts( final DependencySet dependencySet )
+ Set<Artifact> resolveDependencyArtifacts( final DependencySet dependencySet )
throws InvalidAssemblerConfigurationException
{
final Set<Artifact> dependencyArtifacts = new LinkedHashSet<Artifact>();
@@ -420,9 +420,9 @@ public class AddDependencySetsTask
return dependencyArtifacts;
}
- protected void addNonArchiveDependency( final Artifact depArtifact, final MavenProject depProject,
- final DependencySet dependencySet, final Archiver archiver,
- final AssemblerConfigurationSource configSource )
+ void addNonArchiveDependency( final Artifact depArtifact, final MavenProject depProject,
+ final DependencySet dependencySet, final Archiver archiver,
+ final AssemblerConfigurationSource configSource )
throws AssemblyFormattingException, ArchiveCreationException
{
final File source = depArtifact.getFile();
@@ -478,31 +478,16 @@ public class AddDependencySetsTask
return logger;
}
- public String getDefaultOutputDirectory()
- {
- return defaultOutputDirectory;
- }
-
public void setDefaultOutputDirectory( final String defaultOutputDirectory )
{
this.defaultOutputDirectory = defaultOutputDirectory;
}
- public String getDefaultOutputFileNameMapping()
- {
- return defaultOutputFileNameMapping;
- }
-
public void setDefaultOutputFileNameMapping( final String defaultOutputFileNameMapping )
{
this.defaultOutputFileNameMapping = defaultOutputFileNameMapping;
}
- public MavenProject getModuleProject()
- {
- return moduleProject;
- }
-
public void setModuleProject( final MavenProject moduleProject )
{
this.moduleProject = moduleProject;
@@ -512,9 +497,4 @@ public class AddDependencySetsTask
{
this.moduleArtifact = moduleArtifact;
}
-
- public Artifact getModuleArtifact()
- {
- return moduleArtifact;
- }
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java Thu Oct 23 15:03:47 2014
@@ -35,7 +35,6 @@ import java.util.List;
* @version $Id$
*/
public class AddDirectoryTask
- implements ArchiverTask
{
private final File directory;
@@ -65,7 +64,7 @@ public class AddDirectoryTask
this( directory, null);
}
- public void execute( final Archiver archiver, final AssemblerConfigurationSource configSource )
+ public void execute( final Archiver archiver )
throws ArchiveCreationException
{
if ( ".".equals( outputDirectory ) )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java Thu Oct 23 15:03:47 2014
@@ -41,7 +41,6 @@ import org.codehaus.plexus.logging.conso
* @version $Id$
*/
public class AddFileSetsTask
- implements ArchiverTask
{
private final List<FileSet> fileSets;
@@ -92,8 +91,8 @@ public class AddFileSetsTask
}
}
- protected void addFileSet( final FileSet fileSet, final Archiver archiver,
- final AssemblerConfigurationSource configSource, final File archiveBaseDir )
+ void addFileSet( final FileSet fileSet, final Archiver archiver, final AssemblerConfigurationSource configSource,
+ final File archiveBaseDir )
throws AssemblyFormattingException, ArchiveCreationException
{
// throw this check in just in case someone extends this class...
@@ -168,11 +167,11 @@ public class AddFileSetsTask
task.setIncludes( fileSet.getIncludes() );
task.setOutputDirectory( destDirectory );
- task.execute( archiver, configSource );
+ task.execute( archiver );
}
}
- protected File getFileSetDirectory( final FileSet fileSet, final File basedir, final File archiveBaseDir )
+ File getFileSetDirectory( final FileSet fileSet, final File basedir, final File archiveBaseDir )
throws ArchiveCreationException, AssemblyFormattingException
{
String sourceDirectory = fileSet.getDirectory();
@@ -219,11 +218,6 @@ public class AddFileSetsTask
this.project = project;
}
- public MavenProject getModuleProject()
- {
- return moduleProject;
- }
-
public void setModuleProject( final MavenProject moduleProject )
{
this.moduleProject = moduleProject;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java Thu Oct 23 15:03:47 2014
@@ -30,7 +30,6 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactCollector;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@@ -158,9 +157,9 @@ public class DefaultDependencyResolver
return base.withArtifacts( artifacts );
}
- protected Set<Artifact> resolveNonTransitively( final Assembly assembly, final Set<Artifact> dependencyArtifacts,
- final AssemblerConfigurationSource configSource,
- final List<ArtifactRepository> repos )
+ Set<Artifact> resolveNonTransitively( final Assembly assembly, final Set<Artifact> dependencyArtifacts,
+ final AssemblerConfigurationSource configSource,
+ final List<ArtifactRepository> repos )
throws DependencyResolutionException
{
@@ -244,8 +243,7 @@ public class DefaultDependencyResolver
return result.getArtifacts();
}
- protected void updateRepositoryResolutionRequirements( final Assembly assembly,
- final ResolutionManagementInfo requirements )
+ void updateRepositoryResolutionRequirements( final Assembly assembly, final ResolutionManagementInfo requirements )
{
final List<Repository> repositories = assembly.getRepositories();
@@ -259,9 +257,8 @@ public class DefaultDependencyResolver
}
}
- protected void updateModuleSetResolutionRequirements( final Assembly assembly,
- final ResolutionManagementInfo requirements,
- final AssemblerConfigurationSource configSource )
+ void updateModuleSetResolutionRequirements( final Assembly assembly, final ResolutionManagementInfo requirements,
+ final AssemblerConfigurationSource configSource )
throws DependencyResolutionException
{
final List<ModuleSet> moduleSets = assembly.getModuleSets();
@@ -276,9 +273,9 @@ public class DefaultDependencyResolver
}
}
- protected void updateModuleSetResolutionRequirements( AssemblyId assemblyId, ModuleSet set,
- final ResolutionManagementInfo requirements,
- final AssemblerConfigurationSource configSource )
+ void updateModuleSetResolutionRequirements( AssemblyId assemblyId, ModuleSet set,
+ final ResolutionManagementInfo requirements,
+ final AssemblerConfigurationSource configSource )
throws DependencyResolutionException
{
final ModuleBinaries binaries = set.getBinaries();
@@ -323,9 +320,9 @@ public class DefaultDependencyResolver
}
@SuppressWarnings( "unchecked" )
- protected void updateDependencySetResolutionRequirements( final List<DependencySet> depSets,
- final ResolutionManagementInfo requirements,
- AssemblyId assemblyId, final MavenProject... projects )
+ void updateDependencySetResolutionRequirements( final List<DependencySet> depSets,
+ final ResolutionManagementInfo requirements, AssemblyId assemblyId,
+ final MavenProject... projects )
throws DependencyResolutionException
{
if ( depSets != null && !depSets.isEmpty() )
@@ -395,8 +392,8 @@ public class DefaultDependencyResolver
}
@SuppressWarnings( "unchecked" )
- protected List<ArtifactRepository> aggregateRemoteArtifactRepositories( final List<ArtifactRepository> remoteRepositories,
- final Set<MavenProject> projects )
+ List<ArtifactRepository> aggregateRemoteArtifactRepositories( final List<ArtifactRepository> remoteRepositories,
+ final Set<MavenProject> projects )
{
final List<List<ArtifactRepository>> repoLists = new ArrayList<List<ArtifactRepository>>();
@@ -427,11 +424,4 @@ public class DefaultDependencyResolver
return remoteRepos;
}
- protected DefaultDependencyResolver setLogger( final Logger logger )
- {
- enableLogging( logger );
-
- return this;
- }
-
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java Thu Oct 23 15:03:47 2014
@@ -33,9 +33,4 @@ public class DependencyResolutionExcepti
super( message, error );
}
- public DependencyResolutionException( final String message )
- {
- super( message );
- }
-
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java Thu Oct 23 15:03:47 2014
@@ -129,8 +129,4 @@ class ResolutionManagementInfo
artifacts.addAll( a );
}
- void addArtifact( final Artifact a )
- {
- artifacts.add( a );
- }
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java Thu Oct 23 15:03:47 2014
@@ -39,7 +39,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public abstract class AbstractLineAggregatingHandler
+abstract class AbstractLineAggregatingHandler
implements ContainerDescriptorHandler
{
@@ -51,7 +51,7 @@ public abstract class AbstractLineAggreg
protected abstract boolean fileMatches( final FileInfo fileInfo );
- protected String getEncoding()
+ String getEncoding()
{
return "UTF-8";
}
@@ -72,7 +72,7 @@ public abstract class AbstractLineAggreg
addToArchive( archiver );
}
- protected void addToArchive( final Archiver archiver )
+ void addToArchive( final Archiver archiver )
throws ArchiverException
{
for ( final Map.Entry<String, List<String>> entry : catalog.entrySet() )
@@ -148,7 +148,7 @@ public abstract class AbstractLineAggreg
return true;
}
- protected void readLines( final FileInfo fileInfo, final List<String> lines )
+ void readLines( final FileInfo fileInfo, final List<String> lines )
throws IOException
{
BufferedReader reader = null;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java Thu Oct 23 15:03:47 2014
@@ -58,13 +58,13 @@ public class ComponentsXmlArchiverFileFi
// [jdcasey] Switched visibility to protected to allow testing. Also, because this class isn't final, it should
// allow
// some minimal access to the components accumulated for extending classes.
- protected Map<String, Xpp3Dom> components;
+ Map<String, Xpp3Dom> components;
private boolean excludeOverride = false;
public static final String COMPONENTS_XML_PATH = "META-INF/plexus/components.xml";
- protected void addComponentsXml( final Reader componentsReader )
+ void addComponentsXml( final Reader componentsReader )
throws XmlPullParserException, IOException
{
Xpp3Dom newDom = Xpp3DomBuilder.build( componentsReader );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/SimpleAggregatingDescriptorHandler.java Thu Oct 23 15:03:47 2014
@@ -151,7 +151,7 @@ public class SimpleAggregatingDescriptor
return Collections.singletonList( outputPath );
}
- public boolean isSelected( final FileInfo fileInfo )
+ public boolean isSelected( final @Nonnull FileInfo fileInfo )
throws IOException
{
checkConfig();
@@ -224,21 +224,25 @@ public class SimpleAggregatingDescriptor
this.logger = logger;
}
+ @SuppressWarnings( "UnusedDeclaration" )
public String getFilePattern()
{
return filePattern;
}
+ @SuppressWarnings( "UnusedDeclaration" )
public void setFilePattern( final String filePattern )
{
this.filePattern = filePattern;
}
+ @SuppressWarnings( "UnusedDeclaration" )
public String getOutputPath()
{
return outputPath;
}
+ @SuppressWarnings( "UnusedDeclaration" )
public void setOutputPath( final String outputPath )
{
this.outputPath = outputPath;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/format/ReaderFormatter.java Thu Oct 23 15:03:47 2014
@@ -39,9 +39,9 @@ import java.util.List;
public class ReaderFormatter
{
- public static Reader createReaderFilter( @Nonnull Reader source, String sourceName, String encoding,
- String escapeString, List<String> delimiters,
- AssemblerConfigurationSource configSource )
+ private static Reader createReaderFilter( @Nonnull Reader source, String sourceName, String encoding,
+ String escapeString, List<String> delimiters,
+ AssemblerConfigurationSource configSource )
throws AssemblyFormattingException
{
try
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluator.java Thu Oct 23 15:03:47 2014
@@ -34,8 +34,8 @@ public class AssemblyExpressionEvaluator
{
private final AssemblerConfigurationSource configSource;
- private Interpolator interpolator;
- private PrefixAwareRecursionInterceptor interceptor;
+ private final Interpolator interpolator;
+ private final PrefixAwareRecursionInterceptor interceptor;
public AssemblyExpressionEvaluator( AssemblerConfigurationSource configSource )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolationException.java Thu Oct 23 15:03:47 2014
@@ -31,39 +31,13 @@ public class AssemblyInterpolationExcept
private String originalMessage;
- public AssemblyInterpolationException( final String message )
- {
- super( message );
- }
-
public AssemblyInterpolationException( final String message, final Throwable cause )
{
super( message, cause );
}
- public AssemblyInterpolationException( final String expression, final String message, final Throwable cause )
- {
- super( "The Assembly expression: " + expression + " could not be evaluated. Reason: " + message, cause );
-
- this.expression = expression;
- originalMessage = message;
- }
-
- public AssemblyInterpolationException( final String expression, final String message )
- {
- super( "The Assembly expression: " + expression + " could not be evaluated. Reason: " + message );
-
- this.expression = expression;
- originalMessage = message;
- }
-
public String getExpression()
{
return expression;
}
-
- public String getOriginalMessage()
- {
- return originalMessage;
- }
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/PrefixedClasspathLocatorStrategy.java Thu Oct 23 15:03:47 2014
@@ -26,7 +26,7 @@ import org.apache.maven.shared.io.loggin
/**
* @version $Id$
*/
-public class PrefixedClasspathLocatorStrategy
+class PrefixedClasspathLocatorStrategy
extends ClasspathResourceLocatorStrategy
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/io/RelativeFileLocatorStrategy.java Thu Oct 23 15:03:47 2014
@@ -29,7 +29,7 @@ import java.io.File;
/**
* @version $Id$
*/
-public class RelativeFileLocatorStrategy
+class RelativeFileLocatorStrategy
implements LocatorStrategy
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java Thu Oct 23 15:03:47 2014
@@ -61,7 +61,7 @@ public abstract class AbstractAssemblyMo
* The character encoding scheme to be applied when filtering resources.
*/
@Parameter( property = "encoding", defaultValue = "${project.build.sourceEncoding}" )
- protected String encoding;
+ private String encoding;
/**
* Expressions preceded with this String won't be interpolated.
@@ -70,7 +70,7 @@ public abstract class AbstractAssemblyMo
* @since 2.4
*/
@Parameter( property = "assembly.escapeString" )
- protected String escapeString;
+ private String escapeString;
/**
* Flag allowing one or more executions of the assembly plugin to be configured as skipped for a particular build.
@@ -190,7 +190,7 @@ public abstract class AbstractAssemblyMo
*/
@Deprecated
@Parameter( property = "descriptorId" )
- protected String descriptorId;
+ private String descriptorId;
/**
* Assembly XML Descriptor file. This must be the path to your customized descriptor file.
@@ -199,7 +199,7 @@ public abstract class AbstractAssemblyMo
*/
@Deprecated
@Parameter( property = "descriptor" )
- protected String descriptor;
+ private String descriptor;
/**
* Sets the TarArchiver behavior on file paths with more than 100 characters length. Valid values are: "warn"
@@ -263,13 +263,13 @@ public abstract class AbstractAssemblyMo
* Set to false to exclude the assembly id from the assembly final name.
*/
@Parameter( property = "assembly.appendAssemblyId", defaultValue = "true" )
- protected boolean appendAssemblyId;
+ boolean appendAssemblyId;
/**
* Set to true in order to not fail when a descriptor is missing.
*/
@Parameter( property = "assembly.ignoreMissingDescriptor", defaultValue = "false" )
- protected boolean ignoreMissingDescriptor;
+ private boolean ignoreMissingDescriptor;
/**
* This is a set of instructions to the archive builder, especially for building .jar files. It enables you to
@@ -287,7 +287,7 @@ public abstract class AbstractAssemblyMo
* set of filters for a particular execution.
*/
@Parameter
- protected List<String> filters;
+ private List<String> filters;
/**
* If True (default) then the ${project.build.filters} are also used in addition to any
@@ -296,7 +296,7 @@ public abstract class AbstractAssemblyMo
* @since 2.4.2
*/
@Parameter( property = "assembly.includeProjectBuildFilters", defaultValue = "true" )
- protected boolean includeProjectBuildFilters;
+ private boolean includeProjectBuildFilters;
/**
* Controls whether the assembly plugin tries to attach the resulting assembly to the project.
@@ -545,9 +545,9 @@ public abstract class AbstractAssemblyMo
/**
* Returns true if the current project is located at the Execution Root Directory (where mvn was launched)
*
- * @return
+ * @return if this is the execution root
*/
- protected boolean isThisTheExecutionRoot()
+ boolean isThisTheExecutionRoot()
{
final Log log = getLog();
log.debug( "Root Folder:" + mavenSession.getExecutionRootDirectory() );
@@ -565,12 +565,12 @@ public abstract class AbstractAssemblyMo
return result;
}
- protected AssemblyArchiver getAssemblyArchiver()
+ AssemblyArchiver getAssemblyArchiver()
{
return assemblyArchiver;
}
- protected AssemblyReader getAssemblyReader()
+ AssemblyReader getAssemblyReader()
{
return assemblyReader;
}
@@ -718,20 +718,6 @@ public abstract class AbstractAssemblyMo
this.archive = archive;
}
- public void setArchiveBaseDirectory( final File archiveBaseDirectory )
- {
- this.archiveBaseDirectory = archiveBaseDirectory;
- }
-
- public void setAssemblyArchiver( final AssemblyArchiver assemblyArchiver )
- {
- this.assemblyArchiver = assemblyArchiver;
- }
-
- public void setAssemblyReader( final AssemblyReader assemblyReader )
- {
- this.assemblyReader = assemblyReader;
- }
public void setBasedir( final File basedir )
{
@@ -900,7 +886,7 @@ public abstract class AbstractAssemblyMo
return encoding;
}
- protected boolean isRecompressZippedFiles()
+ boolean isRecompressZippedFiles()
{
return recompressZippedFiles;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/ResolvedAssembly.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/ResolvedAssembly.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/ResolvedAssembly.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/ResolvedAssembly.java Thu Oct 23 15:03:47 2014
@@ -43,8 +43,8 @@ public class ResolvedAssembly
private final Set<Artifact> dependencySetArtifacts;
- public ResolvedAssembly( Assembly assembly, List<ResolvedModuleSet> resolvedModuleSets,
- Set<Artifact> dependencySetArtifacts )
+ private ResolvedAssembly( Assembly assembly, List<ResolvedModuleSet> resolvedModuleSets,
+ Set<Artifact> dependencySetArtifacts )
{
this.assembly = assembly;
this.resolvedModuleSets = resolvedModuleSets;
@@ -82,11 +82,6 @@ public class ResolvedAssembly
return dependencySetArtifacts;
}
- public Assembly getAssembly()
- {
- return assembly;
- }
-
public List<DependencySet> getDependencySets()
{
return assembly.getDependencySets();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtils.java Thu Oct 23 15:03:47 2014
@@ -19,14 +19,6 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
-import java.util.Locale;
-
-import javax.annotation.Nonnull;
-
import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
@@ -34,6 +26,10 @@ import org.codehaus.plexus.archiver.mana
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import org.codehaus.plexus.components.io.fileselectors.FileInfo;
+import javax.annotation.Nonnull;
+import java.io.File;
+import java.util.Locale;
+
/**
* @version $Id$
*/
@@ -120,25 +116,8 @@ public final class AssemblyFileUtils
}
}
- public static void copyFile( File src, File dst )
- throws IOException
- {
- FileChannel c1 = new RandomAccessFile( src, "r" ).getChannel();
- FileChannel c2 = new RandomAccessFile( dst, "rw" ).getChannel();
-
- long tCount = 0, size = c1.size();
- // noinspection StatementWithEmptyBody
- while ( ( tCount += c2.transferFrom( c1, 0, size - tCount ) ) < size )
- {
- }
-
- c1.close();
- c2.force( true );
- c2.close();
- }
-
@Nonnull
- public static String normalizePath( @Nonnull String path )
+ private static String normalizePath( @Nonnull String path )
{
return path.replace( '\\', '/' );
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java Thu Oct 23 15:03:47 2014
@@ -79,19 +79,6 @@ public final class AssemblyFormatUtils
return distributionName;
}
- /**
- * @deprecated Use
- * {@link AssemblyFormatUtils#getOutputDirectory(String, MavenProject, MavenProject, String, AssemblerConfigurationSource)}
- * instead.
- */
- @Deprecated
- public static String getOutputDirectory( final String output, final MavenProject mainProject,
- final MavenProject artifactProject, final String finalName )
- throws AssemblyFormattingException
- {
- return getOutputDirectory( output, mainProject, null, artifactProject, finalName, null );
- }
-
public static String getOutputDirectory( final String output, final MavenProject mainProject,
final MavenProject artifactProject, final String finalName,
final AssemblerConfigurationSource configSource )
@@ -270,19 +257,6 @@ public final class AssemblyFormatUtils
return value;
}
- /**
- * @deprecated Use
- * {@link AssemblyFormatUtils#evaluateFileNameMapping(String, Artifact, MavenProject, MavenProject, AssemblerConfigurationSource)}
- * instead.
- */
- @Deprecated
- public static String evaluateFileNameMapping( final String expression, final Artifact artifact,
- final MavenProject mainProject, final MavenProject artifactProject )
- throws AssemblyFormattingException
- {
- return evaluateFileNameMapping( expression, artifact, mainProject, null, null, artifactProject, null );
- }
-
public static String evaluateFileNameMapping( final String expression, final Artifact artifact,
final MavenProject mainProject, final MavenProject artifactProject,
final AssemblerConfigurationSource configSource )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/LineEndings.java Thu Oct 23 15:03:47 2014
@@ -28,7 +28,7 @@ public enum LineEndings
{
keep( null ), dos( "\r\n" ), windows( "\r\n" ), unix( "\n" ), crlf( "\r\n" ), lf( "\n" );
- private String lineEndingCharacters;
+ private final String lineEndingCharacters;
private LineEndings( String lineEndingCharacters )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java Thu Oct 23 15:03:47 2014
@@ -70,7 +70,6 @@ import static org.easymock.EasyMock.expe
import static org.junit.Assert.*;
public class DefaultAssemblyArchiverTest
-// extends PlexusTestCase
{
private static final TestFileManager fileManager = new TestFileManager( "def-assy-archiver.test.", "" );
@@ -86,12 +85,6 @@ public class DefaultAssemblyArchiverTest
container.start();
}
- public void shutdown()
- {
- container.dispose();
- }
-
- // @Override
@AfterClass
public static void tearDown()
throws Exception
@@ -790,12 +783,6 @@ public class DefaultAssemblyArchiverTest
}
@Override
- public TarOptions getOptions()
- {
- return super.getOptions();
- }
-
- @Override
public void setCompression( final TarCompressionMethod mode )
{
compressionMethod = mode;
@@ -809,12 +796,6 @@ public class DefaultAssemblyArchiverTest
super.setLongfile( mode );
}
- @Override
- public void setOptions( final TarOptions options )
- {
- super.setOptions( options );
- }
-
}
private static final class TestWarArchiver
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizerTest.java Thu Oct 23 15:03:47 2014
@@ -46,7 +46,7 @@ public class ManifestCreationFinalizerTe
extends TestCase
{
- private TestFileManager fileManager = new TestFileManager( "manifest-finalizer.test.", ".jar" );
+ private final TestFileManager fileManager = new TestFileManager( "manifest-finalizer.test.", ".jar" );
public void tearDown()
throws IOException
@@ -158,9 +158,9 @@ public class ManifestCreationFinalizerTe
private final class MockAndControlForArchiver
{
- Archiver archiver;
+ final Archiver archiver;
- MockControl control;
+ final MockControl control;
MockAndControlForArchiver( MockManager mm )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java Thu Oct 23 15:03:47 2014
@@ -421,9 +421,9 @@ public class FileItemAssemblyPhaseTest
private final class MockAndControlForArchiver
{
- Archiver archiver;
+ final Archiver archiver;
- MockControl control;
+ final MockControl control;
public MockAndControlForArchiver( final MockManager mockManager )
{
@@ -448,9 +448,9 @@ public class FileItemAssemblyPhaseTest
private final class MockAndControlForConfigSource
{
- AssemblerConfigurationSource configSource;
+ final AssemblerConfigurationSource configSource;
- MockControl control;
+ final MockControl control;
public MockAndControlForConfigSource( final MockManager mockManager )
{
@@ -496,9 +496,9 @@ public class FileItemAssemblyPhaseTest
private final class MockAndControlForLogger
{
- Logger logger;
+ final Logger logger;
- MockControl control;
+ final MockControl control;
public MockAndControlForLogger( final MockManager mockManager )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java Thu Oct 23 15:03:47 2014
@@ -123,9 +123,9 @@ public class FileSetAssemblyPhaseTest
private final class MockAndControlForLogger
{
- Logger logger;
+ final Logger logger;
- MockControl control;
+ final MockControl control;
MockAndControlForLogger()
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Thu Oct 23 15:03:47 2014
@@ -748,7 +748,7 @@ public class ModuleSetAssemblyPhaseTest
final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
final int[] modes = { -1, -1, mode, mode };
- macTask.expectAdditionOfSingleFileSet( project, project.getBasedir(), "final-name", false, modes, 1, true,
+ macTask.expectAdditionOfSingleFileSet( project, "final-name", false, modes, 1, true,
false );
mm.replayAll();
@@ -900,12 +900,12 @@ public class ModuleSetAssemblyPhaseTest
final List<ArtifactMock> macArtifacts = new ArrayList<ArtifactMock>();
- macArtifacts.add( addArtifact( project, mm, false, false ) );
+ macArtifacts.add( addArtifact( project, mm, false ) );
final MavenProject project2 = createProject( "group", "artifact2", "version", project );
- macArtifacts.add( addArtifact( project2, mm, true, false ) );
+ macArtifacts.add( addArtifact( project2, mm, false ) );
final MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
- macArtifacts.add( addArtifact( project3, mm, true, true ) );
+ macArtifacts.add( addArtifact( project3, mm, true ) );
final List<MavenProject> projects = new ArrayList<MavenProject>();
projects.add( project );
@@ -929,8 +929,7 @@ public class ModuleSetAssemblyPhaseTest
mm.verifyAll();
}
- private ArtifactMock addArtifact( final MavenProject project, final MockManager mm,
- final boolean expectIdentityChecks, final boolean expectDepTrailCheck )
+ private ArtifactMock addArtifact( final MavenProject project, final MockManager mm, final boolean expectDepTrailCheck )
{
final ArtifactMock macArtifact =
new ArtifactMock( mm, project.getGroupId(), project.getArtifactId(), project.getVersion(),
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java Thu Oct 23 15:03:47 2014
@@ -147,9 +147,9 @@ public class RepositoryAssemblyPhaseTest
private final class MockAndControlForArchiver
{
- Archiver archiver;
+ final Archiver archiver;
- MockControl control;
+ final MockControl control;
public MockAndControlForArchiver( final MockManager mockManager )
{
@@ -314,9 +314,9 @@ public class RepositoryAssemblyPhaseTest
private final class MockAndControlForConfigSource
{
- AssemblerConfigurationSource configSource;
+ final AssemblerConfigurationSource configSource;
- MockControl control;
+ final MockControl control;
public MockAndControlForConfigSource( final MockManager mockManager )
{
@@ -357,9 +357,9 @@ public class RepositoryAssemblyPhaseTest
private final class MockAndControlForRepositoryAssembler
{
- RepositoryAssembler repositoryAssembler;
+ final RepositoryAssembler repositoryAssembler;
- MockControl control;
+ final MockControl control;
MockAndControlForRepositoryAssembler( final MockManager mockManager )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java?rev=1633832&r1=1633831&r2=1633832&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTaskTest.java Thu Oct 23 15:03:47 2014
@@ -73,7 +73,7 @@ public class AddDirectoryTaskTest
AddDirectoryTask task = new AddDirectoryTask( dir );
- task.execute( archiver, null );
+ task.execute( archiver );
mockManager.verifyAll();
}
@@ -101,7 +101,7 @@ public class AddDirectoryTaskTest
task.setOutputDirectory( "dir" );
- task.execute( archiver, null );
+ task.execute( archiver );
mockManager.verifyAll();
}
@@ -134,7 +134,7 @@ public class AddDirectoryTaskTest
task.setFileMode( fileMode );
task.setOutputDirectory( "dir" );
- task.execute( archiver, null );
+ task.execute( archiver );
mockManager.verifyAll();
}
@@ -164,7 +164,7 @@ public class AddDirectoryTaskTest
task.setExcludes( Collections.singletonList( "**/README.txt" ) );
task.setOutputDirectory( "dir" );
- task.execute( archiver, null );
+ task.execute( archiver );
mockManager.verifyAll();
}