This document explains the release strategy for artifacts in this organization.
Given the current major release of 1.0, projects in this organization maintain the following active branches.
- main: The next major release. This is the branch where all merges take place and code moves fast.
- 1.x: The next minor release. Once a change is merged into
main
, decide whether to backport it to1.x
. - 1.0: The current release. In between minor releases, only hotfixes (e.g. security) are backported to
1.0
.
Label PRs with the next major version label (e.g. 2.0.0
) and merge changes into main
. Label PRs that you believe need to be backported as 1.x
and 1.0
. Backport PRs by checking out the versioned branch, cherry-pick changes and open a PR against each target backport branch.
Do not creating branches in the upstream repo, use your fork, for the exception of long lasting feature branches that require active collaboration from multiple developers. Name feature branches feature/<thing>
. Once the work is merged to main
, please make sure to delete the feature branch.
Repositories create consistent release labels, such as v1.0.0
, v1.1.0
and v2.0.0
, as well as backport
. Use release labels to target an issue or a PR for a given release. See MAINTAINERS for more information on triaging issues.
The backwards compatibility test suite is used to ensure upgrades to the current version are successful.
When releasing a new version, update the bwc.version
to the latest, previous minor version in gradle.properties.
The release process is standard across repositories in this org and is run by a release manager volunteering from amongst MAINTAINERS.