You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/07/01 10:06:48 UTC
[15/16] flink git commit: [FLINK-7048] [travis] Define javadoc
skipping in travis watchdog script
[FLINK-7048] [travis] Define javadoc skipping in travis watchdog script
This closes #4227.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/95d70db3
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/95d70db3
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/95d70db3
Branch: refs/heads/master
Commit: 95d70db36ca05b63e7bd6563ff534038b765c4ed
Parents: caf149e
Author: zentol <ch...@apache.org>
Authored: Thu Jun 29 23:17:01 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Sat Jul 1 10:40:46 2017 +0200
----------------------------------------------------------------------
.travis.yml | 24 ++++++++++++------------
tools/travis_mvn_watchdog.sh | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/95d70db3/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d30e172..5bfb549 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,32 +17,32 @@ matrix:
include:
# Always run test groups A and B together
- jdk: "oraclejdk8"
- env: PROFILE="-Dhadoop.version=2.8.0 -Pflink-fast-tests-a,include-kinesis,jdk8 -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.8.0 -Pflink-fast-tests-a,include-kinesis,jdk8"
- jdk: "oraclejdk8"
- env: PROFILE="-Dhadoop.version=2.8.0 -Pflink-fast-tests-b,include-kinesis,jdk8 -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.8.0 -Pflink-fast-tests-b,include-kinesis,jdk8"
- jdk: "oraclejdk8"
- env: PROFILE="-Dhadoop.version=2.8.0 -Pflink-fast-tests-c,include-kinesis,jdk8 -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.8.0 -Pflink-fast-tests-c,include-kinesis,jdk8"
- jdk: "oraclejdk8"
- env: PROFILE="-Dhadoop.version=2.7.3 -Dscala-2.10 -Pflink-fast-tests-a,include-kinesis -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.7.3 -Dscala-2.10 -Pflink-fast-tests-a,include-kinesis"
- jdk: "oraclejdk8"
- env: PROFILE="-Dhadoop.version=2.7.3 -Dscala-2.10 -Pflink-fast-tests-b,include-kinesis -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.7.3 -Dscala-2.10 -Pflink-fast-tests-b,include-kinesis"
- jdk: "oraclejdk8"
- env: PROFILE="-Dhadoop.version=2.7.3 -Dscala-2.10 -Pflink-fast-tests-c,include-kinesis -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.7.3 -Dscala-2.10 -Pflink-fast-tests-c,include-kinesis"
- jdk: "openjdk7"
- env: PROFILE="-Dhadoop.version=2.6.5 -Pflink-fast-tests-a,include-kinesis -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.6.5 -Pflink-fast-tests-a,include-kinesis"
- jdk: "openjdk7"
- env: PROFILE="-Dhadoop.version=2.6.5 -Pflink-fast-tests-b,include-kinesis -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.6.5 -Pflink-fast-tests-b,include-kinesis"
- jdk: "openjdk7"
- env: PROFILE="-Dhadoop.version=2.6.5 -Pflink-fast-tests-c,include-kinesis -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.6.5 -Pflink-fast-tests-c,include-kinesis"
- jdk: "openjdk7"
- env: PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pflink-fast-tests-a,include-kinesis -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pflink-fast-tests-a,include-kinesis"
- jdk: "openjdk7"
- env: PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pflink-fast-tests-b,include-kinesis -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pflink-fast-tests-b,include-kinesis"
- jdk: "openjdk7"
- env: PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pflink-fast-tests-c,include-kinesis -Dmaven.javadoc.skip=true"
+ env: PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Pflink-fast-tests-c,include-kinesis"
git:
depth: 100
http://git-wip-us.apache.org/repos/asf/flink/blob/95d70db3/tools/travis_mvn_watchdog.sh
----------------------------------------------------------------------
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index 3f59cdf..836bfe1 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -45,7 +45,7 @@ LOG4J_PROPERTIES=${HERE}/log4j-travis.properties
# Maven command to run. We set the forkCount manually, because otherwise Maven sees too many cores
# on the Travis VMs.
-MVN="mvn -Dflink.forkCount=2 -Dflink.forkCountTestPackage=1 -B $PROFILE -Dlog.dir=${ARTIFACTS_DIR} -Dlog4j.configuration=file://$LOG4J_PROPERTIES clean install"
+MVN="mvn -Dflink.forkCount=2 -Dflink.forkCountTestPackage=1 -B -Dmaven.javadoc.skip=true $PROFILE -Dlog.dir=${ARTIFACTS_DIR} -Dlog4j.configuration=file://$LOG4J_PROPERTIES clean install"
MVN_PID="${ARTIFACTS_DIR}/watchdog.mvn.pid"
MVN_EXIT="${ARTIFACTS_DIR}/watchdog.mvn.exit"