Author: struberg Date: Sun Jun 26 22:21:23 2011 New Revision: 1139956 URL: http://svn.apache.org/viewvc?rev=1139956&view=rev Log: remove unused import and add TODOs
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java?rev=1139956&r1=1139955&r2=1139956&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java Sun Jun 26 22:21:23 2011 @@ -22,7 +22,6 @@ package org.apache.maven.shared.release; import java.io.File; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java?rev=1139956&r1=1139955&r2=1139956&view=diff ============================================================================== --- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java (original) +++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java Sun Jun 26 22:21:23 2011 @@ -70,6 +70,7 @@ public class CheckoutProjectFromScm ScmRepository repository; ScmProvider provider; + if ( releaseDescriptor.isLocalCheckout() ) { // in the release phase we have to change the checkout URL @@ -79,6 +80,10 @@ public class CheckoutProjectFromScm // the offset of 4 is because 'scm:' has 4 characters... String providerPart = releaseDescriptor.getScmSourceUrl().substring( 0, releaseDescriptor.getScmSourceUrl().indexOf( ':', 4 ) ); + + //X TODO: also check the information from releaseDescriptor.getScmRelativePathProjectDirectory() + //X TODO: in case our toplevel git directory has no pom. + releaseDescriptor.setScmSourceUrl( providerPart + ":file://" + releaseDescriptor.getWorkingDirectory() ); getLogger().info( "Performing a LOCAL checkout from " + releaseDescriptor.getScmSourceUrl() ); }