You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2023/04/05 20:15:34 UTC
[accumulo] branch 1.10.3-rc0 created (now ed75b45210)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch 1.10.3-rc0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
at ed75b45210 [maven-release-plugin] prepare release rel/1.10.3
This branch includes the following new commits:
new fb09e7e259 Backport release candidate script
new ed75b45210 [maven-release-plugin] prepare release rel/1.10.3
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[accumulo] 02/02: [maven-release-plugin] prepare release rel/1.10.3
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.10.3-rc0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ed75b4521094faa6f6e1037a444747390a120068
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Apr 5 15:44:10 2023 -0400
[maven-release-plugin] prepare release rel/1.10.3
---
assemble/pom.xml | 2 +-
core/pom.xml | 2 +-
docs/pom.xml | 2 +-
examples/simple/pom.xml | 2 +-
fate/pom.xml | 2 +-
iterator-test-harness/pom.xml | 2 +-
maven-plugin/pom.xml | 2 +-
minicluster/pom.xml | 2 +-
pom.xml | 6 +++---
proxy/pom.xml | 2 +-
server/base/pom.xml | 2 +-
server/gc/pom.xml | 2 +-
server/master/pom.xml | 2 +-
server/monitor/pom.xml | 2 +-
server/native/pom.xml | 2 +-
server/tracer/pom.xml | 2 +-
server/tserver/pom.xml | 2 +-
shell/pom.xml | 2 +-
start/pom.xml | 2 +-
test/pom.xml | 2 +-
trace/pom.xml | 2 +-
21 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/assemble/pom.xml b/assemble/pom.xml
index b92709fe63..196bf15826 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo</artifactId>
<packaging>pom</packaging>
diff --git a/core/pom.xml b/core/pom.xml
index 163a1c062f..3f9ee1a21d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-core</artifactId>
<name>Apache Accumulo Core</name>
diff --git a/docs/pom.xml b/docs/pom.xml
index 84762532ee..09e5e870b1 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-docs</artifactId>
<packaging>pom</packaging>
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index f64e0f4731..e9c91b6ab5 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-examples-simple</artifactId>
diff --git a/fate/pom.xml b/fate/pom.xml
index 379ea4182a..b49e0008fe 100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-fate</artifactId>
<name>Apache Accumulo Fate</name>
diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml
index edd804def2..80b389ca06 100644
--- a/iterator-test-harness/pom.xml
+++ b/iterator-test-harness/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-iterator-test-harness</artifactId>
<name>Apache Accumulo Iterator Test Harness</name>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index f91db54a53..7d163f2699 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 0e4c6df0c2..02f692fa91 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-minicluster</artifactId>
<name>Apache Accumulo MiniCluster</name>
diff --git a/pom.xml b/pom.xml
index 7e1e7cd0d2..99457a7a08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
</parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
<packaging>pom</packaging>
<name>Apache Accumulo Project</name>
<description>Apache Accumulo is a sorted, distributed key/value store based
@@ -101,7 +101,7 @@
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/accumulo.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/accumulo.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>rel/1.10.3</tag>
<url>https://gitbox.apache.org/repos/asf?p=accumulo.git</url>
</scm>
<issueManagement>
@@ -144,7 +144,7 @@
<minimalMavenBuildVersion>3.5.0</minimalMavenBuildVersion>
<powermock.version>2.0.9</powermock.version>
<!-- timestamp for reproducible outputs, updated on release by the release plugin -->
- <project.build.outputTimestamp>2022-02-08T14:59:16Z</project.build.outputTimestamp>
+ <project.build.outputTimestamp>2023-04-05T19:43:16Z</project.build.outputTimestamp>
<rat.consoleOutput>true</rat.consoleOutput>
<!-- surefire/failsafe plugin option -->
<reuseForks>false</reuseForks>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 2183c3783c..869799a426 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-proxy</artifactId>
<name>Apache Accumulo Proxy</name>
diff --git a/server/base/pom.xml b/server/base/pom.xml
index 85e3e42f7e..a202d64b65 100644
--- a/server/base/pom.xml
+++ b/server/base/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-server-base</artifactId>
diff --git a/server/gc/pom.xml b/server/gc/pom.xml
index 494b12da55..a058b6445f 100644
--- a/server/gc/pom.xml
+++ b/server/gc/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-gc</artifactId>
diff --git a/server/master/pom.xml b/server/master/pom.xml
index 228e359c25..d81974de5b 100644
--- a/server/master/pom.xml
+++ b/server/master/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-master</artifactId>
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 523ab1b815..5523082e8e 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-monitor</artifactId>
diff --git a/server/native/pom.xml b/server/native/pom.xml
index fc7605d222..05170680cf 100644
--- a/server/native/pom.xml
+++ b/server/native/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-native</artifactId>
diff --git a/server/tracer/pom.xml b/server/tracer/pom.xml
index 042a166400..db233cd242 100644
--- a/server/tracer/pom.xml
+++ b/server/tracer/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-tracer</artifactId>
diff --git a/server/tserver/pom.xml b/server/tserver/pom.xml
index 18028634a9..8977f1ada7 100644
--- a/server/tserver/pom.xml
+++ b/server/tserver/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>accumulo-tserver</artifactId>
diff --git a/shell/pom.xml b/shell/pom.xml
index 33ac907331..cc6e48ae9f 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-shell</artifactId>
<name>Apache Accumulo Shell</name>
diff --git a/start/pom.xml b/start/pom.xml
index d3a8273830..f946723819 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-start</artifactId>
<name>Apache Accumulo Start</name>
diff --git a/test/pom.xml b/test/pom.xml
index fc8a74f8fc..9df7261732 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-test</artifactId>
<name>Apache Accumulo Testing</name>
diff --git a/trace/pom.xml b/trace/pom.xml
index cf5359bf3e..84fd54fac1 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-project</artifactId>
- <version>1.10.3-SNAPSHOT</version>
+ <version>1.10.3</version>
</parent>
<artifactId>accumulo-trace</artifactId>
<name>Apache Accumulo Trace</name>
[accumulo] 01/02: Backport release candidate script
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.10.3-rc0
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit fb09e7e2594c451317ce6294b9dd27bd0c5e6c05
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Apr 5 15:40:30 2023 -0400
Backport release candidate script
Backport current version of release candidate script from the main
branch
---
assemble/build.sh | 213 +++++++++++++++++++++++++++++++++---------------------
1 file changed, 131 insertions(+), 82 deletions(-)
diff --git a/assemble/build.sh b/assemble/build.sh
index 5bbca61372..38321484d6 100755
--- a/assemble/build.sh
+++ b/assemble/build.sh
@@ -8,7 +8,7 @@
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
@@ -30,21 +30,36 @@ export tagPrefix="rel/"
# check if running in a color terminal
terminalSupportsColor() {
- local c; c=$(tput colors 2>/dev/null) || c=-1
+ local c
+ c=$(tput colors 2>/dev/null) || c=-1
[[ -t 1 ]] && [[ $c -ge 8 ]]
}
terminalSupportsColor && doColor=1 || doColor=0
-color() { local c; c=$1; shift; [[ $doColor -eq 1 ]] && echo -e "\\e[0;${c}m${*}\\e[0m" || echo "$@"; }
+color() {
+ local c
+ c=$1
+ shift
+ [[ $doColor -eq 1 ]] && echo -e "\\e[0;${c}m${*}\\e[0m" || echo "$@"
+}
red() { color 31 "$@"; }
green() { color 32 "$@"; }
yellow() { color 33 "$@"; }
-fail() { echo -e ' ' "$@"; exit 1; }
-runLog() { local o; o=$1 && shift && echo "$(green Running) $(yellow "$@" '>>' "$o")" && echo Running "$@" >> "$o" && eval "$@" >> "$o"; }
-run() { echo "$(green Running) $(yellow "$@")" && eval "$@"; }
+fail() {
+ echo -e ' ' "$@"
+ exit 1
+}
+runLog() {
+ local o
+ o=$1 && shift && echo "$(green Running) $(yellow "$@" '>>' "$o")" && echo Running "$*" >>"$o" && "$@" >>"$o"
+}
+run() { echo "$(green Running) $(yellow "$@")" && "$@"; }
-currentBranch() { local b; b=$(git symbolic-ref -q HEAD) && echo "${b##refs/heads/}"; }
+currentBranch() {
+ local b
+ b=$(git symbolic-ref -q HEAD) && echo "${b##refs/heads/}"
+}
cacheGPG() {
# make sure gpg agent has key cached
@@ -54,7 +69,8 @@ cacheGPG() {
until selectFingerprint; do
red 'ERROR - Invalid selection'
done
- local TESTFILE; TESTFILE=$(mktemp --tmpdir "${USER}-gpgTestFile-XXXXXXXX.txt")
+ local TESTFILE
+ TESTFILE=$(mktemp --tmpdir "${USER}-gpgTestFile-XXXXXXXX.txt")
[[ -r $TESTFILE ]] && gpg --local-user "$SELECTED_FINGERPRINT" --sign "$TESTFILE" && rm -f "$TESTFILE" "$TESTFILE.gpg"
}
@@ -69,9 +85,14 @@ prompter() {
echo "$x"
}
-pretty() { local f; f=$1; shift; git log "--pretty=tformat:$f" "$@"; }
+pretty() {
+ local f
+ f=$1
+ shift
+ git log "--pretty=tformat:$f" "$@"
+}
gitCommits() { pretty %H "$@"; }
-gitCommit() { gitCommits -n1 "$@"; }
+gitCommit() { gitCommits -n1 "$@"; }
gitSubject() { pretty %s "$@"; }
selectFingerprint() {
@@ -100,42 +121,50 @@ selectFingerprint() {
createEmail() {
echo
- yellow "IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!!"
+ yellow "IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!!"
echo
- echo " Release candidate will be staged at:"
- echo " $(yellow 'https://repository.apache.org/#stagingRepositories')"
+ echo " Release candidate will be staged at:"
+ echo " $(yellow 'https://repository.apache.org/#stagingRepositories')"
echo
- echo " $(green 'DO') click $(green 'Close') to complete the staging process!"
- echo " $(red 'DO *NOT*') click $(red 'Release') until after the vote has been approved!"
+ echo " $(green 'DO') click $(green 'Close') to complete the staging process!"
+ echo " $(red 'DO *NOT*') click $(red 'Release') until after the vote has been approved!"
echo
- yellow "IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!!"
+ yellow "IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!!"
echo
# $1 version (optional); $2 rc sequence num (optional); $3 staging repo num (optional)
- local ver; [[ -n "$1" ]] && ver=$1 || ver=$(prompter 'version to be released (eg. x.y.z)' '[0-9]+[.][0-9]+[.][0-9]+')
- local rc; [[ -n "$2" ]] && rc=$2 || rc=$(prompter 'release candidate sequence number (eg. 1, 2, etc.)' '[0-9]+')
- local stagingrepo; [[ -n "$3" ]] && stagingrepo=$3 || stagingrepo=$(prompter 'staging repository number from https://repository.apache.org/#stagingRepositories' '[0-9]+')
- local srcSha; [[ -n "$4" ]] && srcSha=$4 || srcSha=$(prompter 'SHA512 for source tarball' '[0-9a-f]{128}')
- local binSha; [[ -n "$5" ]] && binSha=$5 || binSha=$(prompter 'SHA512 for binary tarball' '[0-9a-f]{128}')
-
- local branch; branch=$ver-rc$rc
- local commit; commit=$(gitCommit "$branch") || exit 1
- local tag; tag=$tagPrefix$ver
+ local ver
+ [[ -n $1 ]] && ver=$1 || ver=$(prompter 'version to be released (eg. x.y.z)' '[0-9]+[.][0-9]+[.][0-9]+')
+ local rc
+ [[ -n $2 ]] && rc=$2 || rc=$(prompter 'release candidate sequence number (eg. 1, 2, etc.)' '[0-9]+')
+ local stagingrepo
+ [[ -n $3 ]] && stagingrepo=$3 || stagingrepo=$(prompter 'staging repository number from https://repository.apache.org/#stagingRepositories' '[0-9]+')
+ local srcSha
+ [[ -n $4 ]] && srcSha=$4 || srcSha=$(prompter 'SHA512 for source tarball' '[0-9a-f]{128}')
+ local binSha
+ [[ -n $5 ]] && binSha=$5 || binSha=$(prompter 'SHA512 for binary tarball' '[0-9a-f]{128}')
+
+ local branch
+ branch=$ver-rc$rc
+ local commit
+ commit=$(gitCommit "$branch") || exit 1
+ local tag
+ tag=$tagPrefix$ver
echo
- yellow "IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!!"
+ yellow "IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!!"
echo
- echo " Don't forget to make the staged branch available for review by"
- echo " pushing a branch named $(yellow "$branch") with its head at"
- echo " $(yellow "$commit"):"
+ echo " Don't forget to make the staged branch available for review by"
+ echo " pushing a branch named $(yellow "$branch") with its head at"
+ echo " $(yellow "$commit"):"
echo
- echo " # replace $(yellow "\$origin") with your upstream remote name "
- echo " $(green "git push") $(yellow "\$origin") $(green "$commit:refs/heads/$branch")"
+ echo " # replace $(yellow 'ORIGIN') with your upstream remote name "
+ echo " $(green "git push") $(yellow 'ORIGIN') $(green "$commit:refs/heads/$branch")"
echo
- echo " Remember, $(red DO NOT PUSH) the $(red "$tag") tag until after the vote"
- echo " passes and the tag is re-made with a gpg signature using:"
- echo " $(red "git tag -f -s -m '$projNameLong $ver' $tag") \\"
- echo " $(red "$commit")"
+ echo " Remember, $(red DO NOT PUSH) the $(red "$tag") tag until after the vote"
+ echo " passes and the tag is re-made with a gpg signature using:"
+ echo " $(red "git tag -f -s -m '$projNameLong $ver' $tag") \\"
+ echo " $(red "$commit")"
echo
- yellow "IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!!"
+ yellow "IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!! IMPORTANT!!"
echo
read -r -s -p 'Press Enter to generate the [VOTE] email...'
echo 1>&2
@@ -146,14 +175,18 @@ createEmail() {
done
# compute the date with a buffer of 30 minutes
- local votedate; votedate=$(date -d "+3 days 30 minutes" "+%s")
+ local votedate
+ votedate=$(date -d "+3 days 30 minutes" "+%s")
# round back to the previous half-hour
- local halfhour; halfhour=$((votedate - (votedate % 1800)))
+ local halfhour
+ halfhour=$((votedate - (votedate % 1800)))
votedate=$(date -u -d"1970-01-01 $halfhour seconds UTC")
export TZ="America/New_York"
- local edtvotedate; edtvotedate=$(date -d"1970-01-01 $halfhour seconds UTC")
+ local edtvotedate
+ edtvotedate=$(date -d"1970-01-01 $halfhour seconds UTC")
export TZ="America/Los_Angeles"
- local pdtvotedate; pdtvotedate=$(date -d"1970-01-01 $halfhour seconds UTC")
+ local pdtvotedate
+ pdtvotedate=$(date -d"1970-01-01 $halfhour seconds UTC")
cat <<EOF
$(yellow '============================================================')
@@ -224,9 +257,12 @@ cleanUpAndFail() {
run git checkout "$3"
# pre-populate branches with expected next branch; de-duplicate later
- local branches; branches=("$4")
- local tags; tags=()
- local x; local y
+ local branches
+ branches=("$4")
+ local tags
+ tags=()
+ local x
+ local y
for x in $(gitCommits "${cBranch}..${nBranch}"); do
for y in $(git branch --contains "$x" | cut -c3-); do
branches=("${branches[@]}" "$y")
@@ -238,7 +274,8 @@ cleanUpAndFail() {
# de-duplicate branches
local a
- local tmpArray; tmpArray=("${branches[@]}")
+ local tmpArray
+ tmpArray=("${branches[@]}")
IFS=$'\n' read -d '' -r -a branches < <(printf '%s\n' "${tmpArray[@]}" | sort -u)
for x in "${branches[@]}"; do
echo "Do you wish to clean up (delete) the branch $(yellow "$x")?"
@@ -277,21 +314,21 @@ selectRemote() {
createReleaseCandidate() {
echo
- yellow "WARNING!! WARNING!! WARNING!! WARNING!! WARNING!! WARNING!!"
+ yellow "WARNING!! WARNING!! WARNING!! WARNING!! WARNING!! WARNING!!"
echo
- echo " Don't forget to $(yellow 'Set up your development environment')!"
- echo " For details, see the section by that name at:"
- echo " $(green 'https://infra.apache.org/publishing-maven-artifacts.html')"
+ echo " Don't forget to $(yellow 'Set up your development environment')!"
+ echo " For details, see the section by that name at:"
+ echo " $(green 'https://infra.apache.org/publishing-maven-artifacts.html')"
echo
- echo " This will modify your local git repository by creating"
- echo " branches and tags. Afterwards, you may need to perform"
- echo " some manual steps to complete the release or to rollback"
- echo " in the case of failure."
+ echo " This will modify your local git repository by creating"
+ echo " branches and tags. Afterwards, you may need to perform"
+ echo " some manual steps to complete the release or to rollback"
+ echo " in the case of failure."
echo
- echo " Release candidate will be staged at:"
- echo " $(yellow 'https://repository.apache.org/#stagingRepositories')"
+ echo " Release candidate will be staged at:"
+ echo " $(yellow 'https://repository.apache.org/#stagingRepositories')"
echo
- yellow "WARNING!! WARNING!! WARNING!! WARNING!! WARNING!! WARNING!!"
+ yellow "WARNING!! WARNING!! WARNING!! WARNING!! WARNING!! WARNING!!"
echo
if [[ ${#@} -ne 0 ]]; then
@@ -303,30 +340,38 @@ createReleaseCandidate() {
ver=$(xmllint --shell pom.xml <<<'xpath /*[local-name()="project"]/*[local-name()="version"]/text()' | grep content= | cut -f2 -d=)
ver=${ver%%-SNAPSHOT}
echo "Building release candidate for version: $(green "$ver")"
- local tag; tag=$tagPrefix$ver
-
- local cBranch; cBranch=$(currentBranch) || fail "$(red Failure)" to get current branch from git
- local rc; rc=$(prompter 'release candidate sequence number (eg. 1, 2, etc.)' '[0-9]+')
- local tmpNextVer; tmpNextVer="${ver%.*}.$((${ver##*.}+1))"
- local nextVer; nextVer=$(prompter "next snapshot version to be released [$tmpNextVer]" '([0-9]+[.][0-9]+[.][0-9]+)?')
+ local tag
+ tag=$tagPrefix$ver
+
+ local cBranch
+ cBranch=$(currentBranch) || fail "$(red Failure)" to get current branch from git
+ local rc
+ rc=$(prompter 'release candidate sequence number (eg. 1, 2, etc.)' '[0-9]+')
+ local tmpNextVer
+ tmpNextVer="${ver%.*}.$((${ver##*.} + 1))"
+ local nextVer
+ nextVer=$(prompter "next snapshot version to be released [$tmpNextVer]" '([0-9]+[.][0-9]+[.][0-9]+)?')
[[ -n $nextVer ]] || nextVer=$tmpNextVer
- local rcBranch; rcBranch=$ver-rc$rc
- local nBranch; nBranch=$rcBranch-next
+ local rcBranch
+ rcBranch=$ver-rc$rc
+ local nBranch
+ nBranch=$rcBranch-next
cacheGPG || fail "Unable to cache GPG credentials into gpg-agent"
# create working branch
- run git checkout -b "$nBranch" "$cBranch" || \
+ run git checkout -b "$nBranch" "$cBranch" ||
fail "Unable to create working branch $(red "$nBranch") from $(red "$cBranch")!"
# create a release candidate from a branch
- local oFile; oFile=$(mktemp --tmpdir "$projName-build-$rcBranch-XXXXXXXX.log")
+ local oFile
+ oFile=$(mktemp --tmpdir "$projName-build-$rcBranch-XXXXXXXX.log")
{
[[ -w $oFile ]] && runLog "$oFile" mvn clean release:clean
} || cleanUpAndFail 'mvn clean release:clean' "$oFile" "$cBranch" "$nBranch"
- runLog "$oFile" mvn -B release:prepare -DdevelopmentVersion="${nextVer}-SNAPSHOT" "-Dgpg.keyname=$SELECTED_FINGERPRINT" || \
+ runLog "$oFile" mvn -B release:prepare -DdevelopmentVersion="${nextVer}-SNAPSHOT" "-Dgpg.keyname=$SELECTED_FINGERPRINT" ||
cleanUpAndFail "mvn -B release:prepare -DdevelopmentVersion=${nextVer}-SNAPSHOT" "$oFile" "$cBranch" "$nBranch"
- runLog "$oFile" mvn release:perform "-Dgpg.keyname=$SELECTED_FINGERPRINT" || \
+ runLog "$oFile" mvn release:perform "-Dgpg.keyname=$SELECTED_FINGERPRINT" ||
cleanUpAndFail "mvn release:perform" "$oFile" "$cBranch" "$nBranch"
# switch back to original branch
@@ -334,22 +379,22 @@ createReleaseCandidate() {
# verify the next branch contains both expected log messages and no more
{
- [[ $(gitCommits "${cBranch}..${nBranch}" | wc -l) -eq 2 ]] && \
- [[ $(gitCommit "${nBranch}~2") == $(gitCommit "${cBranch}") ]] && \
- [[ $(gitSubject "${nBranch}") =~ ^\[maven-release-plugin\]\ prepare\ for\ next ]] && \
+ [[ $(gitCommits "${cBranch}..${nBranch}" | wc -l) -eq 2 ]] &&
+ [[ $(gitCommit "${nBranch}~2") == $(gitCommit "${cBranch}") ]] &&
+ [[ $(gitSubject "${nBranch}") =~ ^\[maven-release-plugin\]\ prepare\ for\ next ]] &&
[[ $(gitSubject "${nBranch}~1") =~ ^\[maven-release-plugin\]\ prepare\ release\ rel[/] ]]
} || cleanUpAndFail "verifying that $nBranch contains only logs from release plugin"
# verify the tag is one behind $nBranch and one ahead of $cBranch
- [[ $(gitCommit "${nBranch}~1") == $(gitCommit "refs/tags/$tag") ]] || \
+ [[ $(gitCommit "${nBranch}~1") == $(gitCommit "refs/tags/$tag") ]] ||
cleanUpAndFail "verifying that ${nBranch}~1 == refs/tags/$tag"
# remove tag which was created
- run git tag -d "$tag" || \
+ run git tag -d "$tag" ||
cleanUpAndFail "removing unused git tag $tag"
# create release candidate branch to vote on
- run git branch "$rcBranch" "${nBranch}~1" || \
+ run git branch "$rcBranch" "${nBranch}~1" ||
cleanUpAndFail "creating branch $rcBranch"
# determine remote to use
@@ -364,20 +409,25 @@ createReleaseCandidate() {
echo "Do you wish to push the following branches to $SELECTED_REMOTE ($(green "$SELECTED_REMOTE_URL"))?"
echo " $(yellow "$rcBranch") (for others to examine for the vote)"
echo " $(yellow "$nBranch") (for merging into $cBranch if vote passes)"
- local a; a=$(prompter "letter 'y' or 'n'" '[yn]')
+ local a
+ a=$(prompter "letter 'y' or 'n'" '[yn]')
{
- [[ $a == 'y' ]] && \
+ [[ $a == 'y' ]] &&
run git push -u "$SELECTED_REMOTE" "refs/heads/$nBranch" "refs/heads/$rcBranch"
} || red "Did not push branches; you'll need to perform this step manually."
fi
- local numSrc; numSrc=$(find target/checkout/ -type f -name "$projName-$ver-source-release.tar.gz" | wc -l)
- local numBin; numBin=$(find target/checkout/ -type f -name "$projName-$ver-bin.tar.gz" | wc -l)
+ local numSrc
+ numSrc=$(find target/checkout/ -type f -name "$projName-$ver-source-release.tar.gz" | wc -l)
+ local numBin
+ numBin=$(find target/checkout/ -type f -name "$projName-$ver-bin.tar.gz" | wc -l)
shopt -s globstar
- local srcSha; srcSha=""
- local binSha; binSha=""
- [[ $numSrc = "1" ]] && srcSha=$(sha512sum target/checkout/**/"$projName-$ver-source-release.tar.gz" | cut -f1 -d" ")
- [[ $numBin = "1" ]] && binSha=$(sha512sum target/checkout/**/"$projName-$ver-bin.tar.gz" | cut -f1 -d" ")
+ local srcSha
+ srcSha=""
+ local binSha
+ binSha=""
+ [[ $numSrc == "1" ]] && srcSha=$(sha512sum target/checkout/**/"$projName-$ver-source-release.tar.gz" | cut -f1 -d" ")
+ [[ $numBin == "1" ]] && binSha=$(sha512sum target/checkout/**/"$projName-$ver-bin.tar.gz" | cut -f1 -d" ")
# continue to creating email notification
echo "$(red Running)" "$(yellow "$scriptname" --create-email "$ver" "$rc")"
@@ -394,4 +444,3 @@ elif [[ $1 == '--create-email' ]]; then
else
fail "Missing one of: $(red --create-release-candidate), $(red --create-email)"
fi
-