Skip to content

Commit 223983a

Browse files
authored
[FLINK-38671] Update japicmp configuration post 2.0.1 (#27217)
1 parent 6dbc563 commit 223983a

File tree

1 file changed

+2
-85
lines changed

1 file changed

+2
-85
lines changed

pom.xml

Lines changed: 2 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ under the License.
170170
<minikdc.version>3.2.4</minikdc.version>
171171
<hive.version>2.3.10</hive.version>
172172
<orc.version>1.5.6</orc.version>
173-
<japicmp.referenceVersion>1.20.0</japicmp.referenceVersion>
173+
<japicmp.referenceVersion>2.0.1</japicmp.referenceVersion>
174174
<japicmp.outputDir>tools/japicmp-output</japicmp.outputDir>
175175
<checkstyle.version>10.18.2</checkstyle.version>
176176
<spotless.skip>false</spotless.skip>
@@ -2308,97 +2308,14 @@ under the License.
23082308
<include>@org.apache.flink.annotation.Public</include>
23092309
<!-- The following line is un-commented by tools/releasing/update_japicmp_configuration.sh
23102310
as part of the release process -->
2311-
<!--<include>@org.apache.flink.annotation.PublicEvolving</include>-->
2311+
<include>@org.apache.flink.annotation.PublicEvolving</include>
23122312
</includes>
23132313
<excludes>
23142314
<exclude>@java.lang.Deprecated</exclude>
23152315
<exclude>*.scala</exclude>
23162316
<exclude>@org.apache.flink.annotation.Experimental</exclude>
2317-
<exclude>@org.apache.flink.annotation.PublicEvolving</exclude>
23182317
<exclude>@org.apache.flink.annotation.Internal</exclude>
23192318
<!-- MARKER: start exclusions; these will be wiped by tools/releasing/update_japicmp_configuration.sh -->
2320-
<!-- Mark these 2 methods to @Internal. Tracked under FLINK-34130, should be removed in 2.0 -->
2321-
<exclude>org.apache.flink.configuration.Configuration#getBytes(java.lang.String,byte[])</exclude>
2322-
<exclude>org.apache.flink.configuration.Configuration#setBytes(java.lang.String,byte[])</exclude>
2323-
<!-- FLIP-344: Remove parameter in RichFunction#open in 2.0 -->
2324-
<exclude>org.apache.flink.api.common.functions.AbstractRichFunction#open(org.apache.flink.configuration.Configuration)</exclude>
2325-
<exclude>org.apache.flink.api.common.functions.RichCoGroupFunction</exclude>
2326-
<exclude>org.apache.flink.api.common.functions.RichCrossFunction</exclude>
2327-
<exclude>org.apache.flink.api.common.functions.RichFilterFunction</exclude>
2328-
<exclude>org.apache.flink.api.common.functions.RichFlatJoinFunction</exclude>
2329-
<exclude>org.apache.flink.api.common.functions.RichFlatMapFunction</exclude>
2330-
<exclude>org.apache.flink.api.common.functions.RichGroupCombineFunction</exclude>
2331-
<exclude>org.apache.flink.api.common.functions.RichGroupReduceFunction</exclude>
2332-
<exclude>org.apache.flink.api.common.functions.RichJoinFunction</exclude>
2333-
<exclude>org.apache.flink.api.common.functions.RichMapFunction</exclude>
2334-
<exclude>org.apache.flink.api.common.functions.RichMapPartitionFunction</exclude>
2335-
<exclude>org.apache.flink.api.common.functions.RichReduceFunction</exclude>
2336-
<!-- FLINK-35886: WatermarksWithIdleness constructor was marked as deprecated -->
2337-
<exclude>org.apache.flink.api.common.eventtime.WatermarksWithIdleness</exclude>
2338-
<!-- FLINK-35812 move tuple interfaces into flink-core-api, should be removed in 2.0 -->
2339-
<exclude>org.apache.flink.api.java.tuple.*</exclude>
2340-
<exclude>org.apache.flink.types.NullFieldException</exclude>
2341-
<!-- The following exclusions are due to classes being relocated from the flink-streaming-java
2342-
module to the flink-runtime module. -->
2343-
<exclude>org.apache.flink.streaming.api.functions.windowing.AllWindowFunction</exclude>
2344-
<exclude>org.apache.flink.streaming.api.datastream.CoGroupedStreams</exclude>
2345-
<exclude>org.apache.flink.streaming.api.datastream.ConnectedStreams</exclude>
2346-
<exclude>org.apache.flink.streaming.api.datastream.DataStream</exclude>
2347-
<exclude>apache.flink.streaming.api.datastream.JoinedStreams</exclude>
2348-
<exclude>org.apache.flink.streaming.api.datastream.SingleOutputStreamOperator</exclude>
2349-
<exclude>org.apache.flink.streaming.api.datastream.WindowedStream</exclude>
2350-
<exclude>org.apache.flink.streaming.api.environment.StreamExecutionEnvironment</exclude>
2351-
<exclude>org.apache.flink.streaming.api.datastream.AllWindowedStream</exclude>
2352-
<exclude>org.apache.flink.streaming.api.datastream.JoinedStreams</exclude>
2353-
<exclude>org.apache.flink.streaming.api.checkpoint.CheckpointedFunction</exclude>
2354-
<exclude>org.apache.flink.streaming.api.CheckpointingMode</exclude>
2355-
<exclude>org.apache.flink.streaming.api.datastream.DataStreamSink</exclude>
2356-
<exclude>org.apache.flink.streaming.api.datastream.DataStreamSource</exclude>
2357-
<exclude>org.apache.flink.streaming.api.datastream.KeyedStream</exclude>
2358-
<exclude>org.apache.flink.streaming.api.datastream.SideOutputDataStream</exclude>
2359-
<exclude>org.apache.flink.streaming.api.environment.CheckpointConfig</exclude>
2360-
<exclude>org.apache.flink.streaming.api.environment.LocalStreamEnvironment</exclude>
2361-
<exclude>org.apache.flink.streaming.api.environment.RemoteStreamEnvironment</exclude>
2362-
<exclude>org.apache.flink.streaming.api.functions.co.CoFlatMapFunction</exclude>
2363-
<exclude>org.apache.flink.streaming.api.functions.co.CoMapFunction</exclude>
2364-
<exclude>org.apache.flink.streaming.api.functions.sink.RichSinkFunction</exclude>
2365-
<exclude>org.apache.flink.streaming.api.functions.sink.SinkFunction</exclude>
2366-
<exclude>org.apache.flink.streaming.api.functions.source.SourceFunction</exclude>
2367-
<exclude>org.apache.flink.streaming.api.functions.windowing.WindowFunction</exclude>
2368-
<exclude>org.apache.flink.streaming.api.functions.source.RichSourceFunction</exclude>
2369-
<exclude>org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction</exclude>
2370-
<exclude>org.apache.flink.streaming.api.functions.source.ParallelSourceFunction</exclude>
2371-
<!-- FLINK-3992 Do not implement deprecated Key interface in flink 2.0 -->
2372-
<exclude>org.apache.flink.types.DoubleValue</exclude>
2373-
<exclude>org.apache.flink.types.FloatValue</exclude>
2374-
<exclude>org.apache.flink.types.NormalizableKey</exclude>
2375-
<!-- FLINK-36366 Remove deprecate API in flink-core -->
2376-
<exclude>org.apache.flink.api.common.io.SerializedOutputFormat</exclude>
2377-
<exclude>org.apache.flink.api.common.io.OutputFormat</exclude>
2378-
<exclude>org.apache.flink.api.common.io.FinalizeOnMaster</exclude>
2379-
<exclude>org.apache.flink.api.common.io.FileOutputFormat</exclude>
2380-
<exclude>org.apache.flink.api.common.io.BinaryOutputFormat</exclude>
2381-
<!-- FLINK-5336 Remove IOReadableWritable from Path in flink-2.0. -->
2382-
<exclude>org.apache.flink.core.fs.Path</exclude>
2383-
<!-- The following exclusions are due to the flink-hadoop-compatibility_${scala.binary.version} module has renamed to flink-hadoop-compatibility. -->
2384-
<exclude>org.apache.flink.api.java.hadoop.mapred.HadoopInputFormat</exclude>
2385-
<exclude>org.apache.flink.api.java.hadoop.mapred.HadoopOutputFormat</exclude>
2386-
<exclude>org.apache.flink.api.java.hadoop.mapreduce.HadoopInputFormat</exclude>
2387-
<exclude>org.apache.flink.api.java.hadoop.mapreduce.HadoopOutputFormat</exclude>
2388-
<exclude>org.apache.flink.api.java.typeutils.WritableTypeInfo</exclude>
2389-
<!-- The following exclusions are due to classes being relocated from the flink-java
2390-
module to the flink-core module. -->
2391-
<exclude>org.apache.flink.api.java.utils.AbstractParameterTool</exclude>
2392-
<exclude>org.apache.flink.api.java.utils.ParameterTool</exclude>
2393-
<!-- FLINK-36327 Remove dependency about flink-scala and flink-streaming-scala in table module in flink-2.0 -->
2394-
<exclude>org.apache.flink.table.api.typeutils.*</exclude>
2395-
<!-- FLINK-36245 Remove Sink.InitContext in flink-2.0. -->
2396-
<exclude>org.apache.flink.api.connector.sink2.Sink</exclude>
2397-
<!-- FLINK-36245 move SourceFunction to legacy package in flink-2.0. -->
2398-
<exclude>org.apache.flink.walkthrough.common.source.TransactionSource</exclude>
2399-
<!-- FLIP-467 Introduce Generalized Watermarks in flink-2.0. -->
2400-
<exclude>org.apache.flink.api.connector.source.Source</exclude>
2401-
<exclude>org.apache.flink.api.connector.source.SourceReaderContext</exclude>
24022319
<!-- MARKER: end exclusions -->
24032320
</excludes>
24042321
<accessModifier>public</accessModifier>

0 commit comments

Comments
 (0)