[maven-scm] copy for tag maven-release-4
git-svn-id: https://svn.apache.org/repos/asf/maven/release/tags/maven-release-4@587736 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 507ea84..651bf9c 100644
--- a/maven-release-manager/pom.xml
+++ b/maven-release-manager/pom.xml
@@ -23,10 +23,10 @@
<parent>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
</parent>
<artifactId>maven-release-manager</artifactId>
- <version>1.0-alpha-4-SNAPSHOT</version>
+ <version>1.0-alpha-4</version>
<prerequisites>
<maven>2.0.1</maven>
</prerequisites>
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index 9caf864..19b8633 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -555,6 +555,12 @@
// change the property only if the property is the same as what's in the reactor
property.setText( mappedVersion );
}
+ else if ( mappedVersion.equals( propertyValue ))
+ {
+ //this property may have been updated during processing a sibling.
+ logInfo( result, "Ignoring artifact version update for expression: " +
+ mappedVersion+" because it is already updated." );
+ }
else if ( !mappedVersion.equals( versionText ) )
{
if ( mappedVersion.matches( "\\$\\{project.+\\}" ) ||
diff --git a/maven-release-plugin/pom.xml b/maven-release-plugin/pom.xml
index af06d63..5bfadaa 100644
--- a/maven-release-plugin/pom.xml
+++ b/maven-release-plugin/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Release Plugin</name>
- <version>2.0-beta-7-SNAPSHOT</version>
+ <version>2.0-beta-7</version>
<prerequisites>
<maven>2.0.1</maven>
</prerequisites>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release-manager</artifactId>
- <version>1.0-alpha-4-SNAPSHOT</version>
+ <version>1.0-alpha-4</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
diff --git a/pom.xml b/pom.xml
index 754743a..1934ad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<groupId>org.apache.maven.release</groupId>
<artifactId>maven-release</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>4</version>
<packaging>pom</packaging>
<name>Maven Release</name>
<issueManagement>
@@ -40,9 +40,9 @@
<module>maven-release-plugin</module>
</modules>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/release/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/release/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/release/trunk</url>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-4</developerConnection>
+ <url>https://svn.apache.org/repos/asf/maven/release/tags/maven-release-4</url>
</scm>
<build>
<pluginManagement>
