Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FLINK-29787][ci] fix ci METHOD_NEW_DEFAULT issue #21184

Merged
merged 2 commits into from
Oct 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions tools/releasing/update_japicmp_configuration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down