Repository: flink
Updated Branches:
  refs/heads/master bc1432a2f -> 988602b03


[build tools] Improve release scripts


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

Branch: refs/heads/master
Commit: 988602b031b63deb9640b115b798e9ae54fb7357
Parents: bc1432a
Author: Robert Metzger <rmetz...@apache.org>
Authored: Thu Feb 12 19:49:58 2015 +0100
Committer: Robert Metzger <rmetz...@apache.org>
Committed: Thu Feb 12 19:50:11 2015 +0100

----------------------------------------------------------------------
 tools/create_release_files.sh  | 9 +++++++--
 tools/generate_specific_pom.sh | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/988602b0/tools/create_release_files.sh
----------------------------------------------------------------------
diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh
index 7f6461e..09b4e7a 100755
--- a/tools/create_release_files.sh
+++ b/tools/create_release_files.sh
@@ -55,7 +55,7 @@ sonatype_pw=${sonatype_pw:-XXX}
 
 # create source package
 
-git clone https://github.com/apache/flink.git flink
+git clone http://git-wip-us.apache.org/repos/asf/flink.git flink
 cd flink
 git checkout -b "$RELEASE_BRANCH-$RELEASE_CANDIDATE" origin/$RELEASE_BRANCH
 rm .gitignore
@@ -77,6 +77,11 @@ echo "Echo created release hash $RELEASE_HASH"
 cd ..
 
 
+## NOTE: if gpg is not working, follow these instructions:
+# https://wiki.archlinux.org/index.php/GnuPG#Unattended_passphrase
+# info taken from:
+# 
http://www.reddit.com/r/archlinux/comments/2nmr4a/after_upgrade_to_gpg_210_mutt_and_gpg_no_longer/
+
 echo "Creating source package"
 cp -r flink flink-$RELEASE_VERSION
 tar cvzf flink-${RELEASE_VERSION}-src.tgz --exclude .git flink-$RELEASE_VERSION
@@ -142,7 +147,7 @@ cd flink
 cp ../../deploysettings.xml . 
 echo "For your reference, the command:\n\t $MVN clean deploy -Prelease 
--settings deploysettings.xml -DskipTests -Dgpg.keyname=$GPG_KEY 
-Dgpg.passphrase=$GPG_PASSPHRASE ./tools/generate_specific_pom.sh $NEW_VERSION 
$NEW_VERSION_HADOOP1 pom.xml"
 $MVN clean deploy -Prelease,docs-and-source --settings deploysettings.xml 
-DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY 
-Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
-./tools/generate_specific_pom.sh $NEW_VERSION $NEW_VERSION_HADOOP1 pom.xml
+../generate_specific_pom.sh $NEW_VERSION $NEW_VERSION_HADOOP1 pom.xml
 sleep 4
 $MVN clean deploy -Dgpg.executable=$GPG -Prelease,docs-and-source --settings 
deploysettings.xml -DskipTests -Dgpg.keyname=$GPG_KEY 
-Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10
 

http://git-wip-us.apache.org/repos/asf/flink/blob/988602b0/tools/generate_specific_pom.sh
----------------------------------------------------------------------
diff --git a/tools/generate_specific_pom.sh b/tools/generate_specific_pom.sh
index 7c84a42..39f7c8f 100755
--- a/tools/generate_specific_pom.sh
+++ b/tools/generate_specific_pom.sh
@@ -97,7 +97,7 @@ for p in $poms; do
   # To avoid accidentally replace version numbers in our dependencies 
   # sharing the version number with the current release use the following.
 
-  perl -0777 -pe 
"s:<groupId>org.apache.flink</groupId>\n(\t*<artifactId>([a-z]+-)+[a-z]+</artifactId>\n\t*)<version>${old_version}</version>:<groupId>org.apache.flink</groupId>\n\1<version>${new_version}</version>:"
 $p > "$tmp_nuname1"
+  perl -0777 -pe "s:<groupId>org.apache.flink</groupId>\n([\t 
]*<artifactId>([a-z]+-)+[a-z]+</artifactId>\n[\t 
]*)<version>${old_version}</version>:<groupId>org.apache.flink</groupId>\n\1<version>${new_version}</version>:g"
 $p > "$tmp_nuname1"
 
   # Alternatively when no version collisions are present this is enough:
   # sed -e "s/${old_version}/${new_version}/" $p > "$tmp_nuname1"

Reply via email to