Skip to content

Commit

Permalink
[FLINK-3509] Update Hadoop minor versions to latest & sync travis and…
Browse files Browse the repository at this point in the history
… release scripts

This closes #1713
  • Loading branch information
rmetzger committed Feb 26, 2016
1 parent fa8b001 commit 9692c83
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions tools/create_release_files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 9692c83

Please sign in to comment.