You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/06/02 13:25:01 UTC
svn commit: r1345488 - in /maven/release/trunk/maven-release-manager/src:
main/java/org/apache/maven/shared/release/config/
test/java/org/apache/maven/shared/release/config/ test/resources/
Author: rfscholte
Date: Sat Jun 2 11:25:01 2012
New Revision: 1345488
URL: http://svn.apache.org/viewvc?rev=1345488&view=rev
Log:
Fix MRELEASE-616: release:rollback does not honor -DcommitByProject
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
maven/release/trunk/maven-release-manager/src/test/resources/release.properties
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java?rev=1345488&r1=1345487&r2=1345488&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java Sat Jun 2 11:25:01 2012
@@ -115,6 +115,10 @@ public class PropertiesReleaseDescriptor
{
Properties properties = new Properties();
properties.setProperty( "completedPhase", config.getCompletedPhase() );
+ if ( config.isCommitByProject() ) //default is false
+ {
+ properties.setProperty( "commitByProject", "true" );
+ }
properties.setProperty( "scm.url", config.getScmSourceUrl() );
if ( config.getScmId() != null )
{
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java?rev=1345488&r1=1345487&r2=1345488&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java Sat Jun 2 11:25:01 2012
@@ -82,7 +82,8 @@ public class ReleaseUtils
mergeInto.setGenerateReleasePoms( toBeMerged.isGenerateReleasePoms() );
mergeInto.setInteractive( toBeMerged.isInteractive() );
mergeInto.setUpdateDependencies( toBeMerged.isUpdateDependencies() );
- mergeInto.setCommitByProject( toBeMerged.isCommitByProject() );
+ mergeInto.setCommitByProject( mergeOverride( mergeInto.isCommitByProject(), toBeMerged.isCommitByProject(),
+ false ) );
mergeInto.setUseReleaseProfile( toBeMerged.isUseReleaseProfile() );
mergeInto.setBranchCreation( toBeMerged.isBranchCreation() );
mergeInto.setUpdateBranchVersions( toBeMerged.isUpdateBranchVersions() );
@@ -131,11 +132,17 @@ public class ReleaseUtils
{
return thisValue != null ? thisValue : mergeValue;
}
+
+ private static boolean mergeOverride( boolean thisValue, boolean mergeValue, boolean defaultValue )
+ {
+ return mergeValue != defaultValue ? mergeValue : thisValue;
+ }
public static ReleaseDescriptor copyPropertiesToReleaseDescriptor( Properties properties )
{
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.setCompletedPhase( properties.getProperty( "completedPhase" ) );
+ releaseDescriptor.setCommitByProject( Boolean.parseBoolean( properties.getProperty( "commitByProject" ) ) );
releaseDescriptor.setScmId( properties.getProperty( "scm.id" ) );
releaseDescriptor.setScmSourceUrl( properties.getProperty( "scm.url" ) );
releaseDescriptor.setScmUsername( properties.getProperty( "scm.username" ) );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java?rev=1345488&r1=1345487&r2=1345488&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java Sat Jun 2 11:25:01 2012
@@ -269,6 +269,7 @@ public class PropertiesReleaseDescriptor
{
ReleaseDescriptor config = new ReleaseDescriptor();
config.setCompletedPhase( "completed-phase-write" );
+ config.setCommitByProject( true );
config.setScmSourceUrl( "url-write" );
config.setScmId( "id-write" );
config.setScmUsername( "username-write" );
@@ -305,6 +306,7 @@ public class PropertiesReleaseDescriptor
private static void assertDefaultReleaseConfiguration( ReleaseDescriptor config )
{
assertNull( "Expected no completedPhase", config.getCompletedPhase() );
+ assertFalse( "Expected no commitPerProject", config.isCommitByProject() );
assertNull( "Expected no id", config.getScmId() );
assertNull( "Expected no url", config.getScmSourceUrl() );
assertNull( "Expected no username", config.getScmUsername() );
@@ -348,6 +350,7 @@ public class PropertiesReleaseDescriptor
{
ReleaseDescriptor expected = new ReleaseDescriptor();
expected.setCompletedPhase( "step1" );
+ expected.setCommitByProject( true );
expected.setScmId( "scm-id" );
expected.setScmSourceUrl( "scm-url" );
expected.setScmUsername( "username" );
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java?rev=1345488&r1=1345487&r2=1345488&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java Sat Jun 2 11:25:01 2012
@@ -137,10 +137,14 @@ public class ReleaseUtilsTest
assertFalse( "Check original comparison", config.equals( origConfig ) );
config.setInteractive( origConfig.isInteractive() );
+ config.setCommitByProject( !origConfig.isCommitByProject() );
+ assertFalse( "Check original comparison", config.equals( origConfig ) );
+ config.setCommitByProject( origConfig.isCommitByProject() );
+
config.setCompletedPhase( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
config.setCompletedPhase( origConfig.getCompletedPhase() );
-
+
config.setScmPrivateKeyPassPhrase( other );
assertFalse( "Check original comparison", config.equals( origConfig ) );
config.setScmPrivateKeyPassPhrase( origConfig.getScmPrivateKeyPassPhrase() );
Modified: maven/release/trunk/maven-release-manager/src/test/resources/release.properties
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/resources/release.properties?rev=1345488&r1=1345487&r2=1345488&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/resources/release.properties (original)
+++ maven/release/trunk/maven-release-manager/src/test/resources/release.properties Sat Jun 2 11:25:01 2012
@@ -18,6 +18,7 @@
#
completedPhase=step1
+commitByProject=true
scm.id=scm-id
scm.url=scm-url
scm.username=username