You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2016/08/11 12:24:58 UTC

flink git commit: [maven] fix snapshot deployment of hadoop1 version

Repository: flink
Updated Branches:
  refs/heads/master 8ccee48c5 -> f0992aa13


[maven] fix snapshot deployment of hadoop1 version


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

Branch: refs/heads/master
Commit: f0992aa13dd54aba1d2a6691be6b6aa4fdb1dc6a
Parents: 8ccee48
Author: Maximilian Michels <mx...@apache.org>
Authored: Thu Aug 11 12:00:17 2016 +0200
Committer: Maximilian Michels <mx...@apache.org>
Committed: Thu Aug 11 14:23:36 2016 +0200

----------------------------------------------------------------------
 tools/deploy_to_maven.sh       | 6 +++---
 tools/generate_specific_pom.sh | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/f0992aa1/tools/deploy_to_maven.sh
----------------------------------------------------------------------
diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh
index 3c19e82..74ae8a7 100755
--- a/tools/deploy_to_maven.sh
+++ b/tools/deploy_to_maven.sh
@@ -38,8 +38,8 @@ function getVersion() {
 }
 
 function deploy_to_s3() {
-	CURRENT_FLINK_VERSION=$1
-	HD=$2
+	local CURRENT_FLINK_VERSION=$1
+	local HD=$2
 
 	echo "Installing artifacts deployment script"
 	export ARTIFACTS_DEST="$HOME/bin/artifacts"
@@ -48,7 +48,7 @@ function deploy_to_s3() {
 
 	echo "Deploying flink version $CURRENT_FLINK_VERSION (hadoop=$HD) to s3:"
 	mkdir flink-$CURRENT_FLINK_VERSION
-	cp -r flink-dist/target/flink-*-bin/flink-$CURRENT_FLINK_VERSION*/* flink-$CURRENT_FLINK_VERSION/
+	cp -r flink-dist/target/flink-*-bin/flink-*/* flink-$CURRENT_FLINK_VERSION/
 	tar -czf flink-$CURRENT_FLINK_VERSION-bin-$HD.tgz flink-$CURRENT_FLINK_VERSION
 
 	artifacts upload \

http://git-wip-us.apache.org/repos/asf/flink/blob/f0992aa1/tools/generate_specific_pom.sh
----------------------------------------------------------------------
diff --git a/tools/generate_specific_pom.sh b/tools/generate_specific_pom.sh
index 8bd4970..11feefd 100755
--- a/tools/generate_specific_pom.sh
+++ b/tools/generate_specific_pom.sh
@@ -33,8 +33,8 @@ function usage {
 
 if [[ "$#" -lt 2 ]]; then usage; fi
 
-export old_version="$1"
-export new_version="$2"
+old_version="$1"
+new_version="$2"
 new_pom_name="$3"
 
 # Get hadoop version from the new Flink version
@@ -79,6 +79,8 @@ fi
 echo "Using $nupom as name for the generated pom file."
 
 # export relevant variables for find command subshells
+export old_version
+export new_version
 export hadoop1
 export hadoop2
 export nupom