You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/09/12 04:06:28 UTC
svn commit: r442416 - in /maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugin/dependency/utils/filters/ScopeFilter.java
test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java
Author: brianf
Date: Mon Sep 11 19:06:27 2006
New Revision: 442416
URL: http://svn.apache.org/viewvc?view=rev&rev=442416
Log:
[MDEP-21] & [MDEP-22] added exception on exclude test scope since this would always exclude everything.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ScopeFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ScopeFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ScopeFilter.java?view=diff&rev=442416&r1=442415&r2=442416
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ScopeFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ScopeFilter.java Mon Sep 11 19:06:27 2006
@@ -21,6 +21,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.StringUtils;
@@ -44,8 +45,9 @@
* the set of dependencies to filter.
*
* @return a Set of filtered dependencies.
+ * @throws MojoExecutionException
*/
- public Set filter( Set artifacts, Log log )
+ public Set filter( Set artifacts, Log log ) throws MojoExecutionException
{
Set results = artifacts;
@@ -69,7 +71,11 @@
results = new HashSet();
//plexus ScopeArtifactFilter doesn't handle the provided scope so we
//need special handling for it.
- if ( !Artifact.SCOPE_PROVIDED.equals( excludeScope ) )
+ if ( Artifact.SCOPE_TEST.equals(excludeScope))
+ {
+ throw new MojoExecutionException(" Can't exclude Test scope, this will exclude everything.");
+ }
+ else if ( !Artifact.SCOPE_PROVIDED.equals( excludeScope ) )
{
ScopeArtifactFilter saf = new ScopeArtifactFilter( excludeScope );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java?view=diff&rev=442416&r1=442415&r2=442416
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestScopeFilter.java Mon Sep 11 19:06:27 2006
@@ -28,6 +28,7 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.dependency.utils.SilentLog;
@@ -62,57 +63,116 @@
public void testScopeFilter()
{
ScopeFilter filter = new ScopeFilter( Artifact.SCOPE_COMPILE, null );
- Set result = filter.filter( artifacts, log );
- assertEquals( 2, result.size() );
+ Set result;
+ try
+ {
+ result = filter.filter( artifacts, log );
+ assertEquals( 2, result.size() );
+ }
+ catch ( MojoExecutionException e )
+ {
+ assertTrue( true );
+ }
}
public void testScopeFilter2()
{
ScopeFilter filter = new ScopeFilter( Artifact.SCOPE_RUNTIME, null );
- Set result = filter.filter( artifacts, log );
- assertEquals( 2, result.size() );
+ Set result;
+ try
+ {
+ result = filter.filter( artifacts, log );
+ assertEquals( 2, result.size() );
+ }
+ catch ( MojoExecutionException e )
+ {
+ assertTrue( false );
+ }
}
public void testScopeFilter3()
{
- ScopeFilter filter = new ScopeFilter( Artifact.SCOPE_TEST, null );
- Set result = filter.filter( artifacts, log );
- assertEquals( 4, result.size() );
+ try
+ {
+ ScopeFilter filter = new ScopeFilter( Artifact.SCOPE_TEST, null );
+ Set result = filter.filter( artifacts, log );
+ assertEquals( 4, result.size() );
+ }
+ catch ( MojoExecutionException e )
+ {
+ assertTrue( false );
+ }
}
public void testScopeFilterNull()
{
- ScopeFilter filter = new ScopeFilter( null , null);
- Set result = filter.filter( artifacts, log );
- assertEquals( 4, result.size() );
+ try
+ {
+ ScopeFilter filter = new ScopeFilter( null, null );
+ Set result = filter.filter( artifacts, log );
+ assertEquals( 4, result.size() );
+ }
+ catch ( MojoExecutionException e )
+ {
+ assertTrue( false );
+ }
}
public void testScopeFilterEmpty()
{
- ScopeFilter filter = new ScopeFilter( "", "" );
- Set result = filter.filter( artifacts, log );
- assertEquals( 4, result.size() );
+ try
+ {
+ ScopeFilter filter = new ScopeFilter( "", "" );
+ Set result = filter.filter( artifacts, log );
+ assertEquals( 4, result.size() );
+ }
+ catch ( MojoExecutionException e )
+ {
+ assertTrue( false );
+ }
}
-
+
public void testExcludeProvided()
{
- ScopeFilter filter = new ScopeFilter ("", Artifact.SCOPE_PROVIDED);
- Set result = filter.filter( artifacts, log );
- assertEquals( 3, result.size() );
+ try
+ {
+ ScopeFilter filter = new ScopeFilter( "", Artifact.SCOPE_PROVIDED );
+ Set result = filter.filter( artifacts, log );
+ assertEquals( 3, result.size() );
+ }
+ catch ( MojoExecutionException e )
+ {
+ assertTrue( false );
+ }
}
public void testExcludeCompile()
{
- ScopeFilter filter = new ScopeFilter ("", Artifact.SCOPE_COMPILE);
- Set result = filter.filter( artifacts, log );
- assertEquals( 2, result.size() );
+ try
+ {
+ ScopeFilter filter = new ScopeFilter( "", Artifact.SCOPE_COMPILE );
+ Set result = filter.filter( artifacts, log );
+ assertEquals( 2, result.size() );
+ }
+ catch ( MojoExecutionException e )
+ {
+ assertTrue( false );
+ }
}
-
+
public void testExcludeTest()
{
- ScopeFilter filter = new ScopeFilter ("", Artifact.SCOPE_TEST);
- Set result = filter.filter( artifacts, log );
- assertEquals( 0, result.size() );
+ try
+ {
+ ScopeFilter filter = new ScopeFilter( "", Artifact.SCOPE_TEST );
+ Set result = filter.filter( artifacts, log );
+ assertTrue(false);
+ }
+ catch ( MojoExecutionException e )
+ {
+ //I expect an exception here.
+ assertTrue( true );
+ }
}
}