Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java (from r1685251, 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/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.archiver; +package org.apache.maven.plugins.assembly.archive.archiver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler; +import org.apache.maven.plugins.assembly.filter.ContainerDescriptorHandler; import org.codehaus.plexus.archiver.ArchiveEntry; import org.codehaus.plexus.archiver.ArchiveFinalizer; import org.codehaus.plexus.archiver.ArchivedFileSet; @@ -64,18 +64,17 @@ public class AssemblyProxyArchiver private final Archiver delegate; - private String rootPrefix; - - private FileSelector[] selectors; - private final ThreadLocal<Boolean> inPublicApi = new ThreadLocal<Boolean>(); private final Logger logger; - private boolean forced; + private final String assemblyWorkPath; + private String rootPrefix; - private final String assemblyWorkPath; + private FileSelector[] selectors; + + private boolean forced; /** * @since 2.2 @@ -461,12 +460,12 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ - public int getDefaultFileMode() + public void setDefaultDirectoryMode( final int mode ) { inPublicApi.set( Boolean.TRUE ); try { - return delegate.getDefaultFileMode(); + delegate.setDefaultDirectoryMode( mode ); } finally { @@ -477,12 +476,12 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ - public File getDestFile() + public int getDefaultFileMode() { inPublicApi.set( Boolean.TRUE ); try { - return delegate.getDestFile(); + return delegate.getDefaultFileMode(); } finally { @@ -490,13 +489,15 @@ public class AssemblyProxyArchiver } } - @SuppressWarnings( { "rawtypes", "deprecation" } ) - /** {@inheritDoc} */ public Map<String, ArchiveEntry> getFiles() + /** + * {@inheritDoc} + */ + public void setDefaultFileMode( final int mode ) { inPublicApi.set( Boolean.TRUE ); try { - return delegate.getFiles(); + delegate.setDefaultFileMode( mode ); } finally { @@ -507,12 +508,12 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ - public boolean getIncludeEmptyDirs() + public File getDestFile() { inPublicApi.set( Boolean.TRUE ); try { - return delegate.getIncludeEmptyDirs(); + return delegate.getDestFile(); } finally { @@ -523,12 +524,12 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ - public boolean isForced() + public void setDestFile( final File destFile ) { inPublicApi.set( Boolean.TRUE ); try { - return delegate.isForced(); + delegate.setDestFile( destFile ); } finally { @@ -536,15 +537,13 @@ public class AssemblyProxyArchiver } } - /** - * {@inheritDoc} - */ - public boolean isSupportingForced() + @SuppressWarnings( { "rawtypes", "deprecation" } ) + /** {@inheritDoc} */ public Map<String, ArchiveEntry> getFiles() { inPublicApi.set( Boolean.TRUE ); try { - return delegate.isSupportingForced(); + return delegate.getFiles(); } finally { @@ -555,12 +554,12 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ - public void setDefaultDirectoryMode( final int mode ) + public boolean getIncludeEmptyDirs() { inPublicApi.set( Boolean.TRUE ); try { - delegate.setDefaultDirectoryMode( mode ); + return delegate.getIncludeEmptyDirs(); } finally { @@ -571,12 +570,12 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ - public void setDefaultFileMode( final int mode ) + public void setIncludeEmptyDirs( final boolean includeEmptyDirs ) { inPublicApi.set( Boolean.TRUE ); try { - delegate.setDefaultFileMode( mode ); + delegate.setIncludeEmptyDirs( includeEmptyDirs ); } finally { @@ -587,12 +586,12 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ - public void setDestFile( final File destFile ) + public boolean isForced() { inPublicApi.set( Boolean.TRUE ); try { - delegate.setDestFile( destFile ); + return delegate.isForced(); } finally { @@ -620,12 +619,12 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ - public void setIncludeEmptyDirs( final boolean includeEmptyDirs ) + public boolean isSupportingForced() { inPublicApi.set( Boolean.TRUE ); try { - delegate.setIncludeEmptyDirs( includeEmptyDirs ); + return delegate.isSupportingForced(); } finally { @@ -784,44 +783,6 @@ public class AssemblyProxyArchiver return true; } - private static final class DefaultFileInfo - implements FileInfo - { - - private final File inputFile; - - DefaultFileInfo( final File inputFile ) - { - this.inputFile = inputFile; - } - - public InputStream getContents() - throws IOException - { - return new FileInputStream( inputFile ); - } - - public String getName() - { - return inputFile.getName(); - } - - public boolean isDirectory() - { - return inputFile.isDirectory(); - } - - public boolean isFile() - { - return inputFile.isFile(); - } - - public boolean isSymbolicLink() - { - return false; - } - } - /** * {@inheritDoc} */ @@ -903,30 +864,6 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ - public int getFileMode() - { - return delegate.getFileMode(); - } - - /** - * {@inheritDoc} - */ - public int getOverrideDirectoryMode() - { - return delegate.getOverrideDirectoryMode(); - } - - /** - * {@inheritDoc} - */ - public int getOverrideFileMode() - { - return delegate.getOverrideFileMode(); - } - - /** - * {@inheritDoc} - */ public void setDirectoryMode( final int mode ) { inPublicApi.set( Boolean.TRUE ); @@ -943,6 +880,14 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ + public int getFileMode() + { + return delegate.getFileMode(); + } + + /** + * {@inheritDoc} + */ public void setFileMode( final int mode ) { inPublicApi.set( Boolean.TRUE ); @@ -959,6 +904,22 @@ public class AssemblyProxyArchiver /** * {@inheritDoc} */ + public int getOverrideDirectoryMode() + { + return delegate.getOverrideDirectoryMode(); + } + + /** + * {@inheritDoc} + */ + public int getOverrideFileMode() + { + return delegate.getOverrideFileMode(); + } + + /** + * {@inheritDoc} + */ public boolean isUseJvmChmod() { return useJvmChmod; @@ -988,4 +949,42 @@ public class AssemblyProxyArchiver delegate.setIgnorePermissions( ignorePermissions ); } + private static final class DefaultFileInfo + implements FileInfo + { + + private final File inputFile; + + DefaultFileInfo( final File inputFile ) + { + this.inputFile = inputFile; + } + + public InputStream getContents() + throws IOException + { + return new FileInputStream( inputFile ); + } + + public String getName() + { + return inputFile.getName(); + } + + public boolean isDirectory() + { + return inputFile.isDirectory(); + } + + public boolean isFile() + { + return inputFile.isFile(); + } + + public boolean isSymbolicLink() + { + return false; + } + } + }
Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java (from r1685251, 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/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedArchivedFileSet.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.archiver; +package org.apache.maven.plugins.assembly.archive.archiver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -25,8 +25,6 @@ import org.codehaus.plexus.components.io import java.io.File; -import static org.apache.maven.plugin.assembly.archive.archiver.PrefixedFileSet.combineSelectors; - /** * @version $Id$ */ @@ -81,7 +79,7 @@ class PrefixedArchivedFileSet */ public FileSelector[] getFileSelectors() { - return combineSelectors( fileSet.getFileSelectors(), selectors ); + return PrefixedFileSet.combineSelectors( fileSet.getFileSelectors(), selectors ); } /** Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java (from r1685251, 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/plugins/assembly/archive/archiver/PrefixedFileSet.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/PrefixedFileSet.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/archiver/PrefixedFileSet.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.archiver; +package org.apache.maven.plugins.assembly.archive.archiver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -61,24 +61,6 @@ class PrefixedFileSet /** * {@inheritDoc} */ - public String[] getExcludes() - { - return fileSet.getExcludes(); - } - - /** - * {@inheritDoc} - */ - public FileSelector[] getFileSelectors() - { - FileSelector[] sel = fileSet.getFileSelectors(); - final FileSelector[] selectors1 = selectors; - return combineSelectors( sel, selectors1 ); - } - - /** - * {@inheritDoc} - */ static FileSelector[] combineSelectors( FileSelector[] first, FileSelector[] second ) { if ( ( first != null ) && ( second != null ) ) @@ -99,6 +81,24 @@ class PrefixedFileSet } /** + * {@inheritDoc} + */ + public String[] getExcludes() + { + return fileSet.getExcludes(); + } + + /** + * {@inheritDoc} + */ + public FileSelector[] getFileSelectors() + { + FileSelector[] sel = fileSet.getFileSelectors(); + final FileSelector[] selectors1 = selectors; + return combineSelectors( sel, selectors1 ); + } + + /** * {@inheritDoc} */ public String[] getIncludes() Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/SarUnArchiver.java (from r1685251, 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/plugins/assembly/archive/archiver/SarUnArchiver.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/SarUnArchiver.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/SarUnArchiver.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/archiver/SarUnArchiver.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.archiver; +package org.apache.maven.plugins.assembly.archive.archiver; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,7 +24,8 @@ import org.codehaus.plexus.archiver.zip. /** * @author jdcasey * @version $Id$ - * //todo delete this class once the plexus maven plugin can merge a generated components.xml with an existing one. + * //todo delete this class once the plexus maven plugin can merge a generated components.xml with an + * existing one. */ class SarUnArchiver extends ZipUnArchiver Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhase.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhase.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhase.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhase.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhase.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; import org.codehaus.plexus.archiver.Archiver; /** @@ -45,9 +45,12 @@ public interface AssemblyArchiverPhase * added * @param configSource The configuration for this assembly build, normally derived from the plugin that launched * the assembly process. - * @throws ArchiveCreationException in case of an archive creation error. - * @throws AssemblyFormattingException in case of a assembly formatting exception. - * @throws InvalidAssemblerConfigurationException in case of an invalid assembler configuration. + * @throws org.apache.maven.plugins.assembly.archive.ArchiveCreationException in case of an archive + * creation error. + * @throws org.apache.maven.plugins.assembly.format.AssemblyFormattingException in case of a assembly + * formatting exception. + * @throws org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException in case of an invalid + * assembler configuration. */ void execute( Assembly assembly, Archiver archiver, AssemblerConfigurationSource configSource ) throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException, Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/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?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/AssemblyArchiverPhaseComparator.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ package org.apache.maven.plugin.assembly import java.util.Comparator; /** - * + * */ public class AssemblyArchiverPhaseComparator implements Comparator<AssemblyArchiverPhase> Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/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?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,15 +20,15 @@ package org.apache.maven.plugin.assembly */ import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.task.AddDependencySetsTask; -import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException; -import org.apache.maven.plugin.assembly.artifact.DependencyResolver; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.DependencySet; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.task.AddDependencySetsTask; +import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException; +import org.apache.maven.plugins.assembly.artifact.DependencyResolver; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.DependencySet; import org.apache.maven.project.ProjectBuilder; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.manager.ArchiverManager; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/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?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,14 +19,14 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.format.ReaderFormatter; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.FileItem; -import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.format.ReaderFormatter; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.FileItem; +import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.component.annotations.Component; @@ -38,7 +38,6 @@ import java.io.File; import java.io.IOException; import java.util.List; -import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.warnForPlatformSpecifics; import static org.codehaus.plexus.components.io.resources.ResourceFactory.createResource; /** @@ -87,7 +86,7 @@ public class FileItemAssemblyPhase final String outputDirectory1 = fileItem.getOutputDirectory(); - warnForPlatformSpecifics( getLogger(), outputDirectory1 ); + AssemblyFormatUtils.warnForPlatformSpecifics( getLogger(), outputDirectory1 ); final String outputDirectory = AssemblyFormatUtils.getOutputDirectory( outputDirectory1, configSource.getFinalName(), configSource, Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.task.AddFileSetsTask; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.FileSet; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.task.AddFileSetsTask; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.FileSet; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.logging.AbstractLogEnabled; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java (from r1685251, 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/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,28 +20,28 @@ package org.apache.maven.plugin.assembly */ import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.task.AddArtifactTask; -import org.apache.maven.plugin.assembly.archive.task.AddDependencySetsTask; -import org.apache.maven.plugin.assembly.archive.task.AddFileSetsTask; -import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException; -import org.apache.maven.plugin.assembly.artifact.DependencyResolver; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.functions.MavenProjects; -import org.apache.maven.plugin.assembly.functions.ModuleSetConsumer; -import org.apache.maven.plugin.assembly.model.Assemblies; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.DependencySet; -import org.apache.maven.plugin.assembly.model.FileSet; -import org.apache.maven.plugin.assembly.model.ModuleBinaries; -import org.apache.maven.plugin.assembly.model.ModuleSet; -import org.apache.maven.plugin.assembly.model.ModuleSources; -import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; -import org.apache.maven.plugin.assembly.utils.FilterUtils; -import org.apache.maven.plugin.assembly.utils.ProjectUtils; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.task.AddArtifactTask; +import org.apache.maven.plugins.assembly.archive.task.AddDependencySetsTask; +import org.apache.maven.plugins.assembly.archive.task.AddFileSetsTask; +import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException; +import org.apache.maven.plugins.assembly.artifact.DependencyResolver; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.functions.MavenProjects; +import org.apache.maven.plugins.assembly.functions.ModuleSetConsumer; +import org.apache.maven.plugins.assembly.model.Assemblies; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.DependencySet; +import org.apache.maven.plugins.assembly.model.FileSet; +import org.apache.maven.plugins.assembly.model.ModuleBinaries; +import org.apache.maven.plugins.assembly.model.ModuleSet; +import org.apache.maven.plugins.assembly.model.ModuleSources; +import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils; +import org.apache.maven.plugins.assembly.utils.FilterUtils; +import org.apache.maven.plugins.assembly.utils.ProjectUtils; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.codehaus.plexus.archiver.Archiver; @@ -63,10 +63,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.apache.maven.plugin.assembly.functions.MavenProjects.addTo; -import static org.apache.maven.plugin.assembly.functions.MavenProjects.log; -import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.artifactProjectInterpolator; -import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.moduleProjectInterpolator; +import static org.apache.maven.plugins.assembly.functions.MavenProjects.addTo; +import static org.apache.maven.plugins.assembly.functions.MavenProjects.log; /** * Handles the <moduleSets/> top-level section of the assembly descriptor. @@ -115,6 +113,66 @@ public class ModuleSetAssemblyPhase enableLogging( logger ); } + public static List<DependencySet> getDependencySets( final ModuleBinaries binaries ) + { + List<DependencySet> depSets = binaries.getDependencySets(); + + if ( ( ( depSets == null ) || depSets.isEmpty() ) && binaries.isIncludeDependencies() ) + { + final DependencySet impliedDependencySet = new DependencySet(); + + impliedDependencySet.setOutputDirectory( binaries.getOutputDirectory() ); + //impliedDependencySet.setOutputFileNameMapping( binaries.getOutputFileNameMapping() ); + impliedDependencySet.setFileMode( binaries.getFileMode() ); + impliedDependencySet.setDirectoryMode( binaries.getDirectoryMode() ); + impliedDependencySet.setExcludes( binaries.getExcludes() ); + impliedDependencySet.setIncludes( binaries.getIncludes() ); + impliedDependencySet.setUnpack( binaries.isUnpack() ); + // unpackOptions is handled in the first stage of dependency-set handling, below. + + depSets = Collections.singletonList( impliedDependencySet ); + } + + return depSets; + } + + @Nonnull + public static Set<MavenProject> getModuleProjects( final ModuleSet moduleSet, + final AssemblerConfigurationSource configSource, + final Logger logger ) + throws ArchiveCreationException + { + MavenProject project = configSource.getProject(); + Set<MavenProject> moduleProjects = null; + + if ( moduleSet.isUseAllReactorProjects() ) + { + if ( !moduleSet.isIncludeSubModules() ) + { + moduleProjects = new LinkedHashSet<MavenProject>( configSource.getReactorProjects() ); + } + + project = configSource.getReactorProjects().get( 0 ); + } + + if ( moduleProjects == null ) + { + try + { + moduleProjects = ProjectUtils.getProjectModules( project, configSource.getReactorProjects(), + moduleSet.isIncludeSubModules(), logger ); + } + catch ( final IOException e ) + { + throw new ArchiveCreationException( + "Error retrieving module-set for project: " + project.getId() + ": " + e.getMessage(), e ); + } + } + + return FilterUtils.filterProjects( moduleProjects, moduleSet.getIncludes(), moduleSet.getExcludes(), true, + logger ); + } + /** * {@inheritDoc} */ @@ -305,29 +363,6 @@ public class ModuleSetAssemblyPhase return result; } - public static List<DependencySet> getDependencySets( final ModuleBinaries binaries ) - { - List<DependencySet> depSets = binaries.getDependencySets(); - - if ( ( ( depSets == null ) || depSets.isEmpty() ) && binaries.isIncludeDependencies() ) - { - final DependencySet impliedDependencySet = new DependencySet(); - - impliedDependencySet.setOutputDirectory( binaries.getOutputDirectory() ); - //impliedDependencySet.setOutputFileNameMapping( binaries.getOutputFileNameMapping() ); - impliedDependencySet.setFileMode( binaries.getFileMode() ); - impliedDependencySet.setDirectoryMode( binaries.getDirectoryMode() ); - impliedDependencySet.setExcludes( binaries.getExcludes() ); - impliedDependencySet.setIncludes( binaries.getIncludes() ); - impliedDependencySet.setUnpack( binaries.isUnpack() ); - // unpackOptions is handled in the first stage of dependency-set handling, below. - - depSets = Collections.singletonList( impliedDependencySet ); - } - - return depSets; - } - void addModuleArtifact( final Artifact artifact, final MavenProject project, final Archiver archiver, final AssemblerConfigurationSource configSource, final ModuleBinaries binaries ) throws ArchiveCreationException, AssemblyFormattingException @@ -500,8 +535,10 @@ public class ModuleSetAssemblyPhase fs.setIncludes( fileSet.getIncludes() ); fs.setLineEnding( fileSet.getLineEnding() ); - FixedStringSearchInterpolator moduleProjectInterpolator = moduleProjectInterpolator( moduleProject ); - FixedStringSearchInterpolator artifactProjectInterpolator = artifactProjectInterpolator( moduleProject ); + FixedStringSearchInterpolator moduleProjectInterpolator = + AssemblyFormatUtils.moduleProjectInterpolator( moduleProject ); + FixedStringSearchInterpolator artifactProjectInterpolator = + AssemblyFormatUtils.artifactProjectInterpolator( moduleProject ); String destPathPrefix = ""; if ( sources.isIncludeModuleDirectory() ) { @@ -540,44 +577,6 @@ public class ModuleSetAssemblyPhase return fs; } - @Nonnull - public static Set<MavenProject> getModuleProjects( final ModuleSet moduleSet, - final AssemblerConfigurationSource configSource, - final Logger logger ) - throws ArchiveCreationException - { - MavenProject project = configSource.getProject(); - Set<MavenProject> moduleProjects = null; - - if ( moduleSet.isUseAllReactorProjects() ) - { - if ( !moduleSet.isIncludeSubModules() ) - { - moduleProjects = new LinkedHashSet<MavenProject>( configSource.getReactorProjects() ); - } - - project = configSource.getReactorProjects().get( 0 ); - } - - if ( moduleProjects == null ) - { - try - { - moduleProjects = ProjectUtils.getProjectModules( project, configSource.getReactorProjects(), - moduleSet.isIncludeSubModules(), logger ); - } - catch ( final IOException e ) - { - throw new ArchiveCreationException( - "Error retrieving module-set for project: " + project.getId() + ": " + e.getMessage(), e ); - } - } - - return FilterUtils.filterProjects( moduleProjects, moduleSet.getIncludes(), moduleSet.getExcludes(), true, - logger ); - } - - public int order() { // CHECKSTYLE_OFF: MagicNumber Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/PhaseOrder.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/PhaseOrder.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/PhaseOrder.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/PhaseOrder.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/PhaseOrder.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java (from r1685251, 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/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhase.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase; +package org.apache.maven.plugins.assembly.archive.phase; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,17 +19,17 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoBuilderConfigSourceWrapper; -import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoInfoWrapper; -import org.apache.maven.plugin.assembly.archive.task.AddDirectoryTask; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.Repository; -import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.phase.wrappers.RepoBuilderConfigSourceWrapper; +import org.apache.maven.plugins.assembly.archive.phase.wrappers.RepoInfoWrapper; +import org.apache.maven.plugins.assembly.archive.task.AddDirectoryTask; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.Repository; +import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.apache.maven.shared.repository.RepositoryAssembler; import org.apache.maven.shared.repository.RepositoryAssemblyException; import org.apache.maven.shared.repository.RepositoryBuilderConfigSource; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java (from r1685251, 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/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase.wrappers; +package org.apache.maven.plugins.assembly.archive.phase.wrappers; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.model.GroupVersionAlignment; +import org.apache.maven.plugins.assembly.model.GroupVersionAlignment; import java.util.List; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/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?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/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 Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase.wrappers; +package org.apache.maven.plugins.assembly.archive.phase.wrappers; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ package org.apache.maven.plugin.assembly */ import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.repository.RepositoryBuilderConfigSource; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/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?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/wrappers/RepoInfoWrapper.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/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 Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.phase.wrappers; +package org.apache.maven.plugins.assembly.archive.phase.wrappers; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.model.GroupVersionAlignment; -import org.apache.maven.plugin.assembly.model.Repository; +import org.apache.maven.plugins.assembly.model.GroupVersionAlignment; +import org.apache.maven.plugins.assembly.model.Repository; import org.apache.maven.shared.repository.model.RepositoryInfo; import java.util.ArrayList; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java (from r1685251, 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/plugins/assembly/archive/task/AddArtifactTask.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/task/AddArtifactTask.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.task; +package org.apache.maven.plugins.assembly.archive.task; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,11 +20,11 @@ package org.apache.maven.plugin.assembly */ import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; @@ -40,9 +40,6 @@ import java.io.IOException; import java.nio.charset.Charset; import java.util.List; -import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.artifactProjectInterpolator; -import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.moduleProjectInterpolator; - /** * @version $Id$ */ @@ -51,6 +48,14 @@ public class AddArtifactTask public static final String[] DEFAULT_INCLUDES_ARRAY = { "**/*" }; + private final Artifact artifact; + + private final Logger logger; + + private final InputStreamTransformer transformer; + + private final Charset encoding; + private int directoryMode = -1; private int fileMode = -1; @@ -61,8 +66,6 @@ public class AddArtifactTask private List<String> excludes; - private final Artifact artifact; - private MavenProject project; private MavenProject moduleProject; @@ -73,12 +76,6 @@ public class AddArtifactTask private String outputFileNameMapping; - private final Logger logger; - - private final InputStreamTransformer transformer; - - private final Charset encoding; - public AddArtifactTask( final Artifact artifact, final Logger logger, InputStreamTransformer transformer, Charset encoding ) { @@ -103,8 +100,8 @@ public class AddArtifactTask String destDirectory = AssemblyFormatUtils.getOutputDirectory( outputDirectory, configSource.getFinalName(), configSource, - moduleProjectInterpolator( moduleProject ), - artifactProjectInterpolator( project ) ); + AssemblyFormatUtils.moduleProjectInterpolator( moduleProject ), + AssemblyFormatUtils.artifactProjectInterpolator( project ) ); boolean fileModeSet = false; boolean dirModeSet = false; @@ -156,8 +153,8 @@ public class AddArtifactTask final String tempMapping = AssemblyFormatUtils.evaluateFileNameMapping( outputFileNameMapping, artifact, configSource.getProject(), moduleArtifact, configSource, - moduleProjectInterpolator( moduleProject ), - artifactProjectInterpolator( project ) ); + AssemblyFormatUtils.moduleProjectInterpolator( moduleProject ), + AssemblyFormatUtils.artifactProjectInterpolator( project ) ); final String outputLocation = destDirectory + tempMapping; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java (from r1685251, 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/plugins/assembly/archive/task/AddDependencySetsTask.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/task/AddDependencySetsTask.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.task; +package org.apache.maven.plugins.assembly.archive.task; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,16 +23,16 @@ import org.apache.maven.artifact.Artifac import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Dependency; import org.apache.maven.model.Model; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.format.ReaderFormatter; -import org.apache.maven.plugin.assembly.model.DependencySet; -import org.apache.maven.plugin.assembly.model.UnpackOptions; -import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; -import org.apache.maven.plugin.assembly.utils.FilterUtils; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.format.ReaderFormatter; +import org.apache.maven.plugins.assembly.model.DependencySet; +import org.apache.maven.plugins.assembly.model.UnpackOptions; +import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils; +import org.apache.maven.plugins.assembly.utils.FilterUtils; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingException; @@ -53,9 +53,6 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.artifactProjectInterpolator; -import static org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils.moduleProjectInterpolator; - /** * @version $Id$ */ @@ -79,18 +76,18 @@ public class AddDependencySetsTask private final MavenProject project; - private MavenProject moduleProject; - private final ProjectBuilder projectBuilder1; + private final Set<Artifact> resolvedArtifacts; + + private MavenProject moduleProject; + private String defaultOutputDirectory; private String defaultOutputFileNameMapping; private Artifact moduleArtifact; - private final Set<Artifact> resolvedArtifacts; - public AddDependencySetsTask( final List<DependencySet> dependencySets, final Set<Artifact> resolvedArtifacts, final MavenProject project, ProjectBuilder projectBuilder, final Logger logger ) @@ -358,8 +355,10 @@ public class AddDependencySetsTask String outputDirectory = dependencySet.getOutputDirectory(); - FixedStringSearchInterpolator moduleProjectInterpolator = moduleProjectInterpolator( moduleProject ); - FixedStringSearchInterpolator artifactProjectInterpolator = artifactProjectInterpolator( depProject ); + FixedStringSearchInterpolator moduleProjectInterpolator = + AssemblyFormatUtils.moduleProjectInterpolator( moduleProject ); + FixedStringSearchInterpolator artifactProjectInterpolator = + AssemblyFormatUtils.artifactProjectInterpolator( depProject ); outputDirectory = AssemblyFormatUtils.getOutputDirectory( outputDirectory, depProject.getBuild().getFinalName(), configSource, moduleProjectInterpolator, artifactProjectInterpolator ); Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java (from r1685251, 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/plugins/assembly/archive/task/AddDirectoryTask.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDirectoryTask.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/task/AddDirectoryTask.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.task; +package org.apache.maven.plugins.assembly.archive.task; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,8 +19,8 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.util.DefaultFileSet; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java (from r1685251, 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/plugins/assembly/archive/task/AddFileSetsTask.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/archive/task/AddFileSetsTask.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.task; +package org.apache.maven.plugins.assembly.archive.task; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,13 +19,13 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; -import org.apache.maven.plugin.assembly.format.ReaderFormatter; -import org.apache.maven.plugin.assembly.model.FileSet; -import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; -import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.format.ReaderFormatter; +import org.apache.maven.plugins.assembly.model.FileSet; +import org.apache.maven.plugins.assembly.utils.AssemblyFormatUtils; +import org.apache.maven.plugins.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.components.io.functions.InputStreamTransformer; @@ -112,7 +112,7 @@ public class AddFileSetsTask destDirectory = fileSet.getDirectory(); } - AssemblyFormatUtils.warnForPlatformSpecifics( logger, destDirectory ); + AssemblyFormatUtils.warnForPlatformSpecifics( logger, destDirectory ); destDirectory = AssemblyFormatUtils.getOutputDirectory( destDirectory, configSource.getFinalName(), configSource, Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ArchiverTask.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/ArchiverTask.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ArchiverTask.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ArchiverTask.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/ArchiverTask.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/ArchiverTask.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ArchiverTask.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.task; +package org.apache.maven.plugins.assembly.archive.task; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,10 +19,10 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; import org.codehaus.plexus.archiver.Archiver; /** Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ProjectBuildingRequestCreator.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/ProjectBuildingRequestCreator.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ProjectBuildingRequestCreator.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ProjectBuildingRequestCreator.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/ProjectBuildingRequestCreator.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/ProjectBuildingRequestCreator.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/task/ProjectBuildingRequestCreator.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.archive.task; +package org.apache.maven.plugins.assembly.archive.task; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -43,8 +43,8 @@ public class ProjectBuildingRequestCreat ProjectBuildingRequest projectBuildingRequest1 = new DefaultProjectBuildingRequest(); Object repositorySession = invoke( session, "getRepositorySession" ); - Method setRepositorySession = getMethod( projectBuildingRequest1.getClass(), "setRepositorySession", - ECLIPSE != null ? ECLIPSE : AETHER ); + Method setRepositorySession = + getMethod( projectBuildingRequest1.getClass(), "setRepositorySession", ECLIPSE != null ? ECLIPSE : AETHER ); invoke( setRepositorySession, projectBuildingRequest1, repositorySession ); injectSession( projectBuildingRequest1, session ); return projectBuildingRequest1; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java (from r1685251, 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/plugins/assembly/artifact/DefaultDependencyResolver.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/artifact/DefaultDependencyResolver.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.artifact; +package org.apache.maven.plugins.assembly.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,16 +26,16 @@ import org.apache.maven.artifact.resolve import org.apache.maven.artifact.resolver.ArtifactResolutionResult; import org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; -import org.apache.maven.plugin.assembly.archive.phase.ModuleSetAssemblyPhase; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.DependencySet; -import org.apache.maven.plugin.assembly.model.ModuleBinaries; -import org.apache.maven.plugin.assembly.model.ModuleSet; -import org.apache.maven.plugin.assembly.model.Repository; -import org.apache.maven.plugin.assembly.resolved.AssemblyId; -import org.apache.maven.plugin.assembly.utils.FilterUtils; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.archive.ArchiveCreationException; +import org.apache.maven.plugins.assembly.archive.phase.ModuleSetAssemblyPhase; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.DependencySet; +import org.apache.maven.plugins.assembly.model.ModuleBinaries; +import org.apache.maven.plugins.assembly.model.ModuleSet; +import org.apache.maven.plugins.assembly.model.Repository; +import org.apache.maven.plugins.assembly.resolved.AssemblyId; +import org.apache.maven.plugins.assembly.utils.FilterUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.InvalidDependencyVersionException; import org.apache.maven.repository.RepositorySystem; @@ -298,7 +298,7 @@ public class DefaultDependencyResolver // type final Artifact artifact = resolver.createArtifact( p.getGroupId(), p.getArtifactId(), p.getVersion(), - p.getPackaging() ); + p.getPackaging() ); p.setArtifact( artifact ); } } Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolutionException.java (from r1685251, 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/plugins/assembly/artifact/DependencyResolutionException.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolutionException.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolutionException.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/artifact/DependencyResolutionException.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.artifact; +package org.apache.maven.plugins.assembly.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolver.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolver.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolver.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolver.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.artifact; +package org.apache.maven.plugins.assembly.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,10 +20,10 @@ package org.apache.maven.plugin.assembly */ import org.apache.maven.artifact.Artifact; -import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.model.DependencySet; -import org.apache.maven.plugin.assembly.model.ModuleSet; +import org.apache.maven.plugins.assembly.AssemblerConfigurationSource; +import org.apache.maven.plugins.assembly.model.Assembly; +import org.apache.maven.plugins.assembly.model.DependencySet; +import org.apache.maven.plugins.assembly.model.ModuleSet; import java.util.List; import java.util.Map; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfo.java (from r1685251, 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/plugins/assembly/artifact/ResolutionManagementInfo.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfo.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/ResolutionManagementInfo.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/artifact/ResolutionManagementInfo.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.artifact; +package org.apache.maven.plugins.assembly.artifact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -34,16 +34,16 @@ import java.util.Set; */ class ResolutionManagementInfo { - private boolean resolutionRequired; - private final ScopeArtifactFilter scopeFilter = new ScopeArtifactFilter(); - private boolean resolvedTransitively; - private final Set<MavenProject> enabledProjects = new LinkedHashSet<MavenProject>(); private final LinkedHashSet<Artifact> artifacts = new LinkedHashSet<Artifact>(); + private boolean resolutionRequired; + + private boolean resolvedTransitively; + ResolutionManagementInfo( final MavenProject currentProject ) { enabledProjects.add( currentProject ); Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java (from r1685251, 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/plugins/assembly/filter/AbstractLineAggregatingHandler.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/AbstractLineAggregatingHandler.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/filter/AbstractLineAggregatingHandler.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.filter; +package org.apache.maven.plugins.assembly.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,7 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils; +import org.apache.maven.plugins.assembly.utils.AssemblyFileUtils; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.ResourceIterator; Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java (from r1685251, 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/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ComponentsXmlArchiverFileFilter.java&r1=1685251&r2=1685315&rev=1685315&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/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.filter; +package org.apache.maven.plugins.assembly.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -56,6 +56,8 @@ import java.util.Map; public class ComponentsXmlArchiverFileFilter implements ContainerDescriptorHandler { + public static final String COMPONENTS_XML_PATH = "META-INF/plexus/components.xml"; + // [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. @@ -63,8 +65,6 @@ public class ComponentsXmlArchiverFileFi private boolean excludeOverride = false; - public static final String COMPONENTS_XML_PATH = "META-INF/plexus/components.xml"; - void addComponentsXml( final Reader componentsReader ) throws XmlPullParserException, IOException { Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ContainerDescriptorHandler.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ContainerDescriptorHandler.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ContainerDescriptorHandler.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ContainerDescriptorHandler.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ContainerDescriptorHandler.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/ContainerDescriptorHandler.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/ContainerDescriptorHandler.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.filter; +package org.apache.maven.plugins.assembly.filter; /* * Licensed to the Apache Software Foundation (ASF) under one Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/MetaInfServicesHandler.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/MetaInfServicesHandler.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/MetaInfServicesHandler.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfServicesHandler.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/MetaInfServicesHandler.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.filter; +package org.apache.maven.plugins.assembly.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,7 @@ import org.codehaus.plexus.component.ann import org.codehaus.plexus.components.io.fileselectors.FileInfo; /** - * + * */ @Component( role = ContainerDescriptorHandler.class, hint = "metaInf-services", instantiationStrategy = "per-lookup" ) public class MetaInfServicesHandler Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/MetaInfSpringHandler.java (from r1685251, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/MetaInfSpringHandler.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/MetaInfSpringHandler.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java&r1=1685251&r2=1685315&rev=1685315&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/filter/MetaInfSpringHandler.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/filter/MetaInfSpringHandler.java Sat Jun 13 20:10:29 2015 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.filter; +package org.apache.maven.plugins.assembly.filter; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -23,7 +23,7 @@ import org.codehaus.plexus.component.ann import org.codehaus.plexus.components.io.fileselectors.FileInfo; /** - * + * */ @Component( role = ContainerDescriptorHandler.class, hint = "metaInf-spring", instantiationStrategy = "per-lookup" ) public class MetaInfSpringHandler
