maven-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Nico De Groote (JIRA)" <j...@codehaus.org>
Subject [jira] (MRELEASE-636) Flat Layout branching not correctly supported - CONTAINS PATCH FOR 2.1 version of plugin - please apply
Date Mon, 02 Jun 2014 13:43:10 GMT

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

Nico De Groote commented on MRELEASE-636:
-----------------------------------------

This issue was partly based on the issue MRELEASE-619. This issue has been fixed.
When will this issue be taken care of? 

> Flat Layout branching not correctly supported - CONTAINS PATCH FOR 2.1 version of plugin
- please apply
> -------------------------------------------------------------------------------------------------------
>
>                 Key: MRELEASE-636
>                 URL: https://jira.codehaus.org/browse/MRELEASE-636
>             Project: Maven Release Plugin
>          Issue Type: Bug
>          Components: branch
>    Affects Versions: 2.1
>         Environment: Maven 2.2.1/maven3.0.X JDK6/7
>            Reporter: Nico De Groote
>            Priority: Blocker
>         Attachments: Maven Release Plugin - Trunk.patch, release.patch
>
>
> When trying to create a branch with the {{commitByProject=true}} value, it is not taken
into account. 
> So I created a patch on for the 2.1 version.
> The attached patch consist of the following: 
> in the maven-release-manager
> # the MRELEASE-619 
> # some extra logging concerning the use of commitByProject property in the AbstractScmCommitPhase.java

> in the maven-release-plugin
> # I've put the {{commitByProject}} in the {{AbstractReleaseMojo}}, and used it in both
the {{BranchReleaseMojo}} and {{PrepareReleaseMojo}} in similar way.  
> Can you guys create a version {{2.1.1}} fix with this patch. There seem to be a lot of
people out there having troublwe releasing a Flat Layout multimodule.
> I do it in the following way... 
> {noformat}
> /PARENT/pom.xml
> /MODULE1/POM.XML
> ...
> {noformat}
> and in the parent {{pom.xml}}
> {code:xml}
> <modules>
>    <module>../MODULE1/pom.xml</modules
>    ...
> </modules>
> {code}
> and in SVN 
> {noformat}
> project/trunk/PARENT   (0.0.10-SNAPSHOT)
>        /trunk/MODULE1  (0.0.10-SNAPSHOT)
>        /trunk/....     (0.0.10-SNAPSHOT)
> {noformat}
> When releasing this application we perform the following commands
> First checkout the application... and run the following command to release a {{0.0.10-SNAPSHOT}}
version on the trunk.
> Also make sure you did fill in the SCM information.
> # {{release:clean}} {{release:branch}} with the following values set {{username=<username>
-Dpassword=<password> -DcommitByProject=true -DautoVersionSubmodules=true -DreleaseVersion=0.0.10RC1
-DdevelopmentVersion=0.0.11-SNAPSHOT -DupdateBranchVersions=true -DbranchName=project-0.0.10_branch}}
> This will update your trunk value to {{0.11-SNAPSHOT}} and create a branch with version
{{0.0.10RC1-SNAPSHOT}}
> Svn will look like this
> {noformat}
> project/trunk/PARENT   (0.0.11-SNAPSHOT)
>        /trunk/MODULE1  (0.0.11-SNAPSHOT)
>        /trunk/....     
>        /branches/project-0.0.10_branch/PARENT  (0.0.10RC1-SNAPSHOT)  
>        /branches/project-0.0.10_branch/MODULE1 (0.0.10RC1-SNAPSHOT)
>        /branches/project-0.0.10_branch/...
> {noformat}
> Now, when this is done checkout this newly created branch
> and perform the following
> # {{release:clean release:prepare release:perform}} with the following values {{-Dusername=<username>
-Dpassword=<password> -DcommitByProject=true -DautoVersionSubmodules=true}}
> This will release your {{0.0.10RC1-SNAPSHOT}} as {{0.0.10RC1}}, creates a tag for it
and an upgrade the version number on the branch to {{0.0.11RC2-SNAPSHOT}}
> Svn will look like this
> {noformat}
> project/trunk/PARENT   (0.0.11-SNAPSHOT)
>        /trunk/MODULE1  (0.0.11-SNAPSHOT)
>        /trunk/....     
>        /branches/project-0.0.10_branch/PARENT  (0.0.10RC2-SNAPSHOT)  
>        /branches/project-0.0.10_branch/MODULE1 (0.0.10RC2-SNAPSHOT)
>        /branches/project-0.0.10_branch/...
>        /tags/project-0.0.10RC1/PARENT (0.0.10RC1)
>        /tags/project-0.0.10RC1/MODULE1 (0.0.10RC1)
>        /tags/project-0.0.10RC1/...
> {noformat}       
> Hope this helps... 



--
This message was sent by Atlassian JIRA
(v6.1.6#6162)

Mime
View raw message