Ok.
Here's the vote breakdown.
option A - Make the branch the new trunk.
* Emmanuel Venisse
* Arnaud Heriter
* Nicolas De Loof
* Jesse McConnell
* Brett Porter
* Wendy Smoak
option B - Merge the branch into the existing trunk.
* Maria Odea Ching
option C - Do not merge the branch into trunk.
* (n/a)
Looks like option A wins!
The current plan
1) Identify the changes since the branch has been made.
Branch was created on March 15, 2007 - on revision 518676
2) Merge in changes made on trunk since branch into the branch.
3) Rename the current trunk as branch-0.9
4) Rename the archiva-jpox-database branch as the new trunk.
5) Set the versions in the trunk to 1.0-alpha-1-SNAPSHOT
6) Announce completion of merge to archiva-dev
7) Continue working on admin screens.
8) Once admin screens are stable, get the ball rolling on a 1.0-alpha-1
release.
- Joakim Erdfelt
Joakim Erdfelt wrote:
Lots of work has been done in the archiva database branch in the past
2 months.
It has come time to start the merge back into trunk and get the help
of others to finish off the work.
I wanted to point people to the branch and let them take a look
around, and then vote.
As I see it we have 3 options.
option A [ ] Make the branch the new trunk.
option B [ ] Merge the branch into the existing trunk.
option C [ ] -1 Do not merge the branch into trunk.
I'll wait the usual 72 hours and tabulate the scores.
Scores will be tabulated around 1:00am Sunday UTC.
I favor option A personally, but I don't know what that will mean to
those people that have trunk currently checked out.
The Branch:
https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor
The Good:
1) Completed Integration of JPOX Database into system.
2) Completely overhauled the repository scanning for performance,
availability, resilience, and capabilities.
3) Completely overhauled the reporting system for growth and use of
the database.
The Bad:
1) Admin screens have not yet been converted to the new configuration.
(that's a priority for me ATM)
2) Automatic Artifact relocation on proxied requests has not been
implemented.
3) Untested.
I'm eager to get the other devs involved ASAP.
While the vote is going on, I'll be alternating between Redback
development and Archiva Admin Screen work.
- Joakim Erdfelt