Author: pgier
Date: Sat Oct 20 14:13:23 2012
New Revision: 1400457
URL: http://svn.apache.org/viewvc?rev=1400457&view=rev
Log:
[MDEP-205] Make behaviour of sources mojo the same as resolve mojo, except for
the default classifier setting
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java?rev=1400457&r1=1400456&r2=1400457&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
Sat Oct 20 14:13:23 2012
@@ -128,7 +128,7 @@ public abstract class AbstractDependency
*
* @since 2.0
*/
- @Parameter( property = "type", defaultValue = "java-source" )
+ @Parameter( property = "type", defaultValue = "" )
protected String type;
/**
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java?rev=1400457&r1=1400456&r2=1400457&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
Sat Oct 20 14:13:23 2012
@@ -19,19 +19,11 @@ package org.apache.maven.plugin.dependen
* under the License.
*/
-import org.apache.maven.artifact.Artifact;
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.dependency.AbstractResolveMojo;
-import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
-import org.apache.maven.plugin.dependency.utils.DependencyUtil;
-import org.apache.maven.plugin.dependency.utils.filters.ResolveFileFilter;
-import
org.apache.maven.plugin.dependency.utils.markers.SourcesFileMarkerHandler;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
-
-import java.io.IOException;
/**
* Goal that resolves the project source dependencies from the repository.
@@ -43,19 +35,12 @@ import java.io.IOException;
@Mojo( name = "sources", defaultPhase = LifecyclePhase.GENERATE_SOURCES,
requiresDependencyResolution = ResolutionScope.TEST )
public class ResolveDependencySourcesMojo
- extends AbstractResolveMojo
+ extends ResolveDependenciesMojo
{
- private static final String SOURCE_TYPE = "java-source";
-
private static final String SOURCE_CLASSIFIER = "sources";
/**
- * Only used to store results for integration test validation
- */
- DependencyStatusSets results;
-
- /**
* Main entry into mojo. Gets the list of dependencies and iterates through
* resolving the source jars.
*
@@ -64,47 +49,11 @@ public class ResolveDependencySourcesMoj
public void execute()
throws MojoExecutionException
{
- this.classifier = SOURCE_CLASSIFIER;
- this.type = SOURCE_TYPE;
- // get sets of dependencies
- results = this.getDependencySets( false );
-
- SourcesFileMarkerHandler handler = new SourcesFileMarkerHandler(
this.markersDirectory );
- handler.setResolved( true );
-
- for ( Artifact artifact : results.getResolvedDependencies() )
+ if ( StringUtils.isEmpty( this.classifier ) )
{
- handler.setArtifact( artifact );
- handler.setMarker();
+ this.classifier = SOURCE_CLASSIFIER;
}
- handler.setResolved( false );
- for ( Artifact artifact : results.getUnResolvedDependencies() )
- {
- handler.setArtifact( artifact );
- handler.setMarker();
- }
-
- String output = results.getOutput( outputAbsoluteArtifactFilename,
false );
- try
- {
- if ( outputFile == null )
- {
- DependencyUtil.log( output, getLog() );
- }
- else
- {
- DependencyUtil.write( output, outputFile, appendOutput,
getLog() );
- }
- }
- catch ( IOException e )
- {
- throw new MojoExecutionException( e.getMessage(), e );
- }
- }
-
- protected ArtifactsFilter getMarkedArtifactFilter()
- {
- return new ResolveFileFilter( new SourcesFileMarkerHandler(
this.markersDirectory ) );
+ super.execute();
}
}
