This is an automated email from the ASF dual-hosted git repository.
mapohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new c2a76f7a82c [hotfix][docs] Makes the japicmp script documentation more
consistent after the change in cb442936.
c2a76f7a82c is described below
commit c2a76f7a82cee9e089ea89731568f2e522c3ea43
Author: Matthias Pohl <[email protected]>
AuthorDate: Fri Oct 28 14:09:03 2022 +0200
[hotfix][docs] Makes the japicmp script documentation more consistent after
the change in cb442936.
---
tools/releasing/update_japicmp_configuration.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/releasing/update_japicmp_configuration.sh
b/tools/releasing/update_japicmp_configuration.sh
index 378801687e0..3d571e7b632 100755
--- a/tools/releasing/update_japicmp_configuration.sh
+++ b/tools/releasing/update_japicmp_configuration.sh
@@ -34,18 +34,18 @@ fi
# There is a master branch with a version X.Y-SNAPSHOT, with a japicmp
reference version of X.(Y-1).0 .
# Release flow:
# - update the master to X.(Y+1)-SNAPSHOT, but keep the reference version
intact since X.Y.0 is not released (yet)
-# - create X.Y-SNAPSHOT branch, but keep the reference version intact
since X.Y.0 is not released (yet)
+# - create snapshot branch for X.Y-SNAPSHOT (i.e. release-X.Y), but keep
the reference version intact since X.Y.0 is not released (yet)
# - release X.Y.0
-# - update the japicmp reference version of both master and the release
branch X.Y-SNAPSHOT to X.Y.0
-# - enable stronger compatibility constraints for X.Y-SNAPSHOT in the
release branch to ensure compatibility for PublicEvolving
+# - update the japicmp reference version of both master and the snapshot
branch for X.Y-SNAPSHOT to X.Y.0
+# - enable stronger compatibility constraints for X.Y-SNAPSHOT in the
snapshot branch to ensure compatibility for PublicEvolving
# Scenario B) New minor release X.Y.Z
# Premise:
-# There is a snapshot branch with a version X.Y-SNAPSHOT, with a japicmp
reference version of X.Y.(Z-1)
+# There is a snapshot branch release-X.Y having a version X.Y-SNAPSHOT,
with a japicmp reference version of X.Y.(Z-1)
# Release flow:
-# - create X.Y.Z-rc branch
+# - create X.Y.Z-rc* branch
# - update the japicmp reference version of X.Y.Z to X.Y.(Z-1)
# - release X.Y.Z
-# - update the japicmp reference version of X.Y-SNAPSHOT to X.Y.Z
+# - update the japicmp reference version of X.Y-SNAPSHOT (in the snapshot
branch release-X.Y) to X.Y.Z
POM=../pom.xml
function enable_public_evolving_compatibility_checks() {
