maven-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Stefan Eder (JIRA)" <j...@codehaus.org>
Subject [jira] (MRELEASE-745) Property suppressCommitBeforeBranch also suppresses trunk commit AFTER branching.
Date Wed, 04 Apr 2012 12:59:02 GMT

    [ https://jira.codehaus.org/browse/MRELEASE-745?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=295754#comment-295754
] 

Stefan Eder edited comment on MRELEASE-745 at 4/4/12 7:57 AM:
--------------------------------------------------------------

We experience the same problem with Maven 3.0.3 and release-plugin 2.2.2. Same properties
(except for suppressCommitBeforeTag=true). The local working copy is modified but not committed.
So either the suppressCommitBeforeBranch is handled in a wrong way or the name of the property
is misleading.

In the meantime (since we use Jenkins), we implemented an additional svn CLI step to commit
the changes made to the working copy.
Additionally it is also possible to set suppressCommitBeforeBranch=false. But this leads to
a (probably unwanted) commit of modified Poms before the branch is created.
                
      was (Author: seder):
    We experience the same problem with Maven 3.0.3 and release-plugin 2.2.2. Same properties
(except for suppressCommitBeforeTag=true). The local working copy is modified but not committed.
So either the suppressCommitBeforeBranch is handled in a wrong way or the name of the property
is misleading.

In the meantime (since we use Jenkins), we implemented an additional svn CLI step to commit
the changes made to the working copy.
Additionally it is also possible to set suppressCommitBeforeBranch=true. But this leads to
a (probably unwanted) commit of modified Poms before the branch is created.
                  
> 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
>
> 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

        

Mime
View raw message