I'll do the merge to master branch this afternoon Kelven
On 8/24/12 11:37 AM, "Darren Shepherd" <[email protected]> wrote: >I have the integrations with ant/waf done also, but I need the maven >branch merge to master first so that I can submit the next round of >patches. The problem though is the last two commits on the maven branch >have deleted all the Eclipse projects files. While this is definitely >the right thing to do, I didn't want to do this right now. > >For the first round of maven integration I'm trying to do it in a >fashion that has as little impact on the current CS developers and their >dev environment. Once we have mvn building then we can go and delete >the Eclipse files and the binaries in deps and force all developers to >update their Eclipse environments to M2E. > >Can somebody merge the maven branch minus the last two commits to >master? > >Darren > > > >> -------- Original Message -------- >> Subject: RE: maven patch >> From: Will Chan <[email protected]> >> Date: Fri, August 24, 2012 9:42 am >> To: "[email protected]" >> <[email protected]> >> >> >> +1 on documentation (also not volunteering as I barely known maven as >>well). >> >> > -----Original Message----- >> > From: John Kinsella [mailto:[email protected]] >> > Sent: Friday, August 24, 2012 9:20 AM >> > To: <[email protected]> >> > Subject: Re: maven patch >> > >> > would be nice to document this in the wiki as well... (not >>volunteering, I >> > barely know maven ) >> > >> > On Aug 24, 2012, at 5:02 AM, Hugo Trippaers >> > <[email protected]<mailto:[email protected]> >> > > wrote: >> > >> > +1 >> > >> > Darren any thoughts on the next step? Would be nice to integrate >>further >> > with waf etc. >> > >> > Cheers, >> > >> > Hugo >> > >> > -----Original Message----- >> > From: Kelven Yang [mailto:[email protected]<http://citrix.com>] >> > Sent: Thursday, August 23, 2012 11:37 PM >> > To: [email protected]<mailto:cloudstack- >> > [email protected]> >> > Subject: Re: maven patch >> > >> > I got Darren's maven patch work nicely in my local environment. Just >>to be >> > cautious, I pushed it to ASF/maven branch for review first. If I >>don't hear no >> > no's by tomorrow, I'll push it to master. >> > >> > After this patch, ant build and maven build will work side by side, >>this will >> > give us a graceful period to have everyone migrate to maven based >>build >> > system. If you use Eclipse, you will need to re-import all maven >>eclipse >> > projects >> > >> > Kelven >> > >> > On 8/23/12 1:44 PM, "David Nalley" >> > <[email protected]<mailto:[email protected]>> wrote: >> > >> > On Thu, Aug 23, 2012 at 11:20 AM, Darren Shepherd >> > <[email protected]<mailto:[email protected]>> >> > wrote: >> > Some Committer, >> > >> > I can't seem to get the maven patch to work through Review Board. >> > Can a committer just pull the "maven" branch from >> > https://github.com/ibuildthecloud/incubator-cloudstack.git merge to >> > master and commit? One of the problems with the patch is that it >>moves >> > deps/XenServerJava/com to deps/XenServerJava/src/com. With a patch >> > that shows as a delete and add, not a move. Besides moving that >>directory >> > the patch is non-impacting in that it just adds the pom.xml files >> > everywhere. The summary of the diff will show that its just a bunch >>of >> > adds. >> > >> > Darren >> > >> > >> > Merge request against the github mirror should work as well, and is >>likely >> > less work. >> > >> > --David >> > >> > >> > >> > Stratosec<http://stratosec.co> - Secure Infrastructure as a Service >> > o: 415.315.9385 >> > @johnlkinsella<http://twitter.com/johnlkinsella>
