You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2007/04/18 20:25:34 UTC
svn commit: r530116 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
Author: evenisse
Date: Wed Apr 18 11:25:33 2007
New Revision: 530116
URL: http://svn.apache.org/viewvc?view=rev&rev=530116
Log: (empty)
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java?view=diff&rev=530116&r1=530115&r2=530116
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java Wed Apr 18 11:25:33 2007
@@ -104,12 +104,14 @@
{
tagBase = "scm:svn:" + tagBase;
}
+
+ Scm rootScm = rootProject.getScm();
if ( scm.getConnection() != null )
{
- if ( rootProject.getScm().getConnection() != null &&
- scm.getConnection().indexOf( rootProject.getScm().getConnection() ) == 0 )
+ if ( rootScm.getConnection() != null &&
+ scm.getConnection().indexOf( rootScm.getConnection() ) == 0 )
{
- subDirectoryTag = scm.getConnection().substring( rootProject.getScm().getConnection().length() );
+ subDirectoryTag = scm.getConnection().substring( rootScm.getConnection().length() );
}
String value = translator.translateTagUrl( scm.getConnection(), tag + subDirectoryTag, tagBase );
if ( !value.equals( scm.getConnection() ) )
@@ -121,11 +123,11 @@
if ( scm.getDeveloperConnection() != null )
{
- if ( rootProject.getScm().getDeveloperConnection() != null &&
- scm.getDeveloperConnection().indexOf( rootProject.getScm().getDeveloperConnection() ) == 0 )
+ if ( rootScm.getDeveloperConnection() != null &&
+ scm.getDeveloperConnection().indexOf( rootScm.getDeveloperConnection() ) == 0 )
{
subDirectoryTag = scm.getDeveloperConnection().substring(
- rootProject.getScm().getDeveloperConnection().length() );
+ rootScm.getDeveloperConnection().length() );
}
String value =
translator.translateTagUrl( scm.getDeveloperConnection(), tag + subDirectoryTag, tagBase );
@@ -138,10 +140,10 @@
if ( scm.getUrl() != null )
{
- if ( rootProject.getScm().getUrl() != null &&
- scm.getUrl().indexOf( rootProject.getScm().getUrl() ) == 0 )
+ if ( rootScm.getUrl() != null &&
+ scm.getUrl().indexOf( rootScm.getUrl() ) == 0 )
{
- subDirectoryTag = scm.getUrl().substring( rootProject.getScm().getUrl().length() );
+ subDirectoryTag = scm.getUrl().substring( rootScm.getUrl().length() );
}
// use original tag base without protocol
String value = translator.translateTagUrl( scm.getUrl(), tag + subDirectoryTag,