svn commit: r502135 - in /maven/release/trunk: maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ maven-release-manager/src/main/resources/META-INF/plexus/ maven-release-plugin/src/main/java/org/apache/maven/plugins/release/

[ep...@apache.org]

Author: epunzalan
Date: Wed Jan 31 22:49:00 2007
New Revision: 502135

URL: http://svn.apache.org/viewvc?view=rev&rev=502135
Log:
- removed @requiresDependencyResolution bec brett said it causes problems
- replaced project.getArtifacts() with a project.getDependencyArtifacts() equivalent... we thought that transitivity is not required by assuming all released artifacts to NOT have snapshot dependencies

Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
    maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml
    maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?view=diff&rev=502135&r1=502134&r2=502135
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Wed Jan 31 22:49:00 2007
@@ -21,7 +21,9 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactUtils;
+import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.release.ReleaseExecutionException;
 import org.apache.maven.shared.release.ReleaseFailureException;
@@ -54,6 +56,11 @@
      */
     private Prompter prompter;
 
+    /**
+     * Component used to create artifacts
+     */
+    private ArtifactFactory artifactFactory;
+
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
@@ -88,14 +95,23 @@
             }
         }
 
-        for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); )
+        try
         {
-            Artifact artifact = (Artifact) i.next();
+            Set dependencyArtifacts = project.createArtifacts( artifactFactory, null, null );
 
-            if ( checkArtifact( artifact, originalVersions ) )
+            for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )
             {
-                snapshotDependencies.add( artifact );
+                Artifact artifact = (Artifact) i.next();
+
+                if ( checkArtifact( artifact, originalVersions ) )
+                {
+                    snapshotDependencies.add( artifact );
+                }
             }
+        }
+        catch ( InvalidDependencyVersionException e )
+        {
+            throw new ReleaseExecutionException( "Failed to create dependency artifacts", e );
         }
 
         for ( Iterator i = project.getPluginArtifacts().iterator(); i.hasNext(); )

Modified: maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=502135&r1=502134&r2=502135
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/release/trunk/maven-release-manager/src/main/resources/META-INF/plexus/components.xml Wed Jan 31 22:49:00 2007
@@ -142,6 +142,9 @@
         <requirement>
           <role>org.codehaus.plexus.components.interactivity.Prompter</role>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
       </requirements>
     </component>
     <component>

Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?view=diff&rev=502135&r1=502134&r2=502135
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Wed Jan 31 22:49:00 2007
@@ -34,7 +34,6 @@
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  * @version $Id$
  * @aggregator
- * @requiresDependencyResolution test
  * @goal prepare
  * @todo [!] check how this works with version ranges
  */