You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2006/05/07 07:05:52 UTC
svn commit: r400424 - in /maven/plugins/trunk/maven-release-plugin/src:
main/java/org/apache/maven/plugins/release/config/
test/java/org/apache/maven/plugins/release/config/
Author: brett
Date: Sat May 6 22:05:51 2006
New Revision: 400424
URL: http://svn.apache.org/viewcvs?rev=400424&view=rev
Log:
map to null, not empty element
Modified:
maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStore.java
maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStoreTest.java
Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStore.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStore.java?rev=400424&r1=400423&r2=400424&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStore.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStore.java Sat May 6 22:05:51 2006
@@ -115,14 +115,21 @@
if ( !releaseConfiguration.getOriginalScmInfo().containsKey( key ) )
{
- Scm scm = new Scm();
- scm.setConnection( properties.getProperty( "project.scm." + key + ".connection" ) );
- scm.setDeveloperConnection(
- properties.getProperty( "project.scm." + key + ".developerConnection" ) );
- scm.setUrl( properties.getProperty( "project.scm." + key + ".url" ) );
- scm.setTag( properties.getProperty( "project.scm." + key + ".tag" ) );
+ if ( properties.getProperty( "project.scm." + key + ".empty" ) != null )
+ {
+ releaseConfiguration.mapOriginalScmInfo( key, null );
+ }
+ else
+ {
+ Scm scm = new Scm();
+ scm.setConnection( properties.getProperty( "project.scm." + key + ".connection" ) );
+ scm.setDeveloperConnection(
+ properties.getProperty( "project.scm." + key + ".developerConnection" ) );
+ scm.setUrl( properties.getProperty( "project.scm." + key + ".url" ) );
+ scm.setTag( properties.getProperty( "project.scm." + key + ".tag" ) );
- releaseConfiguration.mapOriginalScmInfo( key, scm );
+ releaseConfiguration.mapOriginalScmInfo( key, scm );
+ }
}
}
}
Modified: maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStoreTest.java?rev=400424&r1=400423&r2=400424&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStoreTest.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/config/PropertiesReleaseConfigurationStoreTest.java Sat May 6 22:05:51 2006
@@ -207,6 +207,9 @@
ReleaseConfiguration rereadConfiguration = store.read( file );
+ assertNull( "check null scm is mapped correctly",
+ rereadConfiguration.getOriginalScmInfo().get( "group.id:artifact.id" ) );
+
assertEquals( "compare configuration", config, rereadConfiguration );
}