Team,

Following the release of 2.0.0-M1, we continue to need a way to flag
Jira issues for potential backporting to the support/nifi-1.x branch.

Even small changes will likely require separate pull requests to apply
to the support branch, due to Java language level differences. There
are some exceptions, such as minor dependency version upgrades for
libraries that follow semantic versioning.

Rather than continuing to use the Jira Fix version field to flag the
intended version, I propose using the Label field with the
backport-needed flag, as shown in NIFI-12418 [1]. This is an easier
example because it is a bug that impacts multiple versions, so the
Affects Version field applies.

When it comes to submitting pull requests, submitting against the main
branch indicates that 2.0.0 should be targeted, and submitting against
support/nifi-1.x indicates that version 1 should be targeted.

In cases where a change should be applied to both 2.0.0 and version 1,
the backport-needed flag signals to the reviewer that change should be
backported by the reviewer. As mentioned earlier, given the divergence
of main and support branches based on features and language level,
this scenario should be less common.

In cases where there are larger changes needed, separate Jira issues
can be filed, and then linked. That will allow primary work to be
completed on the main branch for 2.0, and separate work for the
support branch to be tracked as needed.

Some amount of evaluation is necessary on a case-by-case basis, but as
we continue to make progress on a full 2.0.0 release, this approach
will allow Release Managers to maintain the standard use of the Fix
Version field as the definitive marker for issues resolved in a
particular version.

Regards,
David Handermann

[1] https://issues.apache.org/jira/browse/NIFI-12418

Reply via email to