You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ke...@apache.org on 2005/08/08 19:55:27 UTC

svn commit: r230827 - in /maven/components/trunk: maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java maven-project/src/main/java/org/apache/maven/project/MavenProject.java

Author: kenney
Date: Mon Aug  8 10:55:21 2005
New Revision: 230827

URL: http://svn.apache.org/viewcvs?rev=230827&view=rev
Log:
Solving MNG-711:

o Added a check in MavenProject.getArtifacts() to never return null,
  but an empty Set, since there's almost no checking.

o Added requiresDependencyResolution test to SurefirePlugin.

Modified:
    maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
    maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java

Modified: maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=230827&r1=230826&r2=230827&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java (original)
+++ maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Mon Aug  8 10:55:21 2005
@@ -35,6 +35,7 @@
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  * @version $Id$
+ * @requiresDependencyResolution test
  * @goal test
  * @phase test
  * @description Run tests using surefire

Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=230827&r1=230826&r2=230827&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Mon Aug  8 10:55:21 2005
@@ -841,7 +841,7 @@
 
     public Set getArtifacts()
     {
-        return artifacts;
+        return artifacts == null ? Collections.EMPTY_SET : artifacts;
     }
 
     public Map getArtifactMap()



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org