You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@maven.apache.org by "Crossley, Jim" <Jc...@tandbergtv.com> on 2007/04/26 18:09:04 UTC
Releasing a branch?
I used the release plugin to successfully release version 2.0.2.1 of our
project. We continued working on the HEAD targeting version 2.0.3 while
QA tested 2.0.2.1. To address bugs reported against that release, we
created a 2.0.2 branch in CVS. We applied our fixes there.
Now it's time to create version 2.0.2.2 from that 2.0.2 branch. When I
attempt to run release:prepare, it immediately fails because the version
is not a SNAPSHOT. Of course it's not a snapshot. It's a released
version requiring bug fixes.
What did I do wrong? Is the maven release model such that releases are
only ever cut from the HEAD? How do you account for
"bugfixes-without-new-features" then?
Do I need to manually update the versions of all the subprojects myself
and then manually tag it? It seems kinda silly to change all the
versions to 2.0.2.1-SNAPSHOT just so I can have the release plugin
change them to 2.0.2.2! I may as well do that myself and eliminate the
middle man, right?
Having the release plugin automatically update all the versions of my
multi-module project is a beautiful thing. It seems kind of arbitrary
to me that the feature only works when the existing version contains the
suffix, "-SNAPSHOT", doesn't it?
Thanks,
Jim
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Heinrich Nirschl <he...@gmail.com>.
On 4/27/07, Roland Asmann <Ro...@cfc.at> wrote:
> Branching (as I've stated a couple of time now) is an issue, which I feel can
> and should be automated. However, the merging of code is something that I
> feel should be left with manual intervention.
>
> Some bugs that have been fixed in a branch, may have been solved in the head
> already by e.g. implementing a new feature (maybe you stumbled upon the bug
> or you had to refactor some code and fixed the bug without knowing). So, in
> my opinion, the merging must remain a manual process.
I fully agree, I am not proposing that it should be automated. The
issue is, even if the difficulties you mentioned don't come up, there
is one place where you *always* get conflicts, namely the version
fields in the POMs.
Henry
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Roland Asmann <Ro...@cfc.at>.
Branching (as I've stated a couple of time now) is an issue, which I feel can
and should be automated. However, the merging of code is something that I
feel should be left with manual intervention.
Some bugs that have been fixed in a branch, may have been solved in the head
already by e.g. implementing a new feature (maybe you stumbled upon the bug
or you had to refactor some code and fixed the bug without knowing). So, in
my opinion, the merging must remain a manual process.
However, don't let me keep you from exploring things that might help you in
your development-process! Keep turning the issue around, and maybe you even
find a solution that makes me change my mind! ;-)
On Friday 27 April 2007 12:23, Heinrich Nirschl wrote:
> There is another, slightly related issue. From time to time, you want
> to merge the bug fixes from the maintenance branch back to the trunk.
> The problem is, that you get merge conflicts on all the POMs because
> of the version fields that have changed on the trunk and on the
> maintenance branch. This makes again some manual intervention
> necessary. I don't have a good solution for that either. Ideas are
> welcome.
>
> I think part of the problem with branching and merging is that even if
> you keep all the module versions in sync you have the version
> information literally written in every POM in your project (as version
> of the artifact or as version of the parent POM). It would be much
> less painful if there was just one place to adapt. However, I don't
> see how a central specification of the version could be achieved
> without loosing the ability to build modules individually.
>
> - Henry
--
Roland Asmann
CFC Informationssysteme Entwicklungsgesellschaft m.b.H
Bäckerstrasse 1/2/7
A-1010 Wien
FN 266155f, Handelsgericht Wien
Tel.: +43/1/513 88 77 - 27
Fax.: +43/1/513 88 62
Email: Roland.Asmann@cfc.at
Web: www.cfc.at
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Heinrich Nirschl <he...@gmail.com>.
On 4/27/07, Emmanuel Venisse <em...@venisse.net> wrote:
> I'll look at the issue created by Jim, but it was in my planning to implement the branch creation in the next month.
>
> Emmanuel
There is another, slightly related issue. From time to time, you want
to merge the bug fixes from the maintenance branch back to the trunk.
The problem is, that you get merge conflicts on all the POMs because
of the version fields that have changed on the trunk and on the
maintenance branch. This makes again some manual intervention
necessary. I don't have a good solution for that either. Ideas are
welcome.
I think part of the problem with branching and merging is that even if
you keep all the module versions in sync you have the version
information literally written in every POM in your project (as version
of the artifact or as version of the parent POM). It would be much
less painful if there was just one place to adapt. However, I don't
see how a central specification of the version could be achieved
without loosing the ability to build modules individually.
- Henry
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Emmanuel Venisse <em...@venisse.net>.
I'll look at the issue created by Jim, but it was in my planning to implement the branch creation in the next month.
Emmanuel
Roland Asmann a écrit :
> Jim,
>
> Sure we can work on that together. If you don't mind, I'll contact you on that
> privately (don't need to send every single e-mail over the list).
>
> I'll let you know when I start things up on my end, feel free to do the same!
>
>
> On Thursday 26 April 2007 22:21, Crossley, Jim wrote:
>> Thanks Roland, Trevor, and Heinrich. The summary below captures the
>> problem quite concisely.
>>
>> Roland, perhaps we can work together to implement, or at least come up
>> with a proposal for one or both of the solutions below.
>>
>> And anyone else who has a better idea, please speak up.
>>
>> Jim
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Roland Asmann <Ro...@cfc.at>.
Jim,
Sure we can work on that together. If you don't mind, I'll contact you on that
privately (don't need to send every single e-mail over the list).
I'll let you know when I start things up on my end, feel free to do the same!
On Thursday 26 April 2007 22:21, Crossley, Jim wrote:
> Thanks Roland, Trevor, and Heinrich. The summary below captures the
> problem quite concisely.
>
> Roland, perhaps we can work together to implement, or at least come up
> with a proposal for one or both of the solutions below.
>
> And anyone else who has a better idea, please speak up.
>
> Jim
--
Roland Asmann
CFC Informationssysteme Entwicklungsgesellschaft m.b.H
Bäckerstrasse 1/2/7
A-1010 Wien
FN 266155f, Handelsgericht Wien
Tel.: +43/1/513 88 77 - 27
Fax.: +43/1/513 88 62
Email: Roland.Asmann@cfc.at
Web: www.cfc.at
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
RE: Releasing a branch?
Posted by "Crossley, Jim" <Jc...@tandbergtv.com>.
Thanks Roland, Trevor, and Heinrich. The summary below captures the
problem quite concisely.
Roland, perhaps we can work together to implement, or at least come up
with a proposal for one or both of the solutions below.
And anyone else who has a better idea, please speak up.
Jim
-----Original Message-----
From: Heinrich Nirschl [mailto:heinrich.nirschl@gmail.com]
Sent: Thursday, April 26, 2007 3:06 PM
To: Maven Users List
Subject: Re: Releasing a branch?
On 4/26/07, Roland Asmann <Ro...@cfc.at> wrote:
> As I see it, you just described the only solution that works. I may be
> wrong here, so if any of the maven-programmers think I am: please DO
tell me!
> No matter how you assign the version-numbers, fact remains that maven
> can not 'automatically' handle branching.
>
As I see it there are two solutions:
1) starting the maintenance branch before the release and doing the
release on the branch, in this case you have to manually adjust the
version on the trunk.
2) doing the release on the trunk and starting the maintenance branch
from the tagged version, in this case the version has to be manually
updated on the branch.
Both approaches work, but there is some manual version editing in both.
Once the branching is done, the release plugin works fine on the branch
(for releasing further maintenance releases) and on the trunk (for
releasing the next major release). The manual update is only necessary
once per branch.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Roland Asmann <Ro...@cfc.at>.
On Thursday 26 April 2007 22:38, Crossley, Jim wrote:
> Hi.
>
> "Rapha l Pi roni" <ra...@gmail.com> writes:
>
> [...]
>
> > is this dumb?
>
> Nope.
Definitely not dumb!
>
> > do that need a enhancement jira?
>
> Yep. http://jira.codehaus.org/browse/MRELEASE-226
Not sure about this though.. I think it should be a seperate plugin, but maybe
extending the release-plugin is a good idea... At least it's an option I'll
consider when analyzing/designing it
>
> Thanks,
> Jim
--
Roland Asmann
CFC Informationssysteme Entwicklungsgesellschaft m.b.H
Bäckerstrasse 1/2/7
A-1010 Wien
FN 266155f, Handelsgericht Wien
Tel.: +43/1/513 88 77 - 27
Fax.: +43/1/513 88 62
Email: Roland.Asmann@cfc.at
Web: www.cfc.at
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
RE: Releasing a branch?
Posted by "Crossley, Jim" <Jc...@tandbergtv.com>.
Hi.
"Rapha l Pi roni" <ra...@gmail.com> writes:
[...]
> is this dumb?
Nope.
> do that need a enhancement jira?
Yep. http://jira.codehaus.org/browse/MRELEASE-226
Thanks,
Jim
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Raphaël Piéroni <ra...@gmail.com>.
Hi
2007/4/26, Heinrich Nirschl <he...@gmail.com>:
> On 4/26/07, Roland Asmann <Ro...@cfc.at> wrote:
> > As I see it, you just described the only solution that works. I may be wrong
> > here, so if any of the maven-programmers think I am: please DO tell me!
> > No matter how you assign the version-numbers, fact remains that maven can
> > not 'automatically' handle branching.
> >
>
> As I see it there are two solutions:
> 1) starting the maintenance branch before the release and doing the
> release on the branch, in this case you have to manually adjust the
> version on the trunk.
>
> 2) doing the release on the trunk and starting the maintenance branch
> from the tagged version, in this case the version has to be manually
> updated on the branch.
Maybe the release plugin should be enhanced with a create-branch option that:
create a branch (named '${tag}.x) from the tag,
checkout the project from the branch in target/checkout directory,
change the checkouted poms versions (say ${tag}.1-SNAPSHOT)
then commit the branch
and you get rid of the manual adjustment.
is this dumb? do that need a enhancement jira?
Raphaël
>
> Both approaches work, but there is some manual version editing in
> both. Once the branching is done, the release plugin works fine on the
> branch (for releasing further maintenance releases) and on the trunk
> (for releasing the next major release). The manual update is only
> necessary once per branch.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
> For additional commands, e-mail: users-help@maven.apache.org
>
>
Re: Releasing a branch?
Posted by Heinrich Nirschl <he...@gmail.com>.
On 4/26/07, Roland Asmann <Ro...@cfc.at> wrote:
> As I see it, you just described the only solution that works. I may be wrong
> here, so if any of the maven-programmers think I am: please DO tell me!
> No matter how you assign the version-numbers, fact remains that maven can
> not 'automatically' handle branching.
>
As I see it there are two solutions:
1) starting the maintenance branch before the release and doing the
release on the branch, in this case you have to manually adjust the
version on the trunk.
2) doing the release on the trunk and starting the maintenance branch
from the tagged version, in this case the version has to be manually
updated on the branch.
Both approaches work, but there is some manual version editing in
both. Once the branching is done, the release plugin works fine on the
branch (for releasing further maintenance releases) and on the trunk
(for releasing the next major release). The manual update is only
necessary once per branch.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Roland Asmann <Ro...@cfc.at>.
As I see it, you just described the only solution that works. I may be wrong
here, so if any of the maven-programmers think I am: please DO tell me!
No matter how you assign the version-numbers, fact remains that maven can
not 'automatically' handle branching.
I feel that there should be a plugin that you can tell to 'create a branch
from version xxx', which will then create a branch in your SCM (if it
supports that, not all of 'em do!), checks out version xxx, updates the
version-number to a new SNAPSHOT-version and commit that again.
I noticed in the API of the SCM-plugin that it knows the branch-command, it is
however not given as a goal on the plugin-page... Maybe it hasn't been
released yet, I don't know. I do believe however that the SCM-plugin per
default will not do the checkout and updating, so maybe a new plugin for
those kind of things is needed?
As I just wrote, I hope to get around to some testing and maybe even writing a
little bit of plugin next week. I'll keep everyone informed on my progress.
On Thursday 26 April 2007 20:24, Trevor Spackman wrote:
> I also would be interested to hear how others are using the plugin... This
> is how we're using it:
>
> New development happens on the trunk (and sometimes project branches),
> where the pom is 2.1.0-SNAPSHOT. At some point, we're happy (enough) with
> it that we create a release branch (e.g. 2.1.x), and run the plugin from
> there -- it creates the 2.1.0 tag, does the 2.1.0 deploy, and ups the
> version on the release branch to 2.1.1-SNAPSHOT. Future bug-fixes (if any)
> are made on the 2.1.x branch and when enough have accumulated, we run the
> plugin again, and now the pom is up to 2.1.2-SNAPSHOT. Then we merge the
> bug-fixes back down to the trunk.
>
> The one manual step in our process is updating the pom in the trunk to
> 2.2.0-SNAPSHOT after creating the branch.
>
> Is there a better way?
>
> Trevor Spackman
--
Roland Asmann
CFC Informationssysteme Entwicklungsgesellschaft m.b.H
Bäckerstrasse 1/2/7
A-1010 Wien
FN 266155f, Handelsgericht Wien
Tel.: +43/1/513 88 77 - 27
Fax.: +43/1/513 88 62
Email: Roland.Asmann@cfc.at
Web: www.cfc.at
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
RE: Releasing a branch?
Posted by Trevor Spackman <ts...@myriad.com>.
I also would be interested to hear how others are using the plugin... This is how we're using it:
New development happens on the trunk (and sometimes project branches), where the pom is 2.1.0-SNAPSHOT. At some point, we're happy (enough) with it that we create a release branch (e.g. 2.1.x), and run the plugin from there -- it creates the 2.1.0 tag, does the 2.1.0 deploy, and ups the version on the release branch to 2.1.1-SNAPSHOT. Future bug-fixes (if any) are made on the 2.1.x branch and when enough have accumulated, we run the plugin again, and now the pom is up to 2.1.2-SNAPSHOT. Then we merge the bug-fixes back down to the trunk.
The one manual step in our process is updating the pom in the trunk to 2.2.0-SNAPSHOT after creating the branch.
Is there a better way?
Trevor Spackman
-----Original Message-----
From: Roland Asmann [mailto:Roland.Asmann@cfc.at]
Sent: Thursday, April 26, 2007 12:13 PM
To: Maven Users List
Subject: Re: Releasing a branch?
Hi Jim,
I've been reading the replies you got, and I feel most of them didn't really
understand your problem.
I'm using the release-plugin as well, but I'll admit right away that I haven't
tried it on branches yet. I believe it wasn't really thought for that though.
At least, not automatically.
Since I've been releasing internal versions here (0.x.x), I haven't had the
need for branching, but I do think it is an issue that will come up as soon
as we go 'live' here. It is something I've been wanting to test for some time
now, but haven't gotten around to it. Maybe I'll get to it next week, seems I
have a little spare time on my hands.
So, unless someone really knows how to branch in maven and tells us all, I'm
afraid you're stuck atm. I'll let you (and everybody else here) know what I
find out when I come around to that testing...
Sorry to be of no real help.
On Thursday 26 April 2007 19:57, Crossley, Jim wrote:
> Thanks all for the quick replies.
>
> So it seems my mistake was not cutting the original release from the
> branch, i.e. I should've created the branch before I cut the release.
> This sounds sensible, except for two things:
>
> 1) I'd rather not create a branch for every release; I'd rather create
> the branch from the release tag only when a reported bug forces me to.
>
> -- but more importantly --
>
> 2) Creating the branch means I'll have to cut the same release twice,
> once in each branch.
>
> If my target is 2.0.2.1-SNAPSHOT in the HEAD, and I want to release
> 2.0.2.1 and begin adding features for 2.0.3 (the third number indicates
> feature differences in our company convention) in the HEAD. If I branch
> HEAD to 2.0.2, I then must release 2.0.2.1 in the 2.0.2 branch and
> update the target version of HEAD to 2.0.3.1-SNAPSHOT. That would
> require me to run the release plugin in both branches. That seems a
> little goofy, no?
>
> I suppose I could keep the version of HEAD at 2.0-SNAPSHOT and *never*
> release from HEAD. I would only release from a branch with an
> additional digit, e.g. 2.0.2. When that branch is initially created,
> the pom's version would be 2.0-SNAPSHOT, but I could override the
> defaults of release:prepare to set the version at 2.0.2.1 with the next
> version being 2.0.2.2-SNAPSHOT.
>
> Do you think that's the easiest way? I'd be interested in hearing how
> other Maven users deal with the "multiple versions in production
> requiring fixes without new features" problem.
>
> Thanks,
> Jim
--
Roland Asmann
CFC Informationssysteme Entwicklungsgesellschaft m.b.H
Bäckerstrasse 1/2/7
A-1010 Wien
FN 266155f, Handelsgericht Wien
Tel.: +43/1/513 88 77 - 27
Fax.: +43/1/513 88 62
Email: Roland.Asmann@cfc.at
Web: www.cfc.at
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Roland Asmann <Ro...@cfc.at>.
Hi Jim,
I've been reading the replies you got, and I feel most of them didn't really
understand your problem.
I'm using the release-plugin as well, but I'll admit right away that I haven't
tried it on branches yet. I believe it wasn't really thought for that though.
At least, not automatically.
Since I've been releasing internal versions here (0.x.x), I haven't had the
need for branching, but I do think it is an issue that will come up as soon
as we go 'live' here. It is something I've been wanting to test for some time
now, but haven't gotten around to it. Maybe I'll get to it next week, seems I
have a little spare time on my hands.
So, unless someone really knows how to branch in maven and tells us all, I'm
afraid you're stuck atm. I'll let you (and everybody else here) know what I
find out when I come around to that testing...
Sorry to be of no real help.
On Thursday 26 April 2007 19:57, Crossley, Jim wrote:
> Thanks all for the quick replies.
>
> So it seems my mistake was not cutting the original release from the
> branch, i.e. I should've created the branch before I cut the release.
> This sounds sensible, except for two things:
>
> 1) I'd rather not create a branch for every release; I'd rather create
> the branch from the release tag only when a reported bug forces me to.
>
> -- but more importantly --
>
> 2) Creating the branch means I'll have to cut the same release twice,
> once in each branch.
>
> If my target is 2.0.2.1-SNAPSHOT in the HEAD, and I want to release
> 2.0.2.1 and begin adding features for 2.0.3 (the third number indicates
> feature differences in our company convention) in the HEAD. If I branch
> HEAD to 2.0.2, I then must release 2.0.2.1 in the 2.0.2 branch and
> update the target version of HEAD to 2.0.3.1-SNAPSHOT. That would
> require me to run the release plugin in both branches. That seems a
> little goofy, no?
>
> I suppose I could keep the version of HEAD at 2.0-SNAPSHOT and *never*
> release from HEAD. I would only release from a branch with an
> additional digit, e.g. 2.0.2. When that branch is initially created,
> the pom's version would be 2.0-SNAPSHOT, but I could override the
> defaults of release:prepare to set the version at 2.0.2.1 with the next
> version being 2.0.2.2-SNAPSHOT.
>
> Do you think that's the easiest way? I'd be interested in hearing how
> other Maven users deal with the "multiple versions in production
> requiring fixes without new features" problem.
>
> Thanks,
> Jim
--
Roland Asmann
CFC Informationssysteme Entwicklungsgesellschaft m.b.H
Bäckerstrasse 1/2/7
A-1010 Wien
FN 266155f, Handelsgericht Wien
Tel.: +43/1/513 88 77 - 27
Fax.: +43/1/513 88 62
Email: Roland.Asmann@cfc.at
Web: www.cfc.at
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
RE: Releasing a branch?
Posted by "Crossley, Jim" <Jc...@tandbergtv.com>.
Thanks all for the quick replies.
So it seems my mistake was not cutting the original release from the
branch, i.e. I should've created the branch before I cut the release.
This sounds sensible, except for two things:
1) I'd rather not create a branch for every release; I'd rather create
the branch from the release tag only when a reported bug forces me to.
-- but more importantly --
2) Creating the branch means I'll have to cut the same release twice,
once in each branch.
If my target is 2.0.2.1-SNAPSHOT in the HEAD, and I want to release
2.0.2.1 and begin adding features for 2.0.3 (the third number indicates
feature differences in our company convention) in the HEAD. If I branch
HEAD to 2.0.2, I then must release 2.0.2.1 in the 2.0.2 branch and
update the target version of HEAD to 2.0.3.1-SNAPSHOT. That would
require me to run the release plugin in both branches. That seems a
little goofy, no?
I suppose I could keep the version of HEAD at 2.0-SNAPSHOT and *never*
release from HEAD. I would only release from a branch with an
additional digit, e.g. 2.0.2. When that branch is initially created,
the pom's version would be 2.0-SNAPSHOT, but I could override the
defaults of release:prepare to set the version at 2.0.2.1 with the next
version being 2.0.2.2-SNAPSHOT.
Do you think that's the easiest way? I'd be interested in hearing how
other Maven users deal with the "multiple versions in production
requiring fixes without new features" problem.
Thanks,
Jim
-----Original Message-----
From: Trevor Spackman [mailto:tspackma@myriad.com]
Sent: Thursday, April 26, 2007 1:12 PM
To: Maven Users List
Subject: RE: Releasing a branch?
I'm using the release plugin on a very regular basis, and it makes
things very smooth. When you release 1.0.1-SNAPSHOT, the plugin creates
a artifactId-1.0.1 tag in the SCM (and updates the scm in the tag's
pom). Then it checks the code out off that tag and runs a deploy
against the newly-checked-out code. The release version is on a tag.
So, when you used the plugin against 2.0.2.1-SNAPSHOT, it should have
been on the 2.0.2 branch already. Then when the plugin updated the
2.0.2 branch's pom (with the value you specified in response to the
"What is the new development version for "Project Name"?) it should have
been automatically defaulted to 2.0.2.2-SNAPSHOT. You're ready to
release again without any pom changes.
Trevor Spackman
-----Original Message-----
From: Wayne Fay [mailto:waynefay@gmail.com]
Sent: Thursday, April 26, 2007 10:55 AM
To: Maven Users List
Subject: Re: Releasing a branch?
How did you "use the release plugin"? Unless I'm mistaken, proper use of
the plugin will result in a release being generated with fixed version
number, commit to SCM, then poms updated back to SNAPSHOT and committed
to SCM again.
I'm not currently using the release plugin myself so I'm not positive.
But I'm about to start using it, and this is what I expect based on my
reading of documentation and emails on this list thus far.
Wayne
On 4/26/07, Crossley, Jim <Jc...@tandbergtv.com> wrote:
> I used the release plugin to successfully release version 2.0.2.1 of
our
> project. We continued working on the HEAD targeting version 2.0.3
while
> QA tested 2.0.2.1. To address bugs reported against that release, we
> created a 2.0.2 branch in CVS. We applied our fixes there.
>
> Now it's time to create version 2.0.2.2 from that 2.0.2 branch. When
I
> attempt to run release:prepare, it immediately fails because the
version
> is not a SNAPSHOT. Of course it's not a snapshot. It's a released
> version requiring bug fixes.
>
> What did I do wrong? Is the maven release model such that releases
are
> only ever cut from the HEAD? How do you account for
> "bugfixes-without-new-features" then?
>
> Do I need to manually update the versions of all the subprojects
myself
> and then manually tag it? It seems kinda silly to change all the
> versions to 2.0.2.1-SNAPSHOT just so I can have the release plugin
> change them to 2.0.2.2! I may as well do that myself and eliminate
the
> middle man, right?
>
> Having the release plugin automatically update all the versions of my
> multi-module project is a beautiful thing. It seems kind of arbitrary
> to me that the feature only works when the existing version contains
the
> suffix, "-SNAPSHOT", doesn't it?
>
> Thanks,
> Jim
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
> For additional commands, e-mail: users-help@maven.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
RE: Releasing a branch?
Posted by Trevor Spackman <ts...@myriad.com>.
I'm using the release plugin on a very regular basis, and it makes
things very smooth. When you release 1.0.1-SNAPSHOT, the plugin creates
a artifactId-1.0.1 tag in the SCM (and updates the scm in the tag's
pom). Then it checks the code out off that tag and runs a deploy
against the newly-checked-out code. The release version is on a tag.
So, when you used the plugin against 2.0.2.1-SNAPSHOT, it should have
been on the 2.0.2 branch already. Then when the plugin updated the
2.0.2 branch's pom (with the value you specified in response to the
"What is the new development version for "Project Name"?) it should have
been automatically defaulted to 2.0.2.2-SNAPSHOT. You're ready to
release again without any pom changes.
Trevor Spackman
-----Original Message-----
From: Wayne Fay [mailto:waynefay@gmail.com]
Sent: Thursday, April 26, 2007 10:55 AM
To: Maven Users List
Subject: Re: Releasing a branch?
How did you "use the release plugin"? Unless I'm mistaken, proper use
of the plugin will result in a release being generated with fixed
version number, commit to SCM, then poms updated back to SNAPSHOT and
committed to SCM again.
I'm not currently using the release plugin myself so I'm not positive.
But I'm about to start using it, and this is what I expect based on my
reading of documentation and emails on this list thus far.
Wayne
On 4/26/07, Crossley, Jim <Jc...@tandbergtv.com> wrote:
> I used the release plugin to successfully release version 2.0.2.1 of
our
> project. We continued working on the HEAD targeting version 2.0.3
while
> QA tested 2.0.2.1. To address bugs reported against that release, we
> created a 2.0.2 branch in CVS. We applied our fixes there.
>
> Now it's time to create version 2.0.2.2 from that 2.0.2 branch. When
I
> attempt to run release:prepare, it immediately fails because the
version
> is not a SNAPSHOT. Of course it's not a snapshot. It's a released
> version requiring bug fixes.
>
> What did I do wrong? Is the maven release model such that releases
are
> only ever cut from the HEAD? How do you account for
> "bugfixes-without-new-features" then?
>
> Do I need to manually update the versions of all the subprojects
myself
> and then manually tag it? It seems kinda silly to change all the
> versions to 2.0.2.1-SNAPSHOT just so I can have the release plugin
> change them to 2.0.2.2! I may as well do that myself and eliminate
the
> middle man, right?
>
> Having the release plugin automatically update all the versions of my
> multi-module project is a beautiful thing. It seems kind of arbitrary
> to me that the feature only works when the existing version contains
the
> suffix, "-SNAPSHOT", doesn't it?
>
> Thanks,
> Jim
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
> For additional commands, e-mail: users-help@maven.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Wayne Fay <wa...@gmail.com>.
How did you "use the release plugin"? Unless I'm mistaken, proper use
of the plugin will result in a release being generated with fixed
version number, commit to SCM, then poms updated back to SNAPSHOT and
committed to SCM again.
I'm not currently using the release plugin myself so I'm not positive.
But I'm about to start using it, and this is what I expect based on my
reading of documentation and emails on this list thus far.
Wayne
On 4/26/07, Crossley, Jim <Jc...@tandbergtv.com> wrote:
> I used the release plugin to successfully release version 2.0.2.1 of our
> project. We continued working on the HEAD targeting version 2.0.3 while
> QA tested 2.0.2.1. To address bugs reported against that release, we
> created a 2.0.2 branch in CVS. We applied our fixes there.
>
> Now it's time to create version 2.0.2.2 from that 2.0.2 branch. When I
> attempt to run release:prepare, it immediately fails because the version
> is not a SNAPSHOT. Of course it's not a snapshot. It's a released
> version requiring bug fixes.
>
> What did I do wrong? Is the maven release model such that releases are
> only ever cut from the HEAD? How do you account for
> "bugfixes-without-new-features" then?
>
> Do I need to manually update the versions of all the subprojects myself
> and then manually tag it? It seems kinda silly to change all the
> versions to 2.0.2.1-SNAPSHOT just so I can have the release plugin
> change them to 2.0.2.2! I may as well do that myself and eliminate the
> middle man, right?
>
> Having the release plugin automatically update all the versions of my
> multi-module project is a beautiful thing. It seems kind of arbitrary
> to me that the feature only works when the existing version contains the
> suffix, "-SNAPSHOT", doesn't it?
>
> Thanks,
> Jim
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
> For additional commands, e-mail: users-help@maven.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org
Re: Releasing a branch?
Posted by Heinrich Nirschl <he...@gmail.com>.
On 4/26/07, Crossley, Jim <Jc...@tandbergtv.com> wrote:
> I used the release plugin to successfully release version 2.0.2.1 of our
> project. We continued working on the HEAD targeting version 2.0.3 while
> QA tested 2.0.2.1. To address bugs reported against that release, we
> created a 2.0.2 branch in CVS. We applied our fixes there.
I think, it was a bad move not to start 2.0.2.2-SNAPSHOT before you
started the bug fixing. If a developer did a mvn install or deploy,
the 2.0.2.1 version was overwritten by something that is not 2.0.2.1
anymore.
>
> Now it's time to create version 2.0.2.2 from that 2.0.2 branch. When I
> attempt to run release:prepare, it immediately fails because the version
> is not a SNAPSHOT. Of course it's not a snapshot. It's a released
> version requiring bug fixes.
>
> What did I do wrong? Is the maven release model such that releases are
> only ever cut from the HEAD? How do you account for
> "bugfixes-without-new-features" then?
>
> Do I need to manually update the versions of all the subprojects myself
> and then manually tag it? It seems kinda silly to change all the
> versions to 2.0.2.1-SNAPSHOT just so I can have the release plugin
> change them to 2.0.2.2! I may as well do that myself and eliminate the
> middle man, right?
The good thing is, you have to do it only once per branch. The release
plugin will prepare the next SNAPSHOT version for you. But I agree, a
plugin to change a release version to the next snapshot version would
be handy.
- Henry
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@maven.apache.org
For additional commands, e-mail: users-help@maven.apache.org