You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/02/12 22:56:22 UTC
svn commit: r1445410 - in /maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugin/dependency/fromConfiguration/
test/java/org/apache/maven/plugin/dependency/fromConfiguration/
Author: olamy
Date: Tue Feb 12 21:56:22 2013
New Revision: 1445410
URL: http://svn.apache.org/r1445410
Log:
use bean to pass parameters will ease future enhancements
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java?rev=1445410&r1=1445409&r2=1445410&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java Tue Feb 12 21:56:22 2013
@@ -155,9 +155,14 @@ public abstract class AbstractFromConfig
* @throws MojoExecutionException with a message if an error occurs.
* @see ArtifactItem
*/
- protected List<ArtifactItem> getProcessedArtifactItems( boolean removeVersion, boolean prependGroupId , boolean useBaseVersion )
+ protected List<ArtifactItem> getProcessedArtifactItems( ProcessArtifactItemsRequest processArtifactItemsRequest )
throws MojoExecutionException
{
+
+ boolean removeVersion = processArtifactItemsRequest.isRemoveVersion(), prependGroupId =
+ processArtifactItemsRequest.isPrependGroupId(), useBaseVersion =
+ processArtifactItemsRequest.isUseBaseVersion();
+
if ( artifactItems == null || artifactItems.size() < 1 )
{
throw new MojoExecutionException( "There are no artifactItems configured." );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java?rev=1445410&r1=1445409&r2=1445410&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java Tue Feb 12 21:56:22 2013
@@ -89,7 +89,8 @@ public class CopyMojo
verifyRequirements();
- List<ArtifactItem> theArtifactItems = getProcessedArtifactItems( this.stripVersion, this.prependGroupId, this.useBaseVersion );
+ List<ArtifactItem> theArtifactItems = getProcessedArtifactItems(
+ new ProcessArtifactItemsRequest( this.stripVersion, this.prependGroupId, this.useBaseVersion ) );
for ( ArtifactItem artifactItem : theArtifactItems )
{
if ( artifactItem.isNeedsProcessing() )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java?rev=1445410&r1=1445409&r2=1445410&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java Tue Feb 12 21:56:22 2013
@@ -141,7 +141,8 @@ public final class UnpackMojo
protected List<ArtifactItem> getProcessedArtifactItems( boolean removeVersion )
throws MojoExecutionException
{
- List<ArtifactItem> items = super.getProcessedArtifactItems( removeVersion, false, false );
+ List<ArtifactItem> items =
+ super.getProcessedArtifactItems( new ProcessArtifactItemsRequest( removeVersion, false, false ) );
for ( ArtifactItem artifactItem : items )
{
if ( StringUtils.isEmpty( artifactItem.getIncludes() ) )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java?rev=1445410&r1=1445409&r2=1445410&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java Tue Feb 12 21:56:22 2013
@@ -70,7 +70,7 @@ public class TestCopyMojo
public ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean useBaseVersion )
throws MojoExecutionException
{
- List<ArtifactItem> list = mojo.getProcessedArtifactItems( removeVersion, false, useBaseVersion );
+ List<ArtifactItem> list = mojo.getProcessedArtifactItems(new ProcessArtifactItemsRequest( removeVersion, false, useBaseVersion ));
return list.get( 0 );
}
@@ -535,7 +535,7 @@ public class TestCopyMojo
{
try
{
- mojo.getProcessedArtifactItems( false, false, false );
+ mojo.getProcessedArtifactItems( new ProcessArtifactItemsRequest( false, false, false ) );
fail( "Expected Exception" );
}
catch ( MojoExecutionException e )