Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CBD7C9B40 for ; Wed, 12 Nov 2014 15:43:28 +0000 (UTC) Received: (qmail 56105 invoked by uid 500); 12 Nov 2014 15:43:28 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 56082 invoked by uid 500); 12 Nov 2014 15:43:28 -0000 Mailing-List: contact commits-help@flink.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.incubator.apache.org Delivered-To: mailing list commits@flink.incubator.apache.org Received: (qmail 56073 invoked by uid 99); 12 Nov 2014 15:43:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Nov 2014 15:43:28 +0000 X-ASF-Spam-Status: No, hits=-2000.6 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 12 Nov 2014 15:43:04 +0000 Received: (qmail 54358 invoked by uid 99); 12 Nov 2014 15:43:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Nov 2014 15:43:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DB63AA100D4; Wed, 12 Nov 2014 15:43:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rmetzger@apache.org To: commits@flink.incubator.apache.org Date: Wed, 12 Nov 2014 15:43:01 -0000 Message-Id: <9500e5181dfc40dab41c63b15415c633@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-flink git commit: [FLINK-1234] Active hadoop2 profile by default X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-flink Updated Branches: refs/heads/travis_test [created] 50774eb48 [FLINK-1234] Active hadoop2 profile by default Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/13b0e95a Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/13b0e95a Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/13b0e95a Branch: refs/heads/travis_test Commit: 13b0e95a02db3c583148f88c13850262e5f5a91a Parents: 3772d30 Author: Robert Metzger Authored: Tue Nov 11 11:00:26 2014 +0100 Committer: Robert Metzger Committed: Wed Nov 12 16:39:01 2014 +0100 ---------------------------------------------------------------------- .travis.yml | 10 +++++----- flink-addons/flink-hadoop-compatibility/pom.xml | 2 +- flink-addons/pom.xml | 6 +++--- flink-dist/pom.xml | 6 +++--- flink-runtime/pom.xml | 4 ++-- pom.xml | 10 +++++----- tools/change-version | 2 +- tools/deploy_to_maven.sh | 20 +++++++++----------- 8 files changed, 29 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/13b0e95a/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 3021c94..7c745e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,15 +7,15 @@ language: java matrix: include: - jdk: "openjdk6" - env: PROFILE= + env: PROFILE="-Dhadoop.profile=1" - jdk: "oraclejdk7" - env: PROFILE= + env: PROFILE="-Dhadoop.profile=1" - jdk: "openjdk6" - env: PROFILE="-P!include-yarn -Dhadoop.profile=2 -Dhadoop.version=2.0.0-alpha" + env: PROFILE="-P!include-yarn -Dhadoop.version=2.0.0-alpha" - jdk: "oraclejdk7" - env: PROFILE="-Dhadoop.profile=2 -Dhadoop.version=2.2.0" + env: PROFILE="-Dhadoop.version=2.2.0" - jdk: "oraclejdk8" - env: PROFILE="-Dhadoop.profile=2 -Dhadoop.version=2.5.0" + env: PROFILE="-Dhadoop.version=2.5.1" git: http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/13b0e95a/flink-addons/flink-hadoop-compatibility/pom.xml ---------------------------------------------------------------------- diff --git a/flink-addons/flink-hadoop-compatibility/pom.xml b/flink-addons/flink-hadoop-compatibility/pom.xml index 79810e8..c76ad10 100644 --- a/flink-addons/flink-hadoop-compatibility/pom.xml +++ b/flink-addons/flink-hadoop-compatibility/pom.xml @@ -67,7 +67,7 @@ under the License. - hadoop.profile2 + !hadoop.profile http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/13b0e95a/flink-addons/pom.xml ---------------------------------------------------------------------- diff --git a/flink-addons/pom.xml b/flink-addons/pom.xml index c76247d..16109d3 100644 --- a/flink-addons/pom.xml +++ b/flink-addons/pom.xml @@ -48,7 +48,7 @@ under the License. - !hadoop.profile + hadoop.profile1 @@ -60,7 +60,7 @@ under the License. - hadoop.profile2 + !hadoop.profile @@ -72,7 +72,7 @@ under the License. - hadoop.profile2 + !hadoop.profile http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/13b0e95a/flink-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index e9c67d1..f142d53 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -133,7 +133,7 @@ under the License. - !hadoop.profile + hadoop.profile1 @@ -146,7 +146,7 @@ under the License. - hadoop.profile2 + !hadoop.profile @@ -215,7 +215,7 @@ under the License. - hadoop.profile2 + !hadoop.profile http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/13b0e95a/flink-runtime/pom.xml ---------------------------------------------------------------------- diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index d09517d..b99f81c 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -178,7 +178,7 @@ under the License. - !hadoop.profile + hadoop.profile1 @@ -228,7 +228,7 @@ under the License. - hadoop.profile2 + !hadoop.profile http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/13b0e95a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2547279..8639794 100644 --- a/pom.xml +++ b/pom.xml @@ -79,9 +79,9 @@ under the License. true 1.7.7 17.0 - 2.10.4 - 2.10 - 2.0.1 + 2.10.4 + 2.10 + 2.0.1 @@ -224,7 +224,7 @@ under the License. - !hadoop.profile + hadoop.profile1 @@ -246,7 +246,7 @@ under the License. - hadoop.profile2 + !hadoop.profile http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/13b0e95a/tools/change-version ---------------------------------------------------------------------- diff --git a/tools/change-version b/tools/change-version index 9f25306..34b0e54 100755 --- a/tools/change-version +++ b/tools/change-version @@ -17,4 +17,4 @@ # limitations under the License. ################################################################################ -find .. -name 'pom.xml' -type f -exec sed -i 's#0.7-incubating-SNAPSHOT#0.8-incubating-SNAPSHOT#' {} \; +find .. -name 'pom.xml' -type f -exec sed -i 's#0.8-hadoop2-incubating-SNAPSHOT#0.8-incubating-SNAPSHOT#' {} \; http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/13b0e95a/tools/deploy_to_maven.sh ---------------------------------------------------------------------- diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh index 0c1c048..b1dc5c6 100755 --- a/tools/deploy_to_maven.sh +++ b/tools/deploy_to_maven.sh @@ -54,12 +54,12 @@ function getVersion() { # this will take a while CURRENT_FLINK_VERSION=`getVersion` if [[ "$CURRENT_FLINK_VERSION" == *-SNAPSHOT ]]; then - CURRENT_FLINK_VERSION_YARN=${CURRENT_FLINK_VERSION/-incubating-SNAPSHOT/-hadoop2-incubating-SNAPSHOT} + CURRENT_FLINK_VERSION_HADOOP1=${CURRENT_FLINK_VERSION/-incubating-SNAPSHOT/-hadoop1-incubating-SNAPSHOT} else - CURRENT_FLINK_VERSION_YARN="$CURRENT_FLINK_VERSION-hadoop2" + CURRENT_FLINK_VERSION_HADOOP1="$CURRENT_FLINK_VERSION-hadoop1" fi -echo "detected current version as: '$CURRENT_FLINK_VERSION' ; yarn: $CURRENT_FLINK_VERSION_YARN " +echo "detected current version as: '$CURRENT_FLINK_VERSION' ; hadoop1: $CURRENT_FLINK_VERSION_HADOOP1 " # Check if push/commit is eligible for pushing echo "Job: $TRAVIS_JOB_NUMBER ; isPR: $TRAVIS_PULL_REQUEST" @@ -71,18 +71,16 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] ; then # if [[ $TRAVIS_JOB_NUMBER == *1 ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $CURRENT_FLINK_VERSION == *SNAPSHOT* ]] ; then - # Deploy regular hadoop v1 to maven - mvn -Pdocs-and-source -DskipTests -Drat.ignoreErrors=true deploy --settings deploysettings.xml; + # 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.pom -Pdocs-and-source -DskipTests -Drat.ignoreErrors=true deploy --settings deploysettings.xml; fi if [[ $TRAVIS_JOB_NUMBER == *4 ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]] && [[ $CURRENT_FLINK_VERSION == *SNAPSHOT* ]] ; then # deploy hadoop v2 (yarn) - echo "Generating poms for hadoop-yarn." - ./tools/generate_specific_pom.sh $CURRENT_FLINK_VERSION $CURRENT_FLINK_VERSION_YARN - # all these tweaks assume a yarn build. - # performance tweaks here: no "clean deploy" so that actually nothing is being rebuild (could cause wrong poms inside the jars?) - # skip tests (they were running already) - mvn -B -f pom.hadoop2.xml -DskipTests -Pdocs-and-source -Drat.ignoreErrors=true deploy --settings deploysettings.xml; + echo "deploy standard version (hadoop2)" + mvn -B -DskipTests -Pdocs-and-source -Drat.ignoreErrors=true deploy --settings deploysettings.xml; fi # The block below took care of deploying javadoc to github.io. We now host the javadocs on the website.