[ 
https://jira.codehaus.org/browse/MRELEASE-745?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stefan Eder updated MRELEASE-745:
---------------------------------

    Attachment: maven-release-manager.patch

I switched the phase "scm-commit-release" with "scm-commit-development" in 
components-fragment.xml and now it works.

The main difference between those to phases is, that "scm-commit-release" only 
uses "suppressCommitBeforeBranch" to determine whether to check in or not. 
Whereas "scm-commit-development" uses "updateWorkingCopyVersions". Therefore I 
think "scm-commit-development" is the right phase here.

Additionally I provided a patch file which changes the phase and the message 
mentioned in my last post. Can't guarantee that this is 100% right but it works 
for me.
                
> Property suppressCommitBeforeBranch also suppresses trunk commit AFTER 
> branching.
> ---------------------------------------------------------------------------------
>
>                 Key: MRELEASE-745
>                 URL: https://jira.codehaus.org/browse/MRELEASE-745
>             Project: Maven 2.x Release Plugin
>          Issue Type: Bug
>          Components: branch
>    Affects Versions: 2.1
>         Environment: Windows (7, Server 2003), Maven 2.2.1, Jenkins 1.420
>            Reporter: Chris Wilton
>         Attachments: maven-release-manager.patch
>
>
> I have a multi-module maven project. I create 'release branches' for testing, 
> then once testing is complete, I create the release tag from the branch.
> In order to work around the subversion 1.5.x problem 
> (http://jira.codehaus.org/browse/SCM-515) I have the following properties set:
> suppressCommitBeforeBranch=true
> suppressCommitBeforeTag=true
> remoteTagging=false
> Implicit (as default) values are:
> updateBranchVersions=false
> updateWorkingCopyVersions=true
> The intention is to create a branch with the same pom versions as the trunk, 
> without committing any modifications to the trunk (in order to avoid the SCM 
> section for the branch ending up in the trunk poms), then to bump up the 
> trunk versions and commit them. But although the trunk pom versions are 
> modified, they are not committed.
> I want commit suppressed BEFORE branching, not AFTER, else I have to run 
> release:update-versions afterwards and perform a manual commit, to bump up 
> the trunk versions. I should mention that this is being run as a 
> (parameterized) Jenkins task, so it is not simply a case of manually 
> committing my working copy to the trunk after the branching process is 
> complete.
> Am I doing something wrong?

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://jira.codehaus.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

Reply via email to