From 6cb5bf2e6295da757fc49f4d97cd649f7628ccba Mon Sep 17 00:00:00 2001
From: Yubin Li <lixin58688@163.com>
Date: Fri, 28 Oct 2022 15:03:53 +0800
Subject: [PATCH 1/2] [FLINK-29787][build] fix ci METHOD_NEW_DEFAULT issue

---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index f3ca3bc9de95c..4ab072cf332a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2153,6 +2153,18 @@ under the License.
 							<packagingSupporteds>
 								<packagingSupported>jar</packagingSupported>
 							</packagingSupporteds>
+							<overrideCompatibilityChangeParameters>
+								<overrideCompatibilityChangeParameter>
+									<compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
+									<binaryCompatible>true</binaryCompatible>
+									<sourceCompatible>true</sourceCompatible>
+								</overrideCompatibilityChangeParameter>
+								<overrideCompatibilityChangeParameter>
+									<compatibilityChange>METHOD_ADDED_TO_INTERFACE</compatibilityChange>
+									<binaryCompatible>true</binaryCompatible>
+									<sourceCompatible>true</sourceCompatible>
+								</overrideCompatibilityChangeParameter>
+							</overrideCompatibilityChangeParameters>
 						</parameter>
 						<projectBuildDir>${rootDir}/${japicmp.outputDir}/${project.artifactId}</projectBuildDir>
 						<dependencies>

From e8c80837f8131b755bf0c8fffcc1e07293c562ef Mon Sep 17 00:00:00 2001
From: Matthias Pohl <matthias.pohl@aiven.io>
Date: Fri, 28 Oct 2022 10:37:02 +0200
Subject: [PATCH 2/2] [FLINK-29787][build] Disables japicmp for @PublicEvolving
 APIs on master & Updates update_japicmp_configuration.sh comments

---
 pom.xml                                         | 15 ++-------------
 tools/releasing/update_japicmp_configuration.sh |  4 ++--
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4ab072cf332a4..713aba24560ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2112,10 +2112,11 @@ under the License.
 								<include>@org.apache.flink.annotation.Public</include>
 								<!-- The following line is un-commented by tools/releasing/update_japicmp_configuration.sh
 								 	as part of the release process -->
-								<include>@org.apache.flink.annotation.PublicEvolving</include>
+								<!--<include>@org.apache.flink.annotation.PublicEvolving</include>-->
 							</includes>
 							<excludes>
 								<exclude>@org.apache.flink.annotation.Experimental</exclude>
+								<exclude>@org.apache.flink.annotation.PublicEvolving</exclude>
 								<exclude>@org.apache.flink.annotation.Internal</exclude>
 								<!-- MARKER: start exclusions; these will be wiped by tools/releasing/update_japicmp_configuration.sh -->
 								<exclude>org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator#getSideOutput(org.apache.flink.util.OutputTag)</exclude>
@@ -2153,18 +2154,6 @@ under the License.
 							<packagingSupporteds>
 								<packagingSupported>jar</packagingSupported>
 							</packagingSupporteds>
-							<overrideCompatibilityChangeParameters>
-								<overrideCompatibilityChangeParameter>
-									<compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
-									<binaryCompatible>true</binaryCompatible>
-									<sourceCompatible>true</sourceCompatible>
-								</overrideCompatibilityChangeParameter>
-								<overrideCompatibilityChangeParameter>
-									<compatibilityChange>METHOD_ADDED_TO_INTERFACE</compatibilityChange>
-									<binaryCompatible>true</binaryCompatible>
-									<sourceCompatible>true</sourceCompatible>
-								</overrideCompatibilityChangeParameter>
-							</overrideCompatibilityChangeParameters>
 						</parameter>
 						<projectBuildDir>${rootDir}/${japicmp.outputDir}/${project.artifactId}</projectBuildDir>
 						<dependencies>
diff --git a/tools/releasing/update_japicmp_configuration.sh b/tools/releasing/update_japicmp_configuration.sh
index 45a4661c99475..378801687e0a0 100755
--- a/tools/releasing/update_japicmp_configuration.sh
+++ b/tools/releasing/update_japicmp_configuration.sh
@@ -36,8 +36,8 @@ fi
 #     - 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)
 #     - release X.Y.0
-#     - update the japicmp reference version of both master and X.Y-SNAPSHOT to X.Y.0
-#     - enable stronger compatibility constraints for X.Y-SNAPSHOT to ensure compatibility for PublicEvolving
+#     - 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
 # 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)