Author: krosenvold
Date: Sun Nov 2 19:19:02 2014
New Revision: 1636169
URL: http://svn.apache.org/r1636169
Log:
Extracted some helper functions
Added:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java
- copied, changed from r1636165,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java
- copied, changed from r1636165,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java
Removed:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java
Modified:
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/model/Assemblies.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.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/utils/FilterUtilsTest.java
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=1636169&r1=1636168&r2=1636169&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 19:19:02 2014
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -33,7 +32,6 @@ import java.util.Set;
import javax.annotation.Nonnull;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
@@ -43,6 +41,7 @@ import org.apache.maven.plugin.assembly.
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.model.Assemblies;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.DependencySet;
@@ -50,7 +49,7 @@ import org.apache.maven.plugin.assembly.
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.functions.ModuleSetConsumer;
+import org.apache.maven.plugin.assembly.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;
@@ -64,6 +63,9 @@ import org.codehaus.plexus.component.ann
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger;
+import static org.apache.maven.plugin.assembly.functions.MavenProjects.log;
+import static org.apache.maven.plugin.assembly.functions.MavenProjects.addTo;
+
/**
* Handles the <moduleSets/> top-level section of the assembly
descriptor.
*
@@ -114,17 +116,18 @@ public class ModuleSetAssemblyPhase
*/
public void execute( final Assembly assembly, final Archiver archiver,
final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException
+ throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException,
+ DependencyResolutionException
{
- Assemblies.forEachResolvedModule(assembly, new ModuleSetConsumer()
+ Assemblies.forEachModuleSet( assembly, new ModuleSetConsumer()
{
public void accept( ModuleSet resolvedModule )
- throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException
+ throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException,
+ DependencyResolutionException
{
validate( resolvedModule, configSource );
- final Set<MavenProject> moduleProjects =
- getModuleProjects( resolvedModule, configSource,
getLogger() );
+ final Set<MavenProject> moduleProjects = getModuleProjects(
resolvedModule, configSource, getLogger() );
final ModuleSources sources = resolvedModule.getSources();
addModuleSourceFileSets( sources, moduleProjects, archiver,
configSource );
@@ -179,29 +182,17 @@ public class ModuleSetAssemblyPhase
void addModuleBinaries( final Assembly assembly, ModuleSet moduleSet,
final ModuleBinaries binaries,
final Set<MavenProject> projects, final Archiver
archiver,
final AssemblerConfigurationSource configSource )
- throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException
+ throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException,
+ DependencyResolutionException
{
if ( binaries == null )
{
return;
}
- final Set<MavenProject> moduleProjects = new
LinkedHashSet<MavenProject>( projects );
-
- for ( final Iterator<MavenProject> it = moduleProjects.iterator();
it.hasNext(); )
- {
- final MavenProject project = it.next();
-
- if ( "pom".equals( project.getPackaging() ) )
- {
- final String projectId = ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() );
-
- getLogger().debug( "Excluding POM-packaging module: " +
projectId );
-
- it.remove();
- }
- }
+ final Set<MavenProject> moduleProjects = new
LinkedHashSet<MavenProject>( );
+ MavenProjects.select( projects, "pom", log( getLogger() ), addTo(
moduleProjects ) );
final String classifier = binaries.getAttachmentClassifier();
@@ -209,7 +200,7 @@ public class ModuleSetAssemblyPhase
for ( final MavenProject project : moduleProjects )
{
- Artifact artifact = null;
+ Artifact artifact;
if ( classifier == null )
{
@@ -222,19 +213,7 @@ public class ModuleSetAssemblyPhase
getLogger().debug( "Processing binary attachment: " +
classifier + " for module project: "
+ project.getId() );
- @SuppressWarnings( "unchecked" )
- final List<Artifact> attachments =
project.getAttachedArtifacts();
- if ( ( attachments != null ) && !attachments.isEmpty() )
- {
- for ( final Artifact attachment : attachments )
- {
- if ( classifier.equals( attachment.getClassifier() ) )
- {
- artifact = attachment;
- break;
- }
- }
- }
+ artifact = MavenProjects.findArtifactByClassifier( project,
classifier );
if ( artifact == null )
{
@@ -252,16 +231,7 @@ 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 );
- }
+ Set<Artifact> resolved = dependencyResolver.resolve( assembly,
moduleSet, configSource );
for ( final DependencySet ds : depSets )
{
@@ -348,28 +318,6 @@ public class ModuleSetAssemblyPhase
return depSets;
}
- // protected List<String> collectExcludesFromQueuedArtifacts( final Set
visitedArtifacts, final List binaryExcludes
- // )
- // {
- // List excludes = binaryExcludes;
- //
- // if ( excludes == null )
- // {
- // excludes = new ArrayList();
- // }
- // else
- // {
- // excludes = new ArrayList( excludes );
- // }
- //
- // for ( final Iterator it = visitedArtifacts.iterator(); it.hasNext(); )
- // {
- // excludes.add( it.next() );
- // }
- //
- // return excludes;
- // }
-
void addModuleArtifact( final Artifact artifact, final MavenProject
project, final Archiver archiver,
final AssemblerConfigurationSource configSource,
final ModuleBinaries binaries )
throws ArchiveCreationException, AssemblyFormattingException
@@ -615,8 +563,7 @@ public class ModuleSetAssemblyPhase
}
}
- FilterUtils.filterProjects( moduleProjects, moduleSet.getIncludes(),
moduleSet.getExcludes(), true, logger );
- return moduleProjects;
+ return FilterUtils.filterProjects( moduleProjects,
moduleSet.getIncludes(), moduleSet.getExcludes(), true, logger );
}
}
Copied:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java
(from r1636165,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java&r1=1636165&r2=1636169&rev=1636169&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjectConsumer.java
Sun Nov 2 19:19:02 2014
@@ -1,5 +1,4 @@
-package org.apache.maven.plugin.assembly.resolved.functions;
-
+package org.apache.maven.plugin.assembly.functions;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,14 +17,9 @@ package org.apache.maven.plugin.assembly
* specific language governing permissions and limitations
* under the License.
*/
+import org.apache.maven.project.MavenProject;
-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.model.ModuleSet;
-
-public interface ModuleSetConsumer
+public interface MavenProjectConsumer
{
- void accept( ModuleSet resolvedModule )
- throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException;
+ public void accept(MavenProject project);
}
Added:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java?rev=1636169&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/MavenProjects.java
Sun Nov 2 19:19:02 2014
@@ -0,0 +1,108 @@
+package org.apache.maven.plugin.assembly.functions;
+/*
+ * 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.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactUtils;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.logging.Logger;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Set;
+
+
+public class MavenProjects
+{
+ public static void without(Iterable<MavenProject> source, String
packagingType, MavenProjectConsumer consumer){
+ for ( MavenProject project : source )
+ {
+ if ( !packagingType.equals( project.getPackaging() ) )
+ {
+ consumer.accept( project );
+ }
+ }
+ }
+
+ public static void select(Iterable<MavenProject> source, String
packagingType, MavenProjectConsumer consumer){
+ for ( MavenProject project : source )
+ {
+ if ( packagingType.equals( project.getPackaging() ) )
+ {
+ consumer.accept( project );
+ }
+ }
+ }
+
+ public static void select( Iterable<MavenProject> source, String
packagingType, MavenProjectConsumer include,
+ MavenProjectConsumer excluded ){
+ for ( MavenProject project : source )
+ {
+ if ( packagingType.equals( project.getPackaging() ) )
+ {
+ include.accept( project);
+ } else {
+ excluded.accept( project );
+ }
+ }
+ }
+
+ public static @Nullable
+ Artifact findArtifactByClassifier( MavenProject mavenProject, String
classifier )
+ {
+ @SuppressWarnings( "unchecked" )
+ final List<Artifact> attachments = mavenProject.getAttachedArtifacts();
+ if ( ( attachments != null ) && !attachments.isEmpty() )
+ {
+ for ( final Artifact attachment : attachments )
+ {
+ if ( classifier.equals( attachment.getClassifier() ) )
+ {
+ return attachment;
+ }
+ }
+ }
+ return null;
+ }
+
+
+ public static MavenProjectConsumer log( final Logger logger )
+ {
+ return new MavenProjectConsumer()
+ {
+ public void accept( MavenProject project )
+ {
+ final String projectId = ArtifactUtils.versionlessKey(
project.getGroupId(), project.getArtifactId() );
+
+ logger.debug( "Excluding POM-packaging module: " + projectId );
+ }
+ };
+ }
+
+ public static MavenProjectConsumer addTo( final Set<MavenProject> set ){
+ return new MavenProjectConsumer()
+ {
+ public void accept( MavenProject project )
+ {
+ set.add( project);
+ }
+ };
+ }
+
+}
Copied:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java
(from r1636165,
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java?p2=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java&p1=maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java&r1=1636165&r2=1636169&rev=1636169&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/resolved/functions/ModuleSetConsumer.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/functions/ModuleSetConsumer.java
Sun Nov 2 19:19:02 2014
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.assembly.resolved.functions;
+package org.apache.maven.plugin.assembly.functions;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,11 +21,13 @@ 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.artifact.DependencyResolutionException;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.ModuleSet;
public interface ModuleSetConsumer
{
void accept( ModuleSet resolvedModule )
- throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException;
+ throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException,
+ DependencyResolutionException;
}
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java?rev=1636169&r1=1636168&r2=1636169&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/model/Assemblies.java
Sun Nov 2 19:19:02 2014
@@ -21,14 +21,16 @@ 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.artifact.DependencyResolutionException;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
-import org.apache.maven.plugin.assembly.resolved.functions.ModuleSetConsumer;
+import org.apache.maven.plugin.assembly.functions.ModuleSetConsumer;
public class Assemblies
{
- public static void forEachResolvedModule( Assembly assembly,
ModuleSetConsumer moduleSetConsumer )
- throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException
+ public static void forEachModuleSet( Assembly assembly, ModuleSetConsumer
moduleSetConsumer )
+ throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException,
+ DependencyResolutionException
{
for ( ModuleSet resolvedModuleSet : assembly.getModuleSets() )
{
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java?rev=1636169&r1=1636168&r2=1636169&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/FilterUtils.java
Sun Nov 2 19:19:02 2014
@@ -32,6 +32,7 @@ import org.codehaus.plexus.logging.Logge
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -45,7 +46,7 @@ public final class FilterUtils
{
}
- public static void filterProjects( final Set<MavenProject> projects, final
List<String> includes,
+ public static Set<MavenProject> filterProjects( final Set<MavenProject>
projects, final List<String> includes,
final List<String> excludes, final
boolean actTransitively, final Logger logger )
{
final List<PatternIncludesArtifactFilter> allFilters = new
ArrayList<PatternIncludesArtifactFilter>();
@@ -69,14 +70,14 @@ public final class FilterUtils
allFilters.add( excludeFilter );
}
- for ( final Iterator<MavenProject> it = projects.iterator();
it.hasNext(); )
+ Set<MavenProject> result = new LinkedHashSet<MavenProject>(
projects.size());
+ for ( MavenProject project : projects )
{
- final MavenProject project = it.next();
final Artifact artifact = project.getArtifact();
- if ( !filter.include( artifact ) )
+ if ( filter.include( artifact ) )
{
- it.remove();
+ result.add( project);
}
}
@@ -87,6 +88,7 @@ public final class FilterUtils
f.reportMissedCriteria( logger );
}
}
+ return result;
}
public static void filterArtifacts( final Set<Artifact> artifacts, final
List<String> includes,
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=1636169&r1=1636168&r2=1636169&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 19:19:02 2014
@@ -28,6 +28,7 @@ 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.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;
@@ -248,7 +249,8 @@ public class ModuleSetAssemblyPhaseTest
}
public void testExecute_ShouldSkipIfNoModuleSetsFound()
- throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException
+ throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException,
+ DependencyResolutionException
{
final Assembly assembly = new Assembly();
assembly.setIncludeBaseDirectory( false );
@@ -258,7 +260,7 @@ public class ModuleSetAssemblyPhaseTest
public void testExecute_ShouldAddOneModuleSetWithOneModuleInIt()
throws ArchiveCreationException, AssemblyFormattingException,
IOException,
- InvalidAssemblerConfigurationException
+ InvalidAssemblerConfigurationException, DependencyResolutionException
{
final EasyMockSupport mm = new EasyMockSupport();
@@ -312,14 +314,15 @@ public class ModuleSetAssemblyPhaseTest
}
public void
testAddModuleBinaries_ShouldReturnImmediatelyWhenBinariesIsNull()
- throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException
+ throws ArchiveCreationException, AssemblyFormattingException,
InvalidAssemblerConfigurationException,
+ DependencyResolutionException
{
createPhase( null, null ).addModuleBinaries( null, null, null, null,
null, null );
}
public void testAddModuleBinaries_ShouldFilterPomModule()
throws ArchiveCreationException, AssemblyFormattingException,
IOException,
- InvalidAssemblerConfigurationException
+ InvalidAssemblerConfigurationException, DependencyResolutionException
{
final EasyMockSupport mm = new EasyMockSupport();
@@ -352,7 +355,7 @@ public class ModuleSetAssemblyPhaseTest
public void
testAddModuleBinaries_ShouldAddOneModuleAttachmentArtifactAndNoDeps()
throws ArchiveCreationException, AssemblyFormattingException,
IOException,
- InvalidAssemblerConfigurationException
+ InvalidAssemblerConfigurationException, DependencyResolutionException
{
final EasyMockSupport mm = new EasyMockSupport();
@@ -390,7 +393,7 @@ public class ModuleSetAssemblyPhaseTest
}
public void
testAddModuleBinaries_ShouldFailWhenOneModuleDoesntHaveAttachmentWithMatchingClassifier()
- throws ArchiveCreationException, AssemblyFormattingException,
IOException
+ throws ArchiveCreationException, AssemblyFormattingException,
IOException, DependencyResolutionException
{
final EasyMockSupport mm = new EasyMockSupport();
@@ -432,7 +435,7 @@ public class ModuleSetAssemblyPhaseTest
public void testAddModuleBinaries_ShouldAddOneModuleArtifactAndNoDeps()
throws ArchiveCreationException, AssemblyFormattingException,
IOException,
- InvalidAssemblerConfigurationException
+ InvalidAssemblerConfigurationException, DependencyResolutionException
{
final EasyMockSupport mm = new EasyMockSupport();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java?rev=1636169&r1=1636168&r2=1636169&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java
Sun Nov 2 19:19:02 2014
@@ -316,18 +316,19 @@ public class FilterUtilsTest
final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- FilterUtils.filterProjects( projects, inclusions, exclusions, depTrail
!= null, logger );
+ Set<MavenProject> result =
+ FilterUtils.filterProjects( projects, inclusions, exclusions,
depTrail != null, logger );
if ( verifyInclusion )
{
- assertEquals( 1, projects.size() );
- assertEquals( pmac.getId(), projects.iterator()
+ assertEquals( 1, result.size() );
+ assertEquals( pmac.getId(), result.iterator()
.next()
.getId() );
}
else
{
- assertTrue( projects.isEmpty() );
+ assertTrue( result.isEmpty() );
}
mockManager.verifyAll();
