I spent the whole last week cherry picking commits from trunk/branch-3.2 to
branch-3.1 (should've done this prior to 3.1.4 code freeze). There were
about 50-60 of them, many of them are conflict-free, and several of them
are critical bug fixes.

If your commit stays in trunk, it'll be useless for the community until the
next minor release, and many months after people start using the new
release.

Here are a few tips:
(1) update dependency to address a know security vulnerability, should be
cherry picked into all lower branches, especially when it updates the
maintenance release number. Example: update commons-compress from 1.18 to
1.19.

(2) blocker/critical bug fixes should be backported to all applicable
branches.

(3) because of the removal of commons-logging and a few code refactors,
commits may apply cleanly but doesn't compile in branch-3.2, branch-3.1 and
lower branches. Please spend the time to verify a commit is good.

Best
Weichiu

Reply via email to