diff --git a/flink-annotations/pom.xml b/flink-annotations/pom.xml index 19af246fc07c9..effa65998f344 100644 --- a/flink-annotations/pom.xml +++ b/flink-annotations/pom.xml @@ -34,15 +34,4 @@ under the License. jar - - - - com.github.siom79.japicmp - japicmp-maven-plugin - - true - - - - diff --git a/flink-batch-connectors/flink-hadoop-compatibility/pom.xml b/flink-batch-connectors/flink-hadoop-compatibility/pom.xml index 6e69cfbe2b865..5bc1852141b0a 100644 --- a/flink-batch-connectors/flink-hadoop-compatibility/pom.xml +++ b/flink-batch-connectors/flink-hadoop-compatibility/pom.xml @@ -74,4 +74,16 @@ under the License. test + + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + diff --git a/flink-core/pom.xml b/flink-core/pom.xml index 3c9e61e7ee651..7389ef4667186 100644 --- a/flink-core/pom.xml +++ b/flink-core/pom.xml @@ -108,7 +108,8 @@ under the License. - + + com.github.siom79.japicmp japicmp-maven-plugin @@ -119,14 +120,6 @@ under the License. - - - verify - - cmp - - - diff --git a/flink-java/pom.xml b/flink-java/pom.xml index df320b4a67c48..6924da8bbedca 100644 --- a/flink-java/pom.xml +++ b/flink-java/pom.xml @@ -77,6 +77,13 @@ under the License. + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + org.apache.maven.plugins diff --git a/flink-metrics/flink-metrics-core/pom.xml b/flink-metrics/flink-metrics-core/pom.xml index a61c6d33c852b..2383fb695f8e5 100644 --- a/flink-metrics/flink-metrics-core/pom.xml +++ b/flink-metrics/flink-metrics-core/pom.xml @@ -32,4 +32,14 @@ under the License. flink-metrics-core flink-metrics-core + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml index 18b4e37db6f5a..88f49e59514f2 100644 --- a/flink-scala/pom.xml +++ b/flink-scala/pom.xml @@ -106,6 +106,13 @@ under the License. + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + net.alchim31.maven diff --git a/flink-shaded-curator/pom.xml b/flink-shaded-curator/pom.xml index 6142873616ec2..274082c860b40 100644 --- a/flink-shaded-curator/pom.xml +++ b/flink-shaded-curator/pom.xml @@ -38,16 +38,4 @@ pom - - - - com.github.siom79.japicmp - japicmp-maven-plugin - - true - - - - - diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml index f8fa38eb823e8..9564bdd48af74 100644 --- a/flink-shaded-hadoop/pom.xml +++ b/flink-shaded-hadoop/pom.xml @@ -163,14 +163,6 @@ under the License. - - com.github.siom79.japicmp - japicmp-maven-plugin - - true - - - diff --git a/flink-streaming-java/pom.xml b/flink-streaming-java/pom.xml index 45fb0cf86e19c..9ca3e92936cf5 100644 --- a/flink-streaming-java/pom.xml +++ b/flink-streaming-java/pom.xml @@ -95,6 +95,13 @@ under the License. + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + @@ -104,6 +111,7 @@ under the License. false + org.apache.maven.plugins maven-jar-plugin diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml index d86bb60473314..26f7cc2cf1dbf 100644 --- a/flink-streaming-scala/pom.xml +++ b/flink-streaming-scala/pom.xml @@ -215,13 +215,14 @@ under the License. - + com.github.siom79.japicmp japicmp-maven-plugin + *\$\$anon\$* diff --git a/pom.xml b/pom.xml index 93d3b787fb9f4..32e7730219e8e 100644 --- a/pom.xml +++ b/pom.xml @@ -765,63 +765,6 @@ under the License. - - com.github.siom79.japicmp - japicmp-maven-plugin - 0.7.0 - - - - org.apache.flink - ${project.artifactId} - 1.0.0 - ${project.packaging} - - - - - ${project.build.directory}/${project.artifactId}-${project.version}.${project.packaging} - - - - true - - @org.apache.flink.annotation.Public - - - @org.apache.flink.annotation.PublicEvolving - @org.apache.flink.annotation.Internal - - public - false - true - true - false - true - false - true - - true - - false - - - org.apache.flink - flink-annotations - ${project.version} - - - - - - verify - - cmp - - - - - org.apache.maven.plugins maven-jar-plugin @@ -1128,20 +1071,19 @@ under the License. - + + - + + org.apache.maven.plugins maven-shade-plugin 2.4.1 - + + org.eclipse.m2e lifecycle-mapping @@ -1151,15 +1093,9 @@ under the License. - - pl.project13.maven - - - git-commit-id-plugin - - - [2.1.5,) - + pl.project13.maven + git-commit-id-plugin + [2.1.5,) revision @@ -1170,15 +1106,9 @@ under the License. - - org.apache.maven.plugins - - - maven-checkstyle-plugin - - - [2.12.1,) - + org.apache.maven.plugins + maven-checkstyle-plugin + [2.12.1,) check @@ -1248,7 +1178,67 @@ under the License. scala-maven-plugin 3.2.2 + + + + com.github.siom79.japicmp + japicmp-maven-plugin + 0.7.0 + + + + org.apache.flink + ${project.artifactId} + 1.0.0 + ${project.packaging} + + + + + ${project.build.directory}/${project.artifactId}-${project.version}.${project.packaging} + + + + true + + @org.apache.flink.annotation.Public + + + @org.apache.flink.annotation.PublicEvolving + @org.apache.flink.annotation.Internal + + public + false + true + true + false + true + false + true + + true + + false + + + org.apache.flink + flink-annotations + ${project.version} + + + + + + verify + + cmp + + + + + +