flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject flink git commit: [build system] Skip javadoc generation for java8 and snapshot deployments
Date Tue, 09 Feb 2016 22:51:41 GMT
Repository: flink
Updated Branches:
  refs/heads/master de231d746 -> 59b237b5d


[build system] Skip javadoc generation for java8 and snapshot deployments


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/59b237b5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/59b237b5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/59b237b5

Branch: refs/heads/master
Commit: 59b237b5d2169d50f886af64df880cb614408890
Parents: de231d7
Author: Robert Metzger <rmetzger@apache.org>
Authored: Tue Feb 9 23:50:45 2016 +0100
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Tue Feb 9 23:50:45 2016 +0100

----------------------------------------------------------------------
 .travis.yml              | 4 ++--
 tools/deploy_to_maven.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/59b237b5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 50b5fab..de3dddd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,9 @@ language: java
 matrix:
   include:
     - jdk: "oraclejdk8"
-      env: PROFILE="-Dhadoop.version=2.7.1 -Dscala-2.11 -Pinclude-yarn-tests"
+      env: PROFILE="-Dhadoop.version=2.7.1 -Dscala-2.11 -Pinclude-yarn-tests -Dmaven.javadoc.skip=true"
     - jdk: "oraclejdk8"
-      env: PROFILE="-Dhadoop.version=2.5.0 -Pinclude-yarn-tests"
+      env: PROFILE="-Dhadoop.version=2.5.0 -Pinclude-yarn-tests -Dmaven.javadoc.skip=true"
     - jdk: "openjdk7"
       env: PROFILE="-Dhadoop.version=2.4.0 -Dscala-2.11 -Pinclude-yarn-tests"
     - jdk: "oraclejdk7" # this uploads the Hadoop 2 build to Maven and S3

http://git-wip-us.apache.org/repos/asf/flink/blob/59b237b5/tools/deploy_to_maven.sh
----------------------------------------------------------------------
diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh
index 6dcc806..8ace5aa 100755
--- a/tools/deploy_to_maven.sh
+++ b/tools/deploy_to_maven.sh
@@ -99,7 +99,7 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $TRAVIS_REPO_SLUG
== "apache/flin
 		# Deploy hadoop v1 to maven
 		echo "Generating poms for hadoop1"
 		./tools/generate_specific_pom.sh $CURRENT_FLINK_VERSION $CURRENT_FLINK_VERSION_HADOOP1
pom.hadoop1.xml
-		mvn -B -f pom.hadoop1.xml -Pdocs-and-source -DskipTests -Drat.ignoreErrors=true deploy
--settings deploysettings.xml; 
+		mvn -B -f pom.hadoop1.xml -DskipTests -Drat.ignoreErrors=true deploy --settings deploysettings.xml;

 
 		# deploy to s3
 		deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop1"
@@ -116,13 +116,13 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $TRAVIS_REPO_SLUG
== "apache/flin
 		# deploy hadoop v2 (yarn)
 		echo "deploy standard version (hadoop2) for scala 2.10 from flink2 directory"
 		# do the hadoop2 scala 2.10 in the background
-		(mvn -B -DskipTests -Pdocs-and-source -Drat.skip=true -Drat.ignoreErrors=true clean deploy
--settings deploysettings.xml; deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2" ) &
+		(mvn -B -DskipTests -Drat.skip=true -Drat.ignoreErrors=true clean deploy --settings deploysettings.xml;
deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2" ) &
 
 		# switch back to the regular flink directory
 		cd ../flink
 		echo "deploy hadoop2 version (standard) for scala 2.11 from flink directory"
 		./tools/change-scala-version.sh 2.11
-		mvn -B -DskipTests -Pdocs-and-source -Drat.skip=true -Drat.ignoreErrors=true clean deploy
--settings deploysettings.xml;
+		mvn -B -DskipTests -Drat.skip=true -Drat.ignoreErrors=true clean deploy --settings deploysettings.xml;
 
 		deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2_2.11"
 


Mime
View raw message