Author: rfscholte
Date: Sun Apr 15 19:00:07 2012
New Revision: 1326398
URL: http://svn.apache.org/viewvc?rev=1326398&view=rev
Log:
Fix MRELEASE-745: Property suppressCommitBeforeBranch also suppresses trunk
commit AFTER branching.
Added:
maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/
maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml
maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/verify.groovy
Modified:
maven/release/trunk/maven-release-manager/src/main/components-fragment.xml
Modified:
maven/release/trunk/maven-release-manager/src/main/components-fragment.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/components-fragment.xml?rev=1326398&r1=1326397&r2=1326398&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/components-fragment.xml
(original)
+++ maven/release/trunk/maven-release-manager/src/main/components-fragment.xml
Sun Apr 15 19:00:07 2012
@@ -78,7 +78,7 @@
<phase>scm-commit-branch</phase>
<phase>scm-branch</phase>
<phase>rewrite-poms-for-development</phase>
- <phase>scm-commit-release</phase>
+ <phase>scm-commit-development</phase>
<phase>end-release</phase>
</branchPhases>
<updateVersionsPhases>
Added:
maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml?rev=1326398&view=auto
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml
(added)
+++
maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/pom.xml
Sun Apr 15 19:00:07 2012
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.release.it</groupId>
+ <artifactId>mrelease-745</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scm>
+ <connection>scm:dummy|nul</connection>
+ <developerConnection>scm:dummy|nul</developerConnection>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <suppressCommitBeforeBranch>true</suppressCommitBeforeBranch>
+ <branchName>branch-mrelease-745</branchName>
+ <remoteTagging>false</remoteTagging>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.release</groupId>
+ <artifactId>maven-scm-provider-dummy</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added:
maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/verify.groovy?rev=1326398&view=auto
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/verify.groovy
(added)
+++
maven/release/trunk/maven-release-plugin/src/it/projects/branch/MRELEASE-745/verify.groovy
Sun Apr 15 19:00:07 2012
@@ -0,0 +1,24 @@
+
+/*
+ * 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.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+assert buildLog.exists()
+
+assert 1 == buildLog.getText().count("[INFO] Full run would not commit
changes, because suppressCommitBeforeTagOrBranch is set.")
