Versions Compared

Key

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

...

  1. If this is a new major release (i.e., Y = 0 and Z = 0)
    1. Create a new branch (branch-X) for all releases in this major release.
    2. Update the version on trunk to (X+1).0.0-SNAPSHOT

      mvn versions:set -DnewVersion=(X+1).0.0-SNAPSHOT
      
    3. Commit the version change to trunk.

      git commit -a -m "Preparing for (X+1).0.0 development"
      
  2. If this is a new minor release (i.e., Z = 0)
    1. Create a new branch (branch-X.Y) for all releases in this minor release.
    2. Update the version on branch-X to X.(Y+1).0-SNAPSHOT

      mvn versions:set -DnewVersion=X.(Y+1).0-SNAPSHOT
      
    3. Commit the version change to branch-X.

      git commit -a -m "Preparing for X.(Y+1).0 development"
      
  3. If this is a new point release (i.e., always)
    1. Create a new branch (branch-X.Y.Z) for this release.
    2. Update the version on branch-X.Y to X.Y.(Z+1)-SNAPSHOT

      mvn versions:set -DnewVersion=X.Y.(Z+1)-SNAPSHOT
      
    3. Commit the version change to branch-X.Y.

      git commit -a -m "Preparing for X.Y.(Z+1) development"
      
  4. Release branch (branch-X.Y.Z) updates:
    1. Update the version on branch-X.Y.Z TO X.Y.Z

      mvn versions:set -DnewVersion=X.Y.Z
      

Note: Please also also update the hadoop.version property in the root pom.xml and hadoop.assemblies.version in hadoop-project/pom.xml (see HADOOP-15369)

mvn versions:set-property -Dproperty=hadoop.version -DnewVersion=X.Y.Z

mvn versions:set-property -Dproperty=hadoop.assemblies.version -DnewVersion=X.Y.Z

Now, for any branches in {trunk, branch-X, branch-X.Y, branch-X.Y.Z} that have changed, push them to the remote repo taking care of any conflicts.

...