From 45344e162f432003c2aded4cbae2841e7c2e4476 Mon Sep 17 00:00:00 2001 From: Robert Metzger Date: Thu, 25 Feb 2016 16:30:56 +0100 Subject: [PATCH] [FLINK-3509] Update Hadoop minor versions to latest & sync travis and release scripts --- .travis.yml | 6 +++--- tools/create_release_files.sh | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index de3ddddfa5bd8..195dd48c3d08c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,11 @@ language: java matrix: include: - jdk: "oraclejdk8" - env: PROFILE="-Dhadoop.version=2.7.1 -Dscala-2.11 -Pinclude-yarn-tests -Dmaven.javadoc.skip=true" + env: PROFILE="-Dhadoop.version=2.7.2 -Dscala-2.11 -Pinclude-yarn-tests -Dmaven.javadoc.skip=true" - jdk: "oraclejdk8" - env: PROFILE="-Dhadoop.version=2.5.0 -Pinclude-yarn-tests -Dmaven.javadoc.skip=true" + env: PROFILE="-Dhadoop.version=2.6.3 -Pinclude-yarn-tests -Dmaven.javadoc.skip=true" - jdk: "openjdk7" - env: PROFILE="-Dhadoop.version=2.4.0 -Dscala-2.11 -Pinclude-yarn-tests" + env: PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.11 -Pinclude-yarn-tests" - jdk: "oraclejdk7" # this uploads the Hadoop 2 build to Maven and S3 env: PROFILE="-Dhadoop.version=2.3.0" - jdk: "openjdk7" # this uploads the Hadoop 1 build to Maven and S3 diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh index 3c90ce6955944..91fce7826e0fc 100755 --- a/tools/create_release_files.sh +++ b/tools/create_release_files.sh @@ -148,7 +148,8 @@ make_binary_release() { cd "${dir_name}" ./tools/change-scala-version.sh ${SCALA_VERSION} - $MVN clean package $FLAGS -DskipTests + # enable release profile here (to check for the maven version) + $MVN clean package $FLAGS -DskipTests -Prelease -Dgpg.skip cd flink-dist/target/flink-$RELEASE_VERSION-bin/ tar czf "${dir_name}.tgz" flink-$RELEASE_VERSION @@ -208,13 +209,13 @@ make_source_release make_binary_release "hadoop1" "-Dhadoop.profile=1" 2.10 make_binary_release "hadoop2" "" 2.10 make_binary_release "hadoop24" "-Dhadoop.version=2.4.1" 2.10 -make_binary_release "hadoop26" "-Dhadoop.version=2.6.0" 2.10 -make_binary_release "hadoop27" "-Dhadoop.version=2.7.0" 2.10 +make_binary_release "hadoop26" "-Dhadoop.version=2.6.3" 2.10 +make_binary_release "hadoop27" "-Dhadoop.version=2.7.2" 2.10 make_binary_release "hadoop2" "" 2.11 make_binary_release "hadoop24" "-Dhadoop.version=2.4.1" 2.11 -make_binary_release "hadoop26" "-Dhadoop.version=2.6.0" 2.11 -make_binary_release "hadoop27" "-Dhadoop.version=2.7.0" 2.11 +make_binary_release "hadoop26" "-Dhadoop.version=2.6.3" 2.11 +make_binary_release "hadoop27" "-Dhadoop.version=2.7.2" 2.11 copy_data