You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2014/10/16 20:24:23 UTC
svn commit: r1632404 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugin/assembly/archive/phase/
main/java/org/apache/maven/plugin/assembly/artifact/
test/java/org/apache/maven/plugin/assembly/artifact/
Author: krosenvold
Date: Thu Oct 16 18:24:23 2014
New Revision: 1632404
URL: http://svn.apache.org/r1632404
Log:
Misc code cleanup2
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/artifact/DefaultDependencyResolver.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.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=1632404&r1=1632403&r2=1632404&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhase.java Thu Oct 16 18:24:23 2014
@@ -30,6 +30,8 @@ import java.util.List;
import java.util.Map;
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;
@@ -419,7 +421,7 @@ public class ModuleSetAssemblyPhase
/**
* Determine whether the deprecated file-set configuration directly within the ModuleSources object is present.
*/
- protected boolean isDeprecatedModuleSourcesConfigPresent( final ModuleSources sources )
+ protected boolean isDeprecatedModuleSourcesConfigPresent( @Nonnull final ModuleSources sources )
{
boolean result = false;
@@ -439,8 +441,8 @@ public class ModuleSetAssemblyPhase
return result;
}
- protected FileSet createFileSet( final FileSet fileSet, final ModuleSources sources,
- final MavenProject moduleProject, final AssemblerConfigurationSource configSource )
+ protected @Nonnull FileSet createFileSet( @Nonnull final FileSet fileSet, @Nonnull final ModuleSources sources,
+ @Nonnull final MavenProject moduleProject, @Nonnull final AssemblerConfigurationSource configSource )
throws AssemblyFormattingException
{
final FileSet fs = new FileSet();
@@ -527,7 +529,7 @@ public class ModuleSetAssemblyPhase
return fs;
}
- public static Set<MavenProject> getModuleProjects( final ModuleSet moduleSet,
+ public static @Nonnull Set<MavenProject> getModuleProjects( final ModuleSet moduleSet,
final AssemblerConfigurationSource configSource,
final Logger logger )
throws ArchiveCreationException
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=1632404&r1=1632403&r2=1632404&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolver.java Thu Oct 16 18:24:23 2014
@@ -101,9 +101,9 @@ public class DefaultDependencyResolver
final MavenProject currentProject = configSource.getProject();
final ResolutionManagementInfo info = new ResolutionManagementInfo( currentProject );
- getRepositoryResolutionRequirements( assembly, info, currentProject );
- getDependencySetResolutionRequirements( assembly, assembly.getDependencySets(), info, currentProject );
- getModuleSetResolutionRequirements( assembly, info, configSource );
+ updateRepositoryResolutionRequirements(assembly, info, currentProject);
+ updateDependencySetResolutionRequirements(assembly, assembly.getDependencySets(), info, currentProject);
+ updateModuleSetResolutionRequirements(assembly, info, configSource);
if ( !info.isResolutionRequired() )
{
@@ -207,9 +207,9 @@ public class DefaultDependencyResolver
return result.getArtifacts();
}
- protected void getRepositoryResolutionRequirements( final Assembly assembly,
- final ResolutionManagementInfo requirements,
- final MavenProject... project )
+ protected void updateRepositoryResolutionRequirements(final Assembly assembly,
+ final ResolutionManagementInfo requirements,
+ final MavenProject... project)
{
final List<Repository> repositories = assembly.getRepositories();
@@ -223,9 +223,9 @@ public class DefaultDependencyResolver
}
}
- protected void getModuleSetResolutionRequirements( final Assembly assembly,
- final ResolutionManagementInfo requirements,
- final AssemblerConfigurationSource configSource )
+ protected void updateModuleSetResolutionRequirements(final Assembly assembly,
+ final ResolutionManagementInfo requirements,
+ final AssemblerConfigurationSource configSource)
throws DependencyResolutionException
{
final List<ModuleSet> moduleSets = assembly.getModuleSets();
@@ -249,7 +249,7 @@ public class DefaultDependencyResolver
e );
}
- if ( projects != null && !projects.isEmpty() )
+ if (!projects.isEmpty())
{
for ( final MavenProject p : projects )
{
@@ -269,9 +269,9 @@ public class DefaultDependencyResolver
if ( binaries.isIncludeDependencies() )
{
- getDependencySetResolutionRequirements( assembly,
- ModuleSetAssemblyPhase.getDependencySets( binaries ),
- requirements, projects.toArray(new MavenProject[projects.size()]));
+ updateDependencySetResolutionRequirements(assembly,
+ ModuleSetAssemblyPhase.getDependencySets(binaries),
+ requirements, projects.toArray(new MavenProject[projects.size()]));
}
}
}
@@ -279,9 +279,9 @@ public class DefaultDependencyResolver
}
@SuppressWarnings( "unchecked" )
- protected void getDependencySetResolutionRequirements( final Assembly assembly, final List<DependencySet> depSets,
- final ResolutionManagementInfo requirements,
- final MavenProject... projects )
+ protected void updateDependencySetResolutionRequirements(final Assembly assembly, final List<DependencySet> depSets,
+ final ResolutionManagementInfo requirements,
+ final MavenProject... projects)
throws DependencyResolutionException
{
if ( depSets != null && !depSets.isEmpty() )
@@ -290,6 +290,7 @@ public class DefaultDependencyResolver
for ( final DependencySet set : depSets )
{
+ // Surely this must be a bug, if there's multiple depSets with different isUseTransitiveDependencies
requirements.setResolvedTransitively( set.isUseTransitiveDependencies() );
enableScope( set.getScope(), requirements );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1632404&r1=1632403&r2=1632404&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java Thu Oct 16 18:24:23 2014
@@ -101,10 +101,10 @@ public class DefaultDependencyResolverTe
final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
- new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).getDependencySetResolutionRequirements( new Assembly(),
- depSets,
- info,
- project );
+ new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).updateDependencySetResolutionRequirements(new Assembly(),
+ depSets,
+ info,
+ project);
assertTrue( info.isResolutionRequired() );
assertFalse( info.isResolvedTransitively() );
@@ -208,7 +208,7 @@ public class DefaultDependencyResolverTe
final Assembly assembly = new Assembly();
assembly.setModuleSets( moduleSets );
- resolver.getModuleSetResolutionRequirements( assembly, info, cs );
+ resolver.updateModuleSetResolutionRequirements(assembly, info, cs);
assertTrue( info.isResolutionRequired() );
@@ -257,9 +257,9 @@ public class DefaultDependencyResolverTe
assembly.setRepositories( repositories );
final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
- new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).getRepositoryResolutionRequirements( assembly,
- info,
- project );
+ new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).updateRepositoryResolutionRequirements(assembly,
+ info,
+ project);
assertTrue( info.isResolutionRequired() );