Done. I noticed you already did the plugins in CVS - I thought this was only on your copy. Cool. Much cleaner now. Will also make any merging later a helluva lot easier.
Current status: the pluginVar tag is not working properly in a reactor, because project.context != context.project in some cases (it seems projects have multiple contexts). I need to draw this up and figure out where the double mapping crept in. This means touchstone runs regularly, but not via maven test in the base directory (eg bootstrap). Cheers, Brett > -----Original Message----- > From: Jason van Zyl [mailto:[EMAIL PROTECTED] > Sent: Tuesday, 11 November 2003 9:26 AM > To: Maven Developers List > Subject: RE: rc2 unstable > > > On Mon, 2003-11-10 at 16:21, Brett Porter wrote: > > Jason, > > > > Just 1 question regarding this. How did you go about doing > this merge? > > Most of the plugins were removed from HEAD so I simply did > the same thing in the branch. I have yet to merge the core > plugins together. > > > There's been a fair few changes on HEAD and it would be > worth a merge. > > I'm happy to do it - I think I originally stated I'd do this once a > > week, but I didn't quite get around to that :) > > Sure, go for it. > > > Basically I'll just do: > > cvs update -j HEAD (on the branch) > > cvs tag MAVEN_RC2_UNSTABLE-merge-1 (on the trunk) > > > > Anyone have a problem with this? > > +1 > > > Of course this means that at the end of the day the branch > cannot be > > merged to the trunk because all of the trunk changes will conflict. > > However, we are basically working with an inverted trunk/branch > > scenario here, and as long as all trunk changes are merged to the > > branch at the final point, the files can just be copied as is and > > committed onto the trunk to do an effective merge of the branch. > > > > Cheers, > > Brett > > > > > -----Original Message----- > > > From: Jason van Zyl [mailto:[EMAIL PROTECTED] > > > Sent: Monday, 10 November 2003 5:43 AM > > > To: [EMAIL PROTECTED] > > > Subject: Re: rc2 unstable > > > > > > > > > On Sun, 2003-11-09 at 13:08, Jason van Zyl wrote: > > > > Howdy Brett, > > > > > > > > I'm just bootstrapping rc2 unstable now and I'm going to > > > try and knock > > > > off a couple of the items on list 1. Is there anything > we need to > > > > merge from HEAD? Possibly with the switch over of the plugins? > > > > > > I'm syncing up the plugins now between the HEAD and > > > rc2-unstable branch. This will be much easier now with most > > > of the plugins separated. > > > > > > BTW: is the multiproject plugin supposed to be moved to > > > maven-plugins? > > > > > > -- > > > jvz. > > > > > > Jason van Zyl > > > [EMAIL PROTECTED] > > > http://tambora.zenplex.org > > > > > > In short, man creates for himself a new religion of a > > > rational and technical order to justify his work and to be > > > justified in it. > > > > > > -- Jacques Ellul, The Technological Society > > > > > > > > > > -------------------------------------------------------------------- > > > - > > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > -- > jvz. > > Jason van Zyl > [EMAIL PROTECTED] > http://tambora.zenplex.org > > In short, man creates for himself a new religion of a > rational and technical order to justify his work and to be > justified in it. > > -- Jacques Ellul, The Technological Society > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] >
