Page Comparison

[00:18:20 EDT(-0400)] * jayshao (n=jayshao@ool-44c59034.dyn.optonline.net) has joined ##uportal
[07:54:43 EDT(-0400)] * jayshao (n=jayshao@ool-44c59034.dyn.optonline.net) has joined ##uportal
[08:53:50 EDT(-0400)] * esm (n=esm@clue.mse.jhu.edu) has joined ##uportal
[09:41:51 EDT(-0400)] * jayshao (n=jayshao@wg-206-hill012.rutgers.edu) has joined ##uportal
[09:55:15 EDT(-0400)] * jayshao_ (n=jayshao@jshao.rutgers.edu) has joined ##uportal
[09:57:04 EDT(-0400)] * jayshao (n=jayshao@wg-206-hill012.rutgers.edu) has joined ##uportal
[11:11:20 EDT(-0400)] <EricDalquist> morning all
[11:13:20 EDT(-0400)] <esm> morning
[11:13:37 EDT(-0400)] <EricDalquist> so I think I am going to do a uP3 release before the dev meeting
[11:13:43 EDT(-0400)] <EricDalquist> but call it a milestone not RC
[11:13:56 EDT(-0400)] <EricDalquist> you have anything you want to get in before I do that today?
[11:15:57 EDT(-0400)] <esm> no i don't think so
[11:16:01 EDT(-0400)] <esm> are you goign to use the release plguin?
[11:16:19 EDT(-0400)] <EricDalquist> um, if you can show me how
[11:16:29 EDT(-0400)] <EricDalquist> one thing I need to do is fix up version numbers
[11:16:33 EDT(-0400)] <esm> right.
[11:16:38 EDT(-0400)] <esm> i saw that jira issue
[11:16:42 EDT(-0400)] <esm> sooooo.
[11:16:50 EDT(-0400)] <EricDalquist> I think that is all I need to do before releasing
[11:16:55 EDT(-0400)] <esm> i assume the milestone will get its own version?
[11:17:09 EDT(-0400)] <esm> 3.0.0-M1 or some such?
[11:17:16 EDT(-0400)] <EricDalquist> yeah
[11:17:35 EDT(-0400)] <EricDalquist> so actually I guess I need to do two things
[11:17:46 EDT(-0400)] <EricDalquist> 1. merge the refactor branch back to the trunk
[11:17:51 EDT(-0400)] <esm> right
[11:17:53 EDT(-0400)] <EricDalquist> 2. fix the version in the trunk
[11:19:07 EDT(-0400)] <EricDalquist> so ... off to do the merge
[11:19:09 EDT(-0400)] <esm> so the release plugin can be a bit of a headache (only because of the assemblies). It may be best to go over the use of the release plugin at the dev meeting
[11:19:12 EDT(-0400)] <esm> ok
[11:19:30 EDT(-0400)] <EricDalquist> ok
[11:19:40 EDT(-0400)] <EricDalquist> so this will be called 3.0.0-M4
[11:19:40 EDT(-0400)] <esm> just remember when you fix versions to update each pom's parent element.
[11:19:51 EDT(-0400)] <EricDalquist> ok
[11:20:15 EDT(-0400)] <esm> with the release will you also deploy maven 2 artifacts to the repo?
[11:20:35 EDT(-0400)] <esm> i don't think we have to per se
[11:20:54 EDT(-0400)] <esm> (who would be depending on -M4 artifacts?)
[11:21:48 EDT(-0400)] <esm> you could release -M4 as a binary zip and then we can use the release plugin at the dev meeting to release M5 which would automatically push the artifacts out.
[11:22:15 EDT(-0400)] <EricDalquist> hrm
[11:22:31 EDT(-0400)] <EricDalquist> doesn't mvn deploy push the artifacts to the repo?
[11:22:39 EDT(-0400)] <esm> yes it does
[11:22:49 EDT(-0400)] <EricDalquist> I was planning on doing that
[11:23:00 EDT(-0400)] <esm> k no problem that will work
[11:23:13 EDT(-0400)] <esm> final question
[11:23:25 EDT(-0400)] <esm> what will the next version number be : 3.0.0-SNAPSHOT?
[11:23:37 EDT(-0400)] <EricDalquist> um I'm not sure
[11:23:51 EDT(-0400)] <EricDalquist> 3.0.0-SNAPSHOT or 3.0.0-M5-SNAPSHOT
[11:23:57 EDT(-0400)] <EricDalquist> what do you think of those?
[11:24:16 EDT(-0400)] <esm> It probably doesn't make too much of a difference, so I'm cool with either.
[11:24:25 EDT(-0400)] <esm> it might make a difference if we were publishing snapshots
[11:25:00 EDT(-0400)] <EricDalquist> ah
[11:51:10 EDT(-0400)] <EricDalquist> grr need to find the revision of the branch again
[11:51:19 EDT(-0400)] <EricDalquist> they annoying bit of merging with svn
[11:52:59 EDT(-0400)] <esm> yeah
[11:53:27 EDT(-0400)] <EricDalquist> ok, merge is going
[12:02:26 EDT(-0400)] * jayshao (n=jayshao@wg-206-hill012.rutgers.edu) has joined ##uportal
[12:19:18 EDT(-0400)] <EricDalquist> crap
[12:19:42 EDT(-0400)] <EricDalquist> so
[12:19:53 EDT(-0400)] <EricDalquist> since I had done some trunk > refactor merges
[12:20:04 EDT(-0400)] <EricDalquist> I need to figure out what the last rev of those were
[12:20:07 EDT(-0400)] <EricDalquist> and use that rev
[12:20:18 EDT(-0400)] <EricDalquist> I tried the branch rev and got a bunch of conflicts
[12:20:33 EDT(-0400)] <EricDalquist> even though the conflicting files are the same in trunk and refactor
[12:25:49 EDT(-0400)] <esm> thats annoying...
[12:25:55 EDT(-0400)] <EricDalquist> very
[12:29:19 EDT(-0400)] <esm> hmm that could really complicate things
[12:29:37 EDT(-0400)] <EricDalquist> I think I just need to use the latest rev from trunk as my base
[12:29:39 EDT(-0400)] <esm> you may end up having to do multiple merges
[12:31:01 EDT(-0400)] <EricDalquist> we'll see
[12:31:08 EDT(-0400)] <EricDalquist> I'm reverting my checked out trunk
[12:31:15 EDT(-0400)] <EricDalquist> once that is done I'll give it another try
[12:32:15 EDT(-0400)] <esm> if the branch contains all of the changes in trunk since the branch was created, you might be able to update trunk to the revision # when the branch was created
[12:32:27 EDT(-0400)] <esm> and merge against that
[12:32:35 EDT(-0400)] <EricDalquist> ah
[12:33:04 EDT(-0400)] <esm> but if you have to cherry-pick stuff...
[12:33:51 EDT(-0400)] <esm> so you update a WC of trunk to the rev # when the branch was created
[12:33:52 EDT(-0400)] <esm> merge
[12:33:54 EDT(-0400)] <esm> update
[12:33:55 EDT(-0400)] <esm> commit
[12:34:17 EDT(-0400)] <EricDalquist> hrm
[12:37:52 EDT(-0400)] <esm> the update step will be needed b/c svn won't let you commit on an old rev #
[12:38:08 EDT(-0400)] <esm> hopefully you won't see the same conflicts
[12:38:08 EDT(-0400)] <EricDalquist> ah
[12:38:12 EDT(-0400)] <EricDalquist> yeah
[12:46:16 EDT(-0400)] * jayshao_ (n=jayshao@jshao.rutgers.edu) has joined ##uportal
[12:48:34 EDT(-0400)] * jayshao_ (n=jayshao@jshao.rutgers.edu) has joined ##uportal
[12:49:57 EDT(-0400)] <EricDalquist> ok ... revert done (that took a long time)
[12:50:04 EDT(-0400)] <EricDalquist> doing the switch to rev 11913 now