Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

All new features should be integrated into the latest revision or the trunk. Once a new feature is implemented and integrated into the trunk it can then be decided which branches the new features should be applied to. There may be rare cases where a new feature only applies to a particular branch but in general all new features go to the trunk first and disseminated from there. The important thing is that all changes go into the trunk first, then get merged into the release branch as needed, so no changes ever get dropped by mistake. Changes should be kept in sync at all times where possible.

Releases

Creating a release branch

  • if we want to relieve the burden from people working then are we going to have a release manager assigned to do the merges. we just need to ensure that the changes get to the branches from the trunk. if we keep track of the revision markers then this should be easy to do

Releases

Creating a release branch

  • A release branch should be made well in advance of the release to allow for stabilzation of the release and the preparation of RCs
  • A release branch should be made well in advance of the release to allow for stabilzation of release and the preparation of RCs
  • Make sure that everyone has checked in their local modifications before the branch is created.
  • Copy using URLs as everything will occur on the server and be faster.

...

  • need to sort out how they will be named, but i think they should be named rc1, rc2, etc. but this might make releasing a pita
  • we also need to sort out what to do with the rc that is release quality? just rebuild, or rename somehow (i don't think we could easily do this right now)

Soak period for RCs

RCs should be circulated for no less then three days so that we can accurately determine if there are any defects present. When you are ready to release the RC create the tag and then release with the release plug-in:

No Format

svn copy -m "Tag release 2.0.3" svn://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x svn://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.3-rc1

 RCs should be circulated for no less then three days so that we can accurately determine if there are any defects present.

How to integrate bug fixes into an RC

...

When you are ready to create a release you need to create a tag and release with the release plug-in:

No Format
svn copy -m "Tag release 2.0.3" svn://svn.apache.org/repos/asf/maven/XXX/branches/maven-2.0.x svn://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.3

...