You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2014/11/12 16:43:01 UTC
[1/2] incubator-flink git commit: [FLINK-1234] Active hadoop2 profile
by default
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 <rm...@apache.org>
Authored: Tue Nov 11 11:00:26 2014 +0100
Committer: Robert Metzger <rm...@apache.org>
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.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop2--><name>hadoop.profile</name><value>2</value>
+ <name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
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.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop1--><name>!hadoop.profile</name>
+ <name>hadoop.profile</name><value>1</value>
</property>
</activation>
<modules>
@@ -60,7 +60,7 @@ under the License.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop2--><name>hadoop.profile</name><value>2</value>
+ <name>!hadoop.profile</name>
</property>
</activation>
<modules>
@@ -72,7 +72,7 @@ under the License.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop2--><name>hadoop.profile</name><value>2</value>
+ <name>!hadoop.profile</name>
</property>
</activation>
<modules>
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.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop1--><name>!hadoop.profile</name>
+ <name>hadoop.profile</name><value>1</value>
</property>
</activation>
<dependencies>
@@ -146,7 +146,7 @@ under the License.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop2--><name>hadoop.profile</name><value>2</value>
+ <name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@@ -215,7 +215,7 @@ under the License.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop2--><name>hadoop.profile</name><value>2</value>
+ <name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
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.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop1--><name>!hadoop.profile</name>
+ <name>hadoop.profile</name><value>1</value>
</property>
</activation>
<dependencies>
@@ -228,7 +228,7 @@ under the License.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop2--><name>hadoop.profile</name><value>2</value>
+ <name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
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.
<flink.reuseForks>true</flink.reuseForks>
<slf4j.version>1.7.7</slf4j.version>
<guava.version>17.0</guava.version>
- <scala.version>2.10.4</scala.version>
- <scala.binary.version>2.10</scala.binary.version>
- <scala.macros.version>2.0.1</scala.macros.version>
+ <scala.version>2.10.4</scala.version>
+ <scala.binary.version>2.10</scala.binary.version>
+ <scala.macros.version>2.0.1</scala.macros.version>
</properties>
<dependencies>
@@ -224,7 +224,7 @@ under the License.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop1--><name>!hadoop.profile</name>
+ <name>hadoop.profile</name><value>1</value>
</property>
</activation>
<properties>
@@ -246,7 +246,7 @@ under the License.
<activation>
<property>
<!-- Please do not remove the 'hadoop1' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop2--><name>hadoop.profile</name><value>2</value>
+ <name>!hadoop.profile</name>
</property>
</activation>
<properties>
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#<version>0.7-incubating-SNAPSHOT</version>#<version>0.8-incubating-SNAPSHOT</version>#' {} \;
+find .. -name 'pom.xml' -type f -exec sed -i 's#<version>0.8-hadoop2-incubating-SNAPSHOT</version>#<version>0.8-incubating-SNAPSHOT</version>#' {} \;
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.
[2/2] incubator-flink git commit: minor fix
Posted by rm...@apache.org.
minor fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/50774eb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/50774eb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/50774eb4
Branch: refs/heads/travis_test
Commit: 50774eb48b45ce50ac24fada495816e0a4df4a07
Parents: 13b0e95
Author: Robert Metzger <rm...@apache.org>
Authored: Wed Nov 12 16:41:58 2014 +0100
Committer: Robert Metzger <rm...@apache.org>
Committed: Wed Nov 12 16:41:58 2014 +0100
----------------------------------------------------------------------
tools/deploy_to_maven.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/50774eb4/tools/deploy_to_maven.sh
----------------------------------------------------------------------
diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh
index b1dc5c6..60eebb4 100755
--- a/tools/deploy_to_maven.sh
+++ b/tools/deploy_to_maven.sh
@@ -74,7 +74,7 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] ; then
# 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;
+ mvn -B -f pom.hadoop1.xml -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