Author: krosenvold Date: Sun Nov 2 17:48:16 2014 New Revision: 1636157 URL: http://svn.apache.org/r1636157 Log: Removed the 'Resolved*' classes I introduced a few commits ago.
Improved understanding made me realize this is not the way to go Added: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java - copied, changed from r1636098, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java - copied, changed from r1636098, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java Removed: 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/resolved/ResolvedModuleSet.java maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties 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/phase/AssemblyArchiverPhase.java maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.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/artifact/DefaultDependencyResolver.java maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DependencyResolver.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/phase/DependencySetAssemblyPhaseTest.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/format/ReaderFormatterTest.java Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml?rev=1636157&r1=1636156&r2=1636157&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml Sun Nov 2 17:48:16 2014 @@ -1,3 +1,21 @@ +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml?rev=1636157&r1=1636156&r2=1636157&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml Sun Nov 2 17:48:16 2014 @@ -1,5 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> Modified: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties?rev=1636157&r1=1636156&r2=1636157&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties Sun Nov 2 17:48:16 2014 @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + my.name=John Doe 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=1636157&r1=1636156&r2=1636157&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 Sun Nov 2 17:48:16 2014 @@ -19,33 +19,18 @@ package org.apache.maven.plugin.assembly * under the License. */ -import java.io.File; -import java.io.IOException; -import java.io.StringReader; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.DebugConfigurationListener; import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; import org.apache.maven.plugin.assembly.archive.archiver.AssemblyProxyArchiver; import org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase; import org.apache.maven.plugin.assembly.artifact.DependencyResolutionException; -import org.apache.maven.plugin.assembly.artifact.DependencyResolver; import org.apache.maven.plugin.assembly.filter.ComponentsXmlArchiverFileFilter; import org.apache.maven.plugin.assembly.filter.ContainerDescriptorHandler; import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; import org.apache.maven.plugin.assembly.interpolation.AssemblyExpressionEvaluator; import org.apache.maven.plugin.assembly.model.Assembly; import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig; -import org.apache.maven.plugin.assembly.model.ModuleSet; -import org.apache.maven.plugin.assembly.resolved.ResolvedAssembly; -import org.apache.maven.plugin.assembly.resolved.ResolvedModuleSet; import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils; import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; import org.codehaus.plexus.PlexusConstants; @@ -79,6 +64,15 @@ import org.codehaus.plexus.util.xml.Xpp3 import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * Controller component designed to organize the many activities involved in creating an assembly archive. This includes * locating and configuring {@link Archiver} instances, executing multiple {@link AssemblyArchiverPhase} instances to @@ -96,12 +90,10 @@ public class DefaultAssemblyArchiver @Requirement private ArchiverManager archiverManager; - @Requirement - private DependencyResolver dependencyResolver; - @Requirement( role = AssemblyArchiverPhase.class ) private List<AssemblyArchiverPhase> assemblyPhases; + @SuppressWarnings( "MismatchedQueryAndUpdateOfCollection" ) @Requirement( role = ContainerDescriptorHandler.class ) private Map<String, ContainerDescriptorHandler> containerDescriptorHandlers; @@ -115,14 +107,11 @@ public class DefaultAssemblyArchiver // introduced for testing. /** * @param archiverManager The archive manager. - * @param resolver The {@link DependencyResolver}. * @param assemblyPhases The list of {@link AssemblyArchiverPhase} */ - protected DefaultAssemblyArchiver( final ArchiverManager archiverManager, final DependencyResolver resolver, - final List<AssemblyArchiverPhase> assemblyPhases ) + protected DefaultAssemblyArchiver( final ArchiverManager archiverManager, final List<AssemblyArchiverPhase> assemblyPhases ) { this.archiverManager = archiverManager; - dependencyResolver = resolver; this.assemblyPhases = assemblyPhases; } @@ -168,25 +157,9 @@ public class DefaultAssemblyArchiver archiver.setDestFile( destFile ); - List<ResolvedModuleSet> resolvedModuleSets = new ArrayList<ResolvedModuleSet>(); - for ( ModuleSet moduleSet : assembly.getModuleSets() ) - { - resolvedModuleSets.add( dependencyResolver.resolve( assembly, moduleSet, configSource ) ); - } - - // OK, this piece of code contains all the stuff left after I extracted resolvedModuleSets. - // this can probably be simplified quite a lot, since the module sets now have their - // own artifact resolution. - final Set<Artifact> dependencySetArtifacts = dependencyResolver.resolve( assembly, configSource ); - - // CHECKSTYLE_OFF: LineLength - final ResolvedAssembly resolvedAssembly = - ResolvedAssembly.create( assembly ).withResolvedModuleSets( resolvedModuleSets ).withDependencySetArtifacts( dependencySetArtifacts ); - // CHECKSTYLE_ON: LineLength - for ( AssemblyArchiverPhase phase : assemblyPhases ) { - phase.execute( resolvedAssembly, archiver, configSource ); + phase.execute( assembly, archiver, configSource ); } archiver.createArchive(); Modified: 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/plugin/assembly/archive/phase/AssemblyArchiverPhase.java?rev=1636157&r1=1636156&r2=1636157&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/plugin/assembly/archive/phase/AssemblyArchiverPhase.java Sun Nov 2 17:48:16 2014 @@ -22,8 +22,9 @@ package org.apache.maven.plugin.assembly 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.resolved.ResolvedAssembly; +import org.apache.maven.plugin.assembly.model.Assembly; import org.codehaus.plexus.archiver.Archiver; /** @@ -47,6 +48,7 @@ public interface AssemblyArchiverPhase * @throws AssemblyFormattingException in case of a assembly formatting exception. * @throws InvalidAssemblerConfigurationException in case of an invalid assembler configuration. */ - void execute( ResolvedAssembly assembly, Archiver archiver, AssemblerConfigurationSource configSource ) - throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException; + void execute( Assembly assembly, Archiver archiver, AssemblerConfigurationSource configSource ) + throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException, + DependencyResolutionException; } Modified: 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/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java?rev=1636157&r1=1636156&r2=1636157&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/plugin/assembly/archive/phase/DependencySetAssemblyPhase.java Sun Nov 2 17:48:16 2014 @@ -19,12 +19,15 @@ package org.apache.maven.plugin.assembly * under the License. */ +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.resolved.ResolvedAssembly; +import org.apache.maven.plugin.assembly.model.Assembly; import org.apache.maven.project.MavenProjectBuilder; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.manager.ArchiverManager; @@ -33,9 +36,11 @@ import org.codehaus.plexus.component.ann import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.logging.Logger; +import java.util.Set; + /** * Handles the top-level <dependencySets/> section of the assembly descriptor. - * + * * @version $Id$ */ @Component( role = AssemblyArchiverPhase.class, hint = "dependency-sets" ) @@ -50,6 +55,10 @@ public class DependencySetAssemblyPhase @Requirement private ArchiverManager archiverManager; + @Requirement + private DependencyResolver dependencyResolver; + + /** * Default constructor. */ @@ -60,24 +69,28 @@ public class DependencySetAssemblyPhase /** * @param projectBuilder The Maven Project Builder. - * @param logger The Logger. + * @param logger The Logger. */ - public DependencySetAssemblyPhase( final MavenProjectBuilder projectBuilder, final Logger logger ) + public DependencySetAssemblyPhase( final MavenProjectBuilder projectBuilder, DependencyResolver dependencyResolver, final Logger logger ) { this.projectBuilder = projectBuilder; + this.dependencyResolver = dependencyResolver; enableLogging( logger ); } /** * {@inheritDoc} */ - public void execute( final ResolvedAssembly assembly, final Archiver archiver, + public void execute( final Assembly assembly, final Archiver archiver, final AssemblerConfigurationSource configSource ) - throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException + throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException, + DependencyResolutionException { + + Set<Artifact> resolved = dependencyResolver.resolve( assembly, configSource ); final AddDependencySetsTask task = - new AddDependencySetsTask( assembly.getDependencySets(), assembly.getResolvedDependencySetArtifacts(), - configSource.getProject(), projectBuilder, getLogger() ); + new AddDependencySetsTask( assembly.getDependencySets(), resolved, configSource.getProject(), + projectBuilder, getLogger() ); task.execute( archiver, configSource ); } Modified: 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/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?rev=1636157&r1=1636156&r2=1636157&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/plugin/assembly/archive/phase/FileItemAssemblyPhase.java Sun Nov 2 17:48:16 2014 @@ -25,8 +25,8 @@ import org.apache.maven.plugin.assembly. 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.resolved.ResolvedAssembly; import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; import org.codehaus.plexus.archiver.Archiver; @@ -63,7 +63,7 @@ public class FileItemAssemblyPhase /** * {@inheritDoc} */ - public void execute( final ResolvedAssembly assembly, final Archiver archiver, + public void execute( final Assembly assembly, final Archiver archiver, final AssemblerConfigurationSource configSource ) throws ArchiveCreationException, AssemblyFormattingException { Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java?rev=1636157&r1=1636156&r2=1636157&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhase.java Sun Nov 2 17:48:16 2014 @@ -25,8 +25,8 @@ import org.apache.maven.plugin.assembly. 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.plugin.assembly.resolved.ResolvedAssembly; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.logging.AbstractLogEnabled; @@ -47,7 +47,7 @@ public class FileSetAssemblyPhase /** * {@inheritDoc} */ - public void execute( @Nonnull final ResolvedAssembly assembly, final Archiver archiver, + public void execute( @Nonnull final Assembly assembly, final Archiver archiver, final AssemblerConfigurationSource configSource ) throws ArchiveCreationException, AssemblyFormattingException { 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=1636157&r1=1636156&r2=1636157&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 Sun Nov 2 17:48:16 2014 @@ -40,16 +40,17 @@ import org.apache.maven.plugin.assembly. 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.format.ReaderFormatter; +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.resolved.ResolvedAssembly; -import org.apache.maven.plugin.assembly.resolved.ResolvedModuleSet; -import org.apache.maven.plugin.assembly.resolved.functions.ResolvedModuleSetConsumer; +import org.apache.maven.plugin.assembly.resolved.functions.ModuleSetConsumer; import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; import org.apache.maven.plugin.assembly.utils.FilterUtils; import org.apache.maven.plugin.assembly.utils.ProjectUtils; @@ -60,7 +61,6 @@ import org.codehaus.plexus.archiver.Arch import org.codehaus.plexus.archiver.manager.ArchiverManager; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.components.io.functions.InputStreamTransformer; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.logging.Logger; @@ -87,6 +87,9 @@ public class ModuleSetAssemblyPhase @Requirement private ArchiverManager archiverManager; + @Requirement + private DependencyResolver dependencyResolver; + /** * Create an instance. */ @@ -99,34 +102,35 @@ public class ModuleSetAssemblyPhase * @param projectBuilder The project builder. * @param logger The logger. */ - public ModuleSetAssemblyPhase( final MavenProjectBuilder projectBuilder, final Logger logger ) + public ModuleSetAssemblyPhase( final MavenProjectBuilder projectBuilder, DependencyResolver dependencyResolver, final Logger logger ) { this.projectBuilder = projectBuilder; + this.dependencyResolver = dependencyResolver; enableLogging( logger ); } /** * {@inheritDoc} */ - public void execute( final ResolvedAssembly assembly, final Archiver archiver, + public void execute( final Assembly assembly, final Archiver archiver, final AssemblerConfigurationSource configSource ) throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException { - assembly.forEachResolvedModule( new ResolvedModuleSetConsumer() + Assemblies.forEachResolvedModule(assembly, new ModuleSetConsumer() { - public void accept( ResolvedModuleSet resolvedModule ) + public void accept( ModuleSet resolvedModule ) throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException { - validate( resolvedModule.getModuleSet(), configSource ); + validate( resolvedModule, configSource ); final Set<MavenProject> moduleProjects = - getModuleProjects( resolvedModule.getModuleSet(), configSource, getLogger() ); + getModuleProjects( resolvedModule, configSource, getLogger() ); - final ModuleSources sources = resolvedModule.getModuleSet().getSources(); + final ModuleSources sources = resolvedModule.getSources(); addModuleSourceFileSets( sources, moduleProjects, archiver, configSource ); - final ModuleBinaries binaries = resolvedModule.getModuleSet().getBinaries(); - addModuleBinaries( resolvedModule, binaries, moduleProjects, archiver, configSource ); + final ModuleBinaries binaries = resolvedModule.getBinaries(); + addModuleBinaries( assembly, resolvedModule, binaries, moduleProjects, archiver, configSource ); } } ); } @@ -172,7 +176,7 @@ public class ModuleSetAssemblyPhase } } - void addModuleBinaries( ResolvedModuleSet resolvedModule, final ModuleBinaries binaries, + void addModuleBinaries( final Assembly assembly, ModuleSet moduleSet, final ModuleBinaries binaries, final Set<MavenProject> projects, final Archiver archiver, final AssemblerConfigurationSource configSource ) throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException @@ -248,6 +252,17 @@ public class ModuleSetAssemblyPhase if ( depSets != null ) { + Set<Artifact> resolved = null; + try + { + resolved = + dependencyResolver.resolve( assembly, moduleSet, configSource ); + } + catch ( DependencyResolutionException e ) + { + throw new ArchiveCreationException( "While resolving dependencies:", e ); + } + for ( final DependencySet ds : depSets ) { // NOTE: Disabling useProjectArtifact flag, since module artifact has already been handled! @@ -277,7 +292,7 @@ public class ModuleSetAssemblyPhase getLogger().debug( "Processing binary dependencies for module project: " + moduleProject.getId() ); final AddDependencySetsTask task = - new AddDependencySetsTask( depSets, resolvedModule.getArtifacts(), moduleProject, projectBuilder, + new AddDependencySetsTask( depSets, resolved, moduleProject, projectBuilder, getLogger() ); task.setModuleProject( moduleProject ); 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=1636157&r1=1636156&r2=1636157&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 Sun Nov 2 17:48:16 2014 @@ -29,8 +29,8 @@ import org.apache.maven.plugin.assembly. 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.resolved.ResolvedAssembly; import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils; import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; import org.apache.maven.shared.repository.RepositoryAssembler; @@ -69,7 +69,7 @@ public class RepositoryAssemblyPhase * {@inheritDoc} */ @SuppressWarnings( "ResultOfMethodCallIgnored" ) - public void execute( final ResolvedAssembly assembly, final Archiver archiver, + public void execute( final Assembly assembly, final Archiver archiver, final AssemblerConfigurationSource configSource ) throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException { 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=1636157&r1=1636156&r2=1636157&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 Sun Nov 2 17:48:16 2014 @@ -45,7 +45,6 @@ import org.apache.maven.plugin.assembly. 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.resolved.ResolvedModuleSet; import org.apache.maven.plugin.assembly.utils.FilterUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.InvalidDependencyVersionException; @@ -121,8 +120,8 @@ public class DefaultDependencyResolver return artifacts; } - public ResolvedModuleSet resolve( final Assembly assembly, ModuleSet moduleSet, - final AssemblerConfigurationSource configSource ) + public Set<Artifact> resolve( final Assembly assembly, ModuleSet moduleSet, + final AssemblerConfigurationSource configSource ) throws DependencyResolutionException { final MavenProject currentProject = configSource.getProject(); @@ -133,10 +132,9 @@ public class DefaultDependencyResolver updateDependencySetResolutionRequirements( assembly.getDependencySets(), info, assemblyId, currentProject ); updateModuleSetResolutionRequirements( assemblyId, moduleSet, info, configSource ); - ResolvedModuleSet base = ResolvedModuleSet.createResolvedModuleSet( moduleSet ); if ( !info.isResolutionRequired() ) { - return base.withArtifacts( new HashSet<Artifact>() ); + return new HashSet<Artifact>(); } final List<ArtifactRepository> repos = @@ -154,7 +152,7 @@ public class DefaultDependencyResolver artifacts = resolveNonTransitively( assembly, artifacts, configSource, repos ); } - return base.withArtifacts( artifacts ); + return artifacts; } Set<Artifact> resolveNonTransitively( final Assembly assembly, final Set<Artifact> dependencyArtifacts, Modified: 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/plugin/assembly/artifact/DependencyResolver.java?rev=1636157&r1=1636156&r2=1636157&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/plugin/assembly/artifact/DependencyResolver.java Sun Nov 2 17:48:16 2014 @@ -23,7 +23,6 @@ import org.apache.maven.artifact.Artifac import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; import org.apache.maven.plugin.assembly.model.Assembly; import org.apache.maven.plugin.assembly.model.ModuleSet; -import org.apache.maven.plugin.assembly.resolved.ResolvedModuleSet; import java.util.Set; @@ -42,7 +41,7 @@ public interface DependencyResolver Set<Artifact> resolve( Assembly assembly, AssemblerConfigurationSource configSource ) throws DependencyResolutionException; - ResolvedModuleSet resolve( final Assembly assembly, ModuleSet moduleSet, + Set<Artifact> resolve( final Assembly assembly, ModuleSet moduleSet, final AssemblerConfigurationSource configSource ) throws DependencyResolutionException; } \ No newline at end of file Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java (from r1636098, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java&r1=1636098&r2=1636157&rev=1636157&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java Sun Nov 2 17:48:16 2014 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.assembly.resolved.functions; +package org.apache.maven.plugin.assembly.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,10 +22,17 @@ package org.apache.maven.plugin.assembly 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.resolved.ResolvedModuleSet; +import org.apache.maven.plugin.assembly.resolved.functions.ModuleSetConsumer; -public interface ResolvedModuleSetConsumer +public class Assemblies { - void accept( ResolvedModuleSet resolvedModule ) - throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException; + + public static void forEachResolvedModule( Assembly assembly, ModuleSetConsumer moduleSetConsumer ) + throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException + { + for ( ModuleSet resolvedModuleSet : assembly.getModuleSets() ) + { + moduleSetConsumer.accept( resolvedModuleSet ); + } + } } Copied: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java (from r1636098, maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java&r1=1636098&r2=1636157&rev=1636157&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ResolvedModuleSetConsumer.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java Sun Nov 2 17:48:16 2014 @@ -22,10 +22,10 @@ package org.apache.maven.plugin.assembly 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.resolved.ResolvedModuleSet; +import org.apache.maven.plugin.assembly.model.ModuleSet; -public interface ResolvedModuleSetConsumer +public interface ModuleSetConsumer { - void accept( ResolvedModuleSet resolvedModule ) + void accept( ModuleSet resolvedModule ) throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException; } 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=1636157&r1=1636156&r2=1636157&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 Sun Nov 2 17:48:16 2014 @@ -30,17 +30,13 @@ import org.apache.maven.plugin.assembly. 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.resolved.ResolvedAssembly; import org.apache.maven.plugin.assembly.testutils.TestFileManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.PlexusContainerException; -import org.codehaus.plexus.archiver.ArchivedFileSet; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; -import org.codehaus.plexus.archiver.FileSet; -import org.codehaus.plexus.archiver.ResourceIterator; import org.codehaus.plexus.archiver.diags.NoOpArchiver; import org.codehaus.plexus.archiver.manager.ArchiverManager; import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; @@ -48,8 +44,6 @@ import org.codehaus.plexus.archiver.tar. import org.codehaus.plexus.archiver.tar.TarLongFileMode; import org.codehaus.plexus.archiver.war.WarArchiver; import org.codehaus.plexus.archiver.zip.ZipArchiver; -import org.codehaus.plexus.components.io.resources.PlexusIoResource; -import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; import org.codehaus.plexus.util.FileUtils; @@ -64,7 +58,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; -import java.util.Map; import static org.easymock.EasyMock.*; import static org.junit.Assert.*; @@ -114,7 +107,7 @@ public class DefaultAssemblyArchiverTest @Test public void testCreateArchive() throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException, - IOException + IOException, DependencyResolutionException { final EasyMockSupport mm = new EasyMockSupport(); @@ -125,7 +118,7 @@ public class DefaultAssemblyArchiverTest final AssemblyArchiverPhase phase = mm.createControl().createMock(AssemblyArchiverPhase.class ); - phase.execute( (ResolvedAssembly)anyObject(), (Archiver)anyObject(), (AssemblerConfigurationSource)anyObject() ); + phase.execute( (Assembly)anyObject(), (Archiver)anyObject(), (AssemblerConfigurationSource)anyObject() ); final AssemblerConfigurationSource configSource = mm.createControl().createMock( AssemblerConfigurationSource.class ); @@ -164,15 +157,15 @@ public class DefaultAssemblyArchiverTest final Assembly assembly = new Assembly(); assembly.setId( "id" ); - try - { - expect( macMgr.dependencyResolver.resolve( assembly, configSource )).andReturn( new HashSet<Artifact>( ) ); + // try + // { + // expect( macMgr.dependencyResolver.resolve( (Assembly) anyObject(), (AssemblerConfigurationSource) anyObject() )).andReturn( new HashSet<Artifact>( ) ); // macMgr.dependencyResolverControl.setMatcher( MockControl.ALWAYS_MATCHER ); - } - catch ( final DependencyResolutionException e ) - { - fail( "Should never happen" ); - } + // } + // catch ( final DependencyResolutionException e ) + // { + // fail( "Should never happen" ); + // } mm.replayAll(); @@ -488,7 +481,7 @@ public class DefaultAssemblyArchiverTest final List<AssemblyArchiverPhase> phases, Logger logger ) { final DefaultAssemblyArchiver subject = - new DefaultAssemblyArchiver( macMgr.archiverManager, macMgr.dependencyResolver, phases ); + new DefaultAssemblyArchiver( macMgr.archiverManager, phases ); subject.setContainer( container ); Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java?rev=1636157&r1=1636156&r2=1636157&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/DependencySetAssemblyPhaseTest.java Sun Nov 2 17:48:16 2014 @@ -25,10 +25,11 @@ import org.apache.maven.plugin.assembly. import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock; import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask; +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.plugin.assembly.resolved.ResolvedAssembly; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.codehaus.plexus.logging.Logger; @@ -39,6 +40,7 @@ import java.io.IOException; import java.util.Collections; import junit.framework.TestCase; +import org.easymock.EasyMock; import org.easymock.classextension.EasyMockSupport; public class DependencySetAssemblyPhaseTest @@ -49,7 +51,7 @@ public class DependencySetAssemblyPhaseT public void testExecute_ShouldAddOneDependencyFromProject() throws AssemblyFormattingException, ArchiveCreationException, IOException, - InvalidAssemblerConfigurationException + InvalidAssemblerConfigurationException, DependencyResolutionException { final String outputLocation = "/out"; @@ -85,7 +87,7 @@ public class DependencySetAssemblyPhaseT macTask.expectCSGetRepositories( null, null ); macTask.expectGetDestFile( new File( "junk" ) ); - macTask.expectAddFile( artifactFile, "out/dep", 10 ); +// macTask.expectAddFile( artifactFile, "out/dep", 10 ); macTask.expectGetSession( null ); @@ -99,11 +101,11 @@ public class DependencySetAssemblyPhaseT macTask.expectBuildFromRepository( depProject ); + DependencyResolver dr = EasyMock.createMock(DependencyResolver.class); + mm.replayAll(); - final ResolvedAssembly assembly1 = ResolvedAssembly.create( assembly ).withDependencySetArtifacts( - Collections.singleton( artifactMock.getArtifact() ) ); - createPhase( macTask, logger ).execute( assembly1, macTask.archiver, macTask.configSource ); + createPhase( macTask, logger, dr ).execute( assembly, macTask.archiver, macTask.configSource ); mm.verifyAll(); } @@ -120,7 +122,7 @@ public class DependencySetAssemblyPhaseT public void testExecute_ShouldNotAddDependenciesWhenProjectHasNone() throws AssemblyFormattingException, ArchiveCreationException, IOException, - InvalidAssemblerConfigurationException + InvalidAssemblerConfigurationException, DependencyResolutionException { final Assembly assembly = new Assembly(); @@ -132,15 +134,17 @@ public class DependencySetAssemblyPhaseT final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, null ); + DependencyResolver dr = EasyMock.createMock(DependencyResolver.class); + mm.replayAll(); - createPhase( macTask, logger ).execute( ResolvedAssembly.create( assembly), null, macTask.configSource ); + createPhase( macTask, logger, dr ).execute( assembly, null, macTask.configSource ); mm.verifyAll(); } private DependencySetAssemblyPhase createPhase( final MockAndControlForAddDependencySetsTask macTask, - final Logger logger ) + final Logger logger, DependencyResolver dr ) { MavenProjectBuilder projectBuilder = null; @@ -149,7 +153,7 @@ public class DependencySetAssemblyPhaseT projectBuilder = macTask.projectBuilder; } - final DependencySetAssemblyPhase phase = new DependencySetAssemblyPhase( projectBuilder, logger ); + final DependencySetAssemblyPhase phase = new DependencySetAssemblyPhase( projectBuilder, dr, logger ); phase.enableLogging( logger ); 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=1636157&r1=1636156&r2=1636157&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 Sun Nov 2 17:48:16 2014 @@ -27,7 +27,6 @@ import org.apache.maven.plugin.assembly. import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; import org.apache.maven.plugin.assembly.model.Assembly; import org.apache.maven.plugin.assembly.model.FileItem; -import org.apache.maven.plugin.assembly.resolved.ResolvedAssembly; import org.apache.maven.plugin.assembly.testutils.TestFileManager; import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; @@ -76,7 +75,7 @@ public class FileItemAssemblyPhaseTest mm.replayAll(); - createPhase( macLogger.logger ).execute( ResolvedAssembly.create( assembly ), null, macCS.configSource ); + createPhase( macLogger.logger ).execute( assembly, null, macCS.configSource ); mm.verifyAll(); } @@ -121,7 +120,7 @@ public class FileItemAssemblyPhaseTest mm.replayAll(); - createPhase( macLogger.logger ).execute( ResolvedAssembly.create( assembly), macArchiver.archiver, macCS.configSource ); + createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource ); mm.verifyAll(); } @@ -166,7 +165,7 @@ public class FileItemAssemblyPhaseTest mm.replayAll(); - createPhase( macLogger.logger ).execute( ResolvedAssembly.create( assembly), macArchiver.archiver, macCS.configSource ); + createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource ); mm.verifyAll(); } @@ -239,7 +238,7 @@ public class FileItemAssemblyPhaseTest mm.replayAll(); - createPhase( macLogger.logger ).execute( ResolvedAssembly.create( assembly), macArchiver.archiver, macCS.configSource ); + createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource ); mm.verifyAll(); } @@ -315,7 +314,7 @@ public class FileItemAssemblyPhaseTest mm.replayAll(); - createPhase( macLogger.logger ).execute( ResolvedAssembly.create( assembly), macArchiver.archiver, macCS.configSource ); + createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource ); mm.verifyAll(); } @@ -389,7 +388,7 @@ public class FileItemAssemblyPhaseTest mm.replayAll(); - createPhase( macLogger.logger ).execute( ResolvedAssembly.create( assembly), macArchiver.archiver, macCS.configSource ); + createPhase( macLogger.logger ).execute( assembly, macArchiver.archiver, macCS.configSource ); mm.verifyAll(); } 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=1636157&r1=1636156&r2=1636157&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 Sun Nov 2 17:48:16 2014 @@ -30,7 +30,6 @@ import org.apache.maven.plugin.assembly. 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.plugin.assembly.resolved.ResolvedAssembly; import org.apache.maven.plugin.assembly.testutils.TestFileManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.logging.Logger; @@ -68,7 +67,7 @@ public class FileSetAssemblyPhaseTest mm.replayAll(); - createPhase( macLogger ).execute( ResolvedAssembly.create( assembly ), macTask.archiver, macTask.configSource ); + createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource ); mm.verifyAll(); } @@ -110,7 +109,7 @@ public class FileSetAssemblyPhaseTest mm.replayAll(); - createPhase( macLogger ).execute( ResolvedAssembly.create( assembly), macTask.archiver, macTask.configSource ); + createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource ); mm.verifyAll(); } 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=1636157&r1=1636156&r2=1636157&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 Sun Nov 2 17:48:16 2014 @@ -19,7 +19,8 @@ package org.apache.maven.plugin.assembly * under the License. */ -import org.apache.maven.artifact.Artifact; +import junit.framework.Assert; +import junit.framework.TestCase; import org.apache.maven.model.Model; import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; import org.apache.maven.plugin.assembly.archive.ArchiveCreationException; @@ -27,21 +28,21 @@ import org.apache.maven.plugin.assembly. import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddArtifactTask; import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask; import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask; +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.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.resolved.ResolvedAssembly; -import org.apache.maven.plugin.assembly.resolved.ResolvedModuleSet; import org.apache.maven.plugin.assembly.testutils.TestFileManager; import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; +import org.easymock.classextension.EasyMock; +import org.easymock.classextension.EasyMockSupport; import java.io.File; import java.io.IOException; @@ -52,15 +53,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import junit.framework.Assert; -import junit.framework.TestCase; -import org.easymock.classextension.EasyMock; -import org.easymock.classextension.EasyMockSupport; - import static java.util.Collections.singleton; -import static org.apache.maven.plugin.assembly.resolved.ResolvedModuleSet.createResolvedModuleSet; -import static org.easymock.EasyMock.anyInt; -import static org.easymock.EasyMock.anyObject; public class ModuleSetAssemblyPhaseTest @@ -260,7 +253,7 @@ public class ModuleSetAssemblyPhaseTest final Assembly assembly = new Assembly(); assembly.setIncludeBaseDirectory( false ); - createPhase( null, null ).execute( ResolvedAssembly.create( assembly), null, null ); + createPhase( null, null ).execute( assembly, null, null ); } public void testExecute_ShouldAddOneModuleSetWithOneModuleInIt() @@ -312,11 +305,8 @@ public class ModuleSetAssemblyPhaseTest mm.replayAll(); - final ResolvedAssembly ra = ResolvedAssembly.create( assembly ).withDependencySetArtifacts( - new HashSet<Artifact>( ) ).withResolvedModuleSets( Collections.singleton( createResolvedModuleSet( ms ) ) ); - final ModuleSetAssemblyPhase phase = createPhase( logger, null ); - phase.execute( ra, macTask.archiver, macTask.configSource ); + phase.execute( assembly, macTask.archiver, macTask.configSource ); mm.verifyAll(); } @@ -324,7 +314,7 @@ public class ModuleSetAssemblyPhaseTest public void testAddModuleBinaries_ShouldReturnImmediatelyWhenBinariesIsNull() throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException { - createPhase( null, null ).addModuleBinaries( null, null, null, null, null ); + createPhase( null, null ).addModuleBinaries( null, null, null, null, null, null ); } public void testAddModuleBinaries_ShouldFilterPomModule() @@ -352,7 +342,7 @@ public class ModuleSetAssemblyPhaseTest mm.replayAll(); - createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( null, binaries, + createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource ); @@ -394,9 +384,7 @@ public class ModuleSetAssemblyPhaseTest final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - ResolvedModuleSet rms = ResolvedModuleSet.empty().withArtifacts( Collections.<Artifact>emptySet() ); - - createPhase( logger, null ).addModuleBinaries( rms, binaries, projects, macTask.archiver, macTask.configSource ); + createPhase( logger, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource ); mm.verifyAll(); } @@ -430,7 +418,7 @@ public class ModuleSetAssemblyPhaseTest try { - createPhase( logger, null ).addModuleBinaries( null, binaries, projects, macTask.archiver, macTask.configSource ); + createPhase( logger, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource ); fail( "Should throw an invalid configuration exception because of module with missing attachment." ); } @@ -475,9 +463,9 @@ public class ModuleSetAssemblyPhaseTest final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); - ResolvedModuleSet ms = ResolvedModuleSet.empty().withArtifacts( Collections.<Artifact>emptySet() ); + Assembly assembly = new Assembly(); - createPhase( logger, null ).addModuleBinaries( ms, binaries, projects, macTask.archiver, macTask.configSource ); + createPhase( logger, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver, macTask.configSource ); mm.verifyAll(); } @@ -875,7 +863,8 @@ public class ModuleSetAssemblyPhaseTest projectBuilder = macTask.projectBuilder; } - return new ModuleSetAssemblyPhase( projectBuilder, logger ); + DependencyResolver dr = EasyMock.createMock( DependencyResolver.class ); + return new ModuleSetAssemblyPhase( projectBuilder, dr, logger ); } } 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=1636157&r1=1636156&r2=1636157&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 Sun Nov 2 17:48:16 2014 @@ -32,7 +32,6 @@ import org.apache.maven.plugin.assembly. 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.resolved.ResolvedAssembly; import org.apache.maven.plugin.assembly.testutils.TestFileManager; import org.apache.maven.plugin.assembly.utils.TypeConversionUtils; import org.apache.maven.project.MavenProject; @@ -84,8 +83,7 @@ public class RepositoryAssemblyPhaseTest mm.replayAll(); - createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( ResolvedAssembly.create( - assembly ), + createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly, macArchiver.archiver, macCS.configSource ); @@ -130,7 +128,7 @@ public class RepositoryAssemblyPhaseTest mm.replayAll(); - createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( ResolvedAssembly.create( assembly), + createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly, macArchiver.archiver, macCS.configSource ); Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java?rev=1636157&r1=1636156&r2=1636157&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/ReaderFormatterTest.java Sun Nov 2 17:48:16 2014 @@ -1,5 +1,24 @@ package org.apache.maven.plugin.assembly.format; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import org.apache.commons.io.IOUtils; import org.apache.maven.model.Model; import org.apache.maven.plugin.assembly.testutils.PojoConfigSource;