[FLINK-7350] [travis] Only execute japicmp in misc profile This closes #4461.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/be8eb1a6 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/be8eb1a6 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/be8eb1a6 Branch: refs/heads/master Commit: be8eb1a6000ad7fb97c254a1bd46f5b058e04d45 Parents: c4a5dd8 Author: zentol <ches...@apache.org> Authored: Wed Aug 2 12:06:56 2017 +0200 Committer: zentol <ches...@apache.org> Committed: Mon Aug 7 15:16:56 2017 +0200 ---------------------------------------------------------------------- pom.xml | 20 +++++++++++++++++++- tools/travis_mvn_watchdog.sh | 8 ++++---- 2 files changed, 23 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/be8eb1a6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 62f4e31..427e813 100644 --- a/pom.xml +++ b/pom.xml @@ -118,6 +118,7 @@ under the License. <junit.version>4.12</junit.version> <mockito.version>1.10.19</mockito.version> <powermock.version>1.6.5</powermock.version> + <japicmp.skip>false</japicmp.skip> <!-- Keeping the MiniKDC version fixed instead of taking hadoop version dependency to support testing Kafka, ZK etc., modules that does not have Hadoop dependency @@ -694,6 +695,23 @@ under the License. </plugins> </build> </profile> + + <profile> + <!--japicmp 0.7 does not support deactivation from the command + line, so we have to use a workaround with profiles instead. + This can be removed when upgrading japicmp to 0.10+. + --> + <id>skip-japicmp</id> + <activation> + <property> + <name>japicmp.skip</name> + <value>true</value> + </property> + </activation> + <properties> + <japicmp.skip>true</japicmp.skip> + </properties> + </profile> <profile> <!-- used for SNAPSHOT and regular releases --> @@ -1388,7 +1406,7 @@ under the License. <!-- Don't break build on newly added maven modules --> <ignoreNonResolvableArtifacts>true</ignoreNonResolvableArtifacts> </parameter> - <skip>false</skip> + <skip>${japicmp.skip}</skip> <dependencies> <dependency> <groupId>org.apache.flink</groupId> http://git-wip-us.apache.org/repos/asf/flink/blob/be8eb1a6/tools/travis_mvn_watchdog.sh ---------------------------------------------------------------------- diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh index b590b00..b837fbd 100755 --- a/tools/travis_mvn_watchdog.sh +++ b/tools/travis_mvn_watchdog.sh @@ -108,22 +108,22 @@ case $TEST in (core) MVN_COMPILE_MODULES="-pl $MODULES_CORE -am" MVN_TEST_MODULES="-pl $MODULES_CORE" - MVN_COMPILE_OPTIONS="-Dcheckstyle.skip=true" + MVN_COMPILE_OPTIONS="-Dcheckstyle.skip=true -Djapicmp.skip=true" ;; (libraries) MVN_COMPILE_MODULES="-pl $MODULES_LIBRARIES -am" MVN_TEST_MODULES="-pl $MODULES_LIBRARIES" - MVN_COMPILE_OPTIONS="-Dcheckstyle.skip=true" + MVN_COMPILE_OPTIONS="-Dcheckstyle.skip=true -Djapicmp.skip=true" ;; (connectors) MVN_COMPILE_MODULES="-pl $MODULES_CONNECTORS -am" MVN_TEST_MODULES="-pl $MODULES_CONNECTORS" - MVN_COMPILE_OPTIONS="-Dcheckstyle.skip=true" + MVN_COMPILE_OPTIONS="-Dcheckstyle.skip=true -Djapicmp.skip=true" ;; (tests) MVN_COMPILE_MODULES="-pl $MODULES_TESTS -am" MVN_TEST_MODULES="-pl $MODULES_TESTS" - MVN_COMPILE_OPTIONS="-Dcheckstyle.skip=true" + MVN_COMPILE_OPTIONS="-Dcheckstyle.skip=true -Djapicmp.skip=true" ;; (misc) NEGATED_CORE=\!${MODULES_CORE//,/,\!}
