Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1A648200B5B for ; Fri, 5 Aug 2016 19:57:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 19263160A64; Fri, 5 Aug 2016 17:57:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1DB7C160A8E for ; Fri, 5 Aug 2016 19:57:43 +0200 (CEST) Received: (qmail 35206 invoked by uid 500); 5 Aug 2016 17:57:43 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 35131 invoked by uid 99); 5 Aug 2016 17:57:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Aug 2016 17:57:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D0C8EE694; Fri, 5 Aug 2016 17:57:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sewen@apache.org To: commits@flink.apache.org Date: Fri, 05 Aug 2016 17:57:45 -0000 Message-Id: <4e78564720da49deb2b1c4ef8e347135@git.apache.org> In-Reply-To: <8a03b1f237404ed488ebd9373db69fe3@git.apache.org> References: <8a03b1f237404ed488ebd9373db69fe3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] flink git commit: [FLINK-4310] [build] Selectively run API compatibility checks in API projects. archived-at: Fri, 05 Aug 2016 17:57:45 -0000 [FLINK-4310] [build] Selectively run API compatibility checks in API projects. This moves the API compatibility checks into the API projects that use stability annotations. Previously, every project ran the tests, regardless of whether it contained public API classes or not. This closes #2334 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e629b2e8 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e629b2e8 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e629b2e8 Branch: refs/heads/master Commit: e629b2e8eb21b6223335a8a0c2ff1a4d6413597b Parents: 119364c Author: Stephan Ewen Authored: Thu Aug 4 18:08:14 2016 +0200 Committer: Stephan Ewen Committed: Fri Aug 5 16:03:58 2016 +0200 ---------------------------------------------------------------------- flink-annotations/pom.xml | 11 -- .../flink-hadoop-compatibility/pom.xml | 12 ++ flink-core/pom.xml | 11 +- flink-java/pom.xml | 7 + flink-metrics/flink-metrics-core/pom.xml | 10 ++ flink-scala/pom.xml | 7 + flink-shaded-curator/pom.xml | 12 -- flink-shaded-hadoop/pom.xml | 8 - flink-streaming-java/pom.xml | 8 + flink-streaming-scala/pom.xml | 3 +- pom.xml | 154 +++++++++---------- 11 files changed, 120 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/flink-annotations/pom.xml b/flink-annotations/pom.xml index 19af246..effa659 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 - - - - http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-batch-connectors/flink-hadoop-compatibility/pom.xml ---------------------------------------------------------------------- diff --git a/flink-batch-connectors/flink-hadoop-compatibility/pom.xml b/flink-batch-connectors/flink-hadoop-compatibility/pom.xml index 6e69cfb..5bc1852 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 + + + + http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-core/pom.xml ---------------------------------------------------------------------- diff --git a/flink-core/pom.xml b/flink-core/pom.xml index 3c9e61e..7389ef4 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 - - - http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-java/pom.xml ---------------------------------------------------------------------- diff --git a/flink-java/pom.xml b/flink-java/pom.xml index df320b4..6924da8 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 http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-metrics/flink-metrics-core/pom.xml ---------------------------------------------------------------------- diff --git a/flink-metrics/flink-metrics-core/pom.xml b/flink-metrics/flink-metrics-core/pom.xml index a61c6d3..2383fb6 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 + + + + http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml index 18b4e37..88f49e5 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 http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-shaded-curator/pom.xml ---------------------------------------------------------------------- diff --git a/flink-shaded-curator/pom.xml b/flink-shaded-curator/pom.xml index 6142873..274082c 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 - - - - - http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-shaded-hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml index f8fa38e..9564bdd 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 - - - http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-streaming-java/pom.xml ---------------------------------------------------------------------- diff --git a/flink-streaming-java/pom.xml b/flink-streaming-java/pom.xml index 45fb0cf..9ca3e92 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 http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/flink-streaming-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml index d86bb60..26f7cc2 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\$* http://git-wip-us.apache.org/repos/asf/flink/blob/e629b2e8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 93d3b78..32e7730 100644 --- a/pom.xml +++ b/pom.xml @@ -766,63 +766,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 2.4 @@ -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 + + + + + +