Author: krosenvold
Date: Sun Nov 9 10:51:35 2014
New Revision: 1637649
URL: http://svn.apache.org/r1637649
Log:
Removed filtering from the ProxyArchiver. No tests broke and it only created
troubles
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java
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=1637649&r1=1637648&r2=1637649&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
Sun Nov 9 10:51:35 2014
@@ -43,10 +43,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* Delegating archiver implementation that supports:
@@ -77,7 +75,6 @@ public class AssemblyProxyArchiver
private boolean forced;
- private final Set<String> seenPaths = new HashSet<String>();
private final String assemblyWorkPath;
@@ -149,13 +146,6 @@ public class AssemblyProxyArchiver
public void addArchivedFileSet( final @Nonnull File archiveFile, final
String prefix, final String[] includes,
final String[] excludes )
{
- final String archiveKey = getArchiveKey( archiveFile, prefix );
- if ( seenPaths.contains( archiveKey ) )
- {
- warn( "Archive: " + archiveFile + " has already been added.
Skipping." );
- return;
- }
-
inPublicApi.set( Boolean.TRUE );
try
{
@@ -176,7 +166,6 @@ public class AssemblyProxyArchiver
else
{
delegate.addArchivedFileSet( fs );
- seenPaths.add( archiveKey );
}
}
finally
@@ -185,11 +174,6 @@ public class AssemblyProxyArchiver
}
}
- private String getArchiveKey( final File archiveFile, final String prefix )
- {
- return archiveFile.getAbsolutePath() + ":" + prefix;
- }
-
private void debug( final String message )
{
if ( ( logger != null ) && logger.isDebugEnabled() )
@@ -198,27 +182,12 @@ public class AssemblyProxyArchiver
}
}
- private void warn( final String message )
- {
- if ( ( logger != null ) && logger.isWarnEnabled() )
- {
- logger.warn( message );
- }
- }
-
/**
* {@inheritDoc}
*/
public void addArchivedFileSet( final @Nonnull File archiveFile, final
String prefix )
throws ArchiverException
{
- final String archiveKey = getArchiveKey( archiveFile, prefix );
- if ( seenPaths.contains( archiveKey ) )
- {
- warn( "Archive: " + archiveFile + " has already been added.
Skipping." );
- return;
- }
-
inPublicApi.set( Boolean.TRUE );
try
{
@@ -237,7 +206,6 @@ public class AssemblyProxyArchiver
else
{
delegate.addArchivedFileSet( fs );
- seenPaths.add( archiveKey );
}
}
finally
@@ -252,13 +220,6 @@ public class AssemblyProxyArchiver
public void addArchivedFileSet( final File archiveFile, final String[]
includes, final String[] excludes )
throws ArchiverException
{
- final String archiveKey = getArchiveKey( archiveFile, "" );
- if ( seenPaths.contains( archiveKey ) )
- {
- warn( "Archive: " + archiveFile + " has already been added.
Skipping." );
- return;
- }
-
inPublicApi.set( Boolean.TRUE );
try
{
@@ -279,7 +240,6 @@ public class AssemblyProxyArchiver
else
{
delegate.addArchivedFileSet( fs );
- seenPaths.add( archiveKey );
}
}
finally
@@ -294,13 +254,6 @@ public class AssemblyProxyArchiver
public void addArchivedFileSet( final @Nonnull File archiveFile )
throws ArchiverException
{
- final String archiveKey = getArchiveKey( archiveFile, "" );
- if ( seenPaths.contains( archiveKey ) )
- {
- warn( "Archive: " + archiveFile + " has already been added.
Skipping." );
- return;
- }
-
inPublicApi.set( Boolean.TRUE );
try
{
@@ -319,7 +272,6 @@ public class AssemblyProxyArchiver
else
{
delegate.addArchivedFileSet( fs );
- seenPaths.add( archiveKey );
}
}
finally
@@ -801,13 +753,6 @@ public class AssemblyProxyArchiver
public void addArchivedFileSet( final ArchivedFileSet fileSet )
throws ArchiverException
{
- final String archiveKey = getArchiveKey( fileSet.getArchive(),
fileSet.getPrefix() );
- if ( seenPaths.contains( archiveKey ) )
- {
- warn( "Archive: " + fileSet.getArchive() + " has already been
added. Skipping." );
- return;
- }
-
inPublicApi.set( Boolean.TRUE );
try
{
@@ -822,7 +767,6 @@ public class AssemblyProxyArchiver
else
{
delegate.addArchivedFileSet( fs );
- seenPaths.add( archiveKey );
}
}
finally
