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/05/31 22:45:10 UTC
svn commit: r1344903 - in /maven/release/trunk/maven-release-manager: pom.xml
src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java
Author: rfscholte
Date: Thu May 31 20:45:09 2012
New Revision: 1344903
URL: http://svn.apache.org/viewvc?rev=1344903&view=rev
Log:
Fix MRELEASE-760: updateWorkingCopyVersions=false still bumps up pom versions to next development version
Added:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java
Modified:
maven/release/trunk/maven-release-manager/pom.xml
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
Modified: maven/release/trunk/maven-release-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1344903&r1=1344902&r2=1344903&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Thu May 31 20:45:09 2012
@@ -269,6 +269,19 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.12</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?rev=1344903&r1=1344902&r2=1344903&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java Thu May 31 20:45:09 2012
@@ -305,6 +305,10 @@ public class MapVersionsPhase
prompter.prompt( "What is the new development version for \"" + project.getName() + "\"? ("
+ projectId + ")", nextVersion );
}
+ else if ( !releaseDescriptor.isUpdateWorkingCopyVersions() )
+ {
+ nextVersion = project.getVersion();
+ }
}
}
else
Added: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java?rev=1344903&view=auto
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java (added)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java Thu May 31 20:45:09 2012
@@ -0,0 +1,73 @@
+package org.apache.maven.shared.release.phase;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.codehaus.plexus.PlexusTestCase;
+
+public class MapDevelopmentVersionPhaseIT
+ extends PlexusTestCase
+{
+ private MapVersionsPhase mapVersionsPhase;
+
+ @Override
+ protected InputStream getCustomConfiguration()
+ throws Exception
+ {
+ return MapVersionsPhase.class.getResourceAsStream( "/META-INF/plexus/components.xml" );
+ }
+
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ mapVersionsPhase = (MapVersionsPhase) lookup( ReleasePhase.class.getName(), "map-development-versions" );
+ }
+
+ private static MavenProject createProject( String artifactId, String version )
+ {
+ Model model = new Model();
+ model.setGroupId( "groupId" );
+ model.setArtifactId( artifactId );
+ model.setVersion( version );
+ return new MavenProject( model );
+ }
+
+ public void testNoUpdateWorkingCopyVersions() throws Exception
+ {
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setInteractive( false );
+ releaseDescriptor.setUpdateWorkingCopyVersions( false );
+
+ List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
+ mapVersionsPhase.execute( releaseDescriptor, (ReleaseEnvironment) null, reactorProjects );
+
+ assertEquals( "1.0", releaseDescriptor.getDevelopmentVersions().get( "groupId:artifactId" ) );
+ }
+}