You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2019/11/28 07:09:29 UTC
[hbase] branch HBASE-23337 created (now 19cc9d6)
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a change to branch HBASE-23337
in repository https://gitbox.apache.org/repos/asf/hbase.git.
at 19cc9d6 HBASE-23337 Release scripts should rely on maven.
This branch includes the following new commits:
new 19cc9d6 HBASE-23337 Release scripts should rely on maven.
The 1 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.
[hbase] 01/01: HBASE-23337 Release scripts should rely on maven.
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch HBASE-23337
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 19cc9d63c5730292e3857b0b8e1f5d33b3a8d281
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Wed Nov 27 21:54:27 2019 -0600
HBASE-23337 Release scripts should rely on maven.
- switch to nexus-staging-maven-plugin for asf-release
- refactor release-build to use mvn deploy and its output.
---
dev-support/create-release/release-build.sh | 92 +++++------------------------
pom.xml | 22 +++++++
2 files changed, 38 insertions(+), 76 deletions(-)
diff --git a/dev-support/create-release/release-build.sh b/dev-support/create-release/release-build.sh
index 596a58a..6c057dc 100755
--- a/dev-support/create-release/release-build.sh
+++ b/dev-support/create-release/release-build.sh
@@ -151,7 +151,7 @@ tmp_settings="/${tmp_repo}/tmp-settings.xml"
echo "<settings><servers>" > $tmp_settings
echo "<server><id>apache.snapshots.https</id><username>$ASF_USERNAME</username>" >> $tmp_settings
echo "<password>$ASF_PASSWORD</password></server>" >> $tmp_settings
-echo "<server><id>apache-release</id><username>$ASF_USERNAME</username>" >> $tmp_settings
+echo "<server><id>apache.releases.https</id><username>$ASF_USERNAME</username>" >> $tmp_settings
echo "<password>$ASF_PASSWORD</password></server>" >> $tmp_settings
echo "</servers>" >> $tmp_settings
echo "</settings>" >> $tmp_settings
@@ -216,91 +216,31 @@ if [[ "$1" == "publish-snapshot" ]]; then
fi
if [[ "$1" == "publish-release" ]]; then
+ (
cd "${PROJECT}"
- # Get list of modules from parent pom but filter out 'assembly' modules.
- # Used below in a few places.
- modules=`sed -n 's/<module>\(.*\)<.*$/\1/p' pom.xml | grep -v '-assembly' | tr '\n' ' '`
- # Need to add the 'parent' module too. Its the SECOND artifactId instance in pom
- artifactid=`sed -n 's/<artifactId>\(.*\)<.*$/\1/p' pom.xml | tr '\n' ' '| awk '{print $2}'`
- modules="${artifactid} ${modules}"
- # Get the second groupId in the pom. This is the groupId for these artifacts.
- groupid=`sed -n 's/<groupId>\(.*\)<.*$/\1/p' pom.xml | tr '\n' ' '| awk '{print $2}'`
- # Convert groupid to a dir path for use below reaching into repo for jars.
- groupid_as_dir=`echo $groupid | sed -n 's/\./\//gp'`
- echo "pwd=`pwd`, groupid_as_dir=${groupid_as_dir}"
# Publish ${PROJECT} to Maven release repo
echo "Publishing ${PROJECT} checkout at '$GIT_REF' ($git_hash)"
echo "Publish version is $VERSION"
# Coerce the requested version
$MVN versions:set -DnewVersion=$VERSION
- MAVEN_OPTS="${MAVEN_OPTS}" ${MVN} --settings $tmp_settings \
- clean install -DskipTests \
- -Dcheckstyle.skip=true "${PUBLISH_PROFILES}" \
- -Dmaven.repo.local="${tmp_repo}"
- pushd "${tmp_repo}/${groupid_as_dir}"
- # Remove any extra files generated during install
- # Remove extaneous files from module subdirs
- find $modules -type f | grep -v \.jar | grep -v \.pom | xargs rm -rf
-
- # Using Nexus API documented here:
- # https://support.sonatype.com/entries/39720203-Uploading-to-a-Staging-Repository-via-REST-API
+ declare -a mvn_goals=(clean install)
if ! is_dry_run; then
- echo "Creating Nexus staging repository"
- repo_request="<promoteRequest><data><description>Apache ${PROJECT} $VERSION (commit $git_hash)</description></data></promoteRequest>"
- out=$(curl -X POST -d "$repo_request" -u $ASF_USERNAME:$ASF_PASSWORD \
- -H "Content-Type:application/xml" -v \
- $NEXUS_ROOT/profiles/$NEXUS_PROFILE/start)
- staged_repo_id=$(echo $out | sed -e "s/.*\(orgapachehbase-[0-9]\{4\}\).*/\1/")
- echo "Created Nexus staging repository: $staged_repo_id"
+ mvn_goals=(${mvn_goals[@]} deploy)
fi
-
- # this must have .asc, and .sha1 - it really doesn't like anything else there
- for file in $(find $modules -type f)
- do
- if [[ "$file" == *.asc ]]; then
- continue
- fi
- if [ ! -f $file.asc ]; then
- echo "$GPG_PASSPHRASE" | $GPG --passphrase-fd 0 --output "$file.asc" \
- --detach-sig --armour $file;
- fi
- if [ $(command -v md5) ]; then
- # Available on OS X; -q to keep only hash
- md5 -q "$file" > "$file.md5"
- else
- # Available on Linux; cut to keep only hash
- md5sum "$file" | cut -f1 -d' ' > "$file.md5"
- fi
- if [ $(command -v sha1sum) ]; then
- sha1sum "$file" | cut -f1 -d' ' > "$file.sha1"
- else
- shasum "$file" | cut -f1 -d' ' > "$file.sha1"
- fi
- done
-
+ echo "Staging release in nexus"
+ MAVEN_OPTS="${MAVEN_OPTS}" ${MVN} --settings $tmp_settings \
+ -DskipTests -Dcheckstyle.skip=true "${PUBLISH_PROFILES}" \
+ -Dmaven.repo.local="${tmp_repo}" \
+ "${mvn_goals[@]}" > "${BASE_DIR}/mvn_deploy.log"
if ! is_dry_run; then
- nexus_upload=$NEXUS_ROOT/deployByRepositoryId/$staged_repo_id
- echo "Uploading files to $nexus_upload"
- for file in $(find ${modules} -type f)
- do
- # strip leading ./
- file_short=$(echo $file | sed -e "s/\.\///")
- dest_url="$nexus_upload/$groupid_as_dir/$file_short"
- echo " Uploading $file to $dest_url"
- curl -u "$ASF_USERNAME:$ASF_PASSWORD" --upload-file "${file_short}" "${dest_url}"
- done
-
- echo "Closing nexus staging repository"
- repo_request="<promoteRequest><data><stagedRepositoryId>$staged_repo_id</stagedRepositoryId><description>Apache ${PROJECT} $VERSION (commit $git_hash)</description></data></promoteRequest>"
- out=$(curl -X POST -d "$repo_request" -u $ASF_USERNAME:$ASF_PASSWORD \
- -H "Content-Type:application/xml" -v \
- $NEXUS_ROOT/profiles/$NEXUS_PROFILE/finish)
- echo "Closed Nexus staging repository: $staged_repo_id"
+ staged_repo_id=$(cat ${BASE_DIR}/mvn_deploy.log | \
+ grep -o "Closing staging repository with ID .*" | \
+ sed -e 's/Closing staging repository with ID "\([^"]*\)"./\1/')
+ echo "Artifacts successfully staged to repo ${staged_repo_id}"
+ else
+ echo "Artifacts successfully built. not staged due to dry run."
fi
-
- popd
- rm -rf "$tmp_repo"
- cd ..
+ )
# Dump out email to send. Where we find vote.tmpl depends
# on where this script is run from
export PROJECT_TEXT=$(echo "${PROJECT}" | sed "s/-/ /g")
diff --git a/pom.xml b/pom.xml
index 4f680c1..8c6a8c6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2481,6 +2481,28 @@
<argLine>${hbase-surefire.cygwin-argLine}</argLine>
</properties>
</profile>
+ <!-- this profile should match the name of the release profile in the root asf pom -->
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <!-- This should insert itself in place of the normal deploy plugin and then
+ handle either closing or dropping the staging repository for us depending
+ on if the build succeeds.
+ -->
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.8</version>
+ <extensions>true</extensions>
+ <configuration>
+ <nexusUrl>https://repository.apache.org/</nexusUrl>
+ <serverId>apache.releases.https</serverId>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<!-- this profile should be activated for release builds -->
<profile>
<id>release</id>