svn commit: r798723 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java

[olamy]

Author: olamy
Date: Tue Jul 28 22:23:52 2009
New Revision: 798723

URL: http://svn.apache.org/viewvc?rev=798723&view=rev
Log:
[MRELEASE-452] allowTimestampedSnapshots=true still fails with snapshot 
dependencies
Submitted by Hubert Iwaniuk

Modified:
    
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.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?rev=798723&r1=798722&r2=798723&view=diff
==============================================================================
--- 
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
 Tue Jul 28 22:23:52 2009
@@ -96,17 +96,23 @@
     {
         ReleaseResult result = new ReleaseResult();
 
-        logInfo( result, "Checking dependencies and plugins for snapshots ..." 
);
+        if ( !releaseDescriptor.isAllowTimestampedSnapshots() )
+        {
+            logInfo( result, "Checking dependencies and plugins for snapshots 
..." );
 
-        Map originalVersions = releaseDescriptor.getOriginalVersions( 
reactorProjects );
+            Map originalVersions = releaseDescriptor.getOriginalVersions( 
reactorProjects );
 
-        for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
-        {
-            MavenProject project = (MavenProject) i.next();
+            for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+            {
+                MavenProject project = (MavenProject) i.next();
 
-            checkProject( project, originalVersions, releaseDescriptor );
+                checkProject( project, originalVersions, releaseDescriptor );
+            }
+        }
+        else
+        {
+            logInfo( result, "Ignoring SNAPSHOT depenedencies and plugins ..." 
);
         }
-
         result.setResultCode( ReleaseResult.SUCCESS );
 
         return result;