This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 1ca49ea HBASE-25438 Update create-release mvn in Dockerfile; its
3.6.0; make … (#2807)
1ca49ea is described below
commit 1ca49ea50c8a2b552af9030b4e1bdcd27f618461
Author: Michael Stack <[email protected]>
AuthorDate: Sat Jan 2 11:32:47 2021 -0800
HBASE-25438 Update create-release mvn in Dockerfile; its 3.6.0; make …
(#2807)
---
dev-support/create-release/hbase-rm/Dockerfile | 19 ++++++++++++++++---
dev-support/create-release/release-build.sh | 10 ++++++----
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/dev-support/create-release/hbase-rm/Dockerfile
b/dev-support/create-release/hbase-rm/Dockerfile
index 26cb7e5..ac443b6 100644
--- a/dev-support/create-release/hbase-rm/Dockerfile
+++ b/dev-support/create-release/hbase-rm/Dockerfile
@@ -21,6 +21,7 @@
# * Java 8
FROM ubuntu:18.04
+
# Install extra needed repos and refresh.
#
# This is all in a single "RUN" command so that if anything changes, "apt
update" is run to fetch
@@ -33,7 +34,6 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
libcurl4-openssl-dev='7.58.0-*' \
libxml2-dev='2.9.4+dfsg1-*' \
lsof='4.89+dfsg-*' \
- maven='3.6.0-*' \
openjdk-8-jdk='8u*' \
python-pip='9.0.1-*' \
subversion='1.9.7-*' \
@@ -43,10 +43,23 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
&& update-alternatives --set java
/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java \
&& pip install \
python-dateutil==2.8.1
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# Install mvn 3.6.3.
+ARG MAVEN_VERSION=3.6.3
+ARG
SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+RUN mkdir -p /opt/maven \
+ && curl -fsSL -o /tmp/apache-maven.tar.gz
${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+ && echo "${SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \
+ && tar -xzf /tmp/apache-maven.tar.gz -C /opt/maven --strip-components=1 \
+ && rm -f /tmp/apache-maven.tar.gz \
+ && ln -s /opt/maven/bin/mvn /usr/bin/mvn
+
# Install Apache Yetus
ENV YETUS_VERSION 0.12.0
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN wget -qO-
"https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=/yetus/${YETUS_VERSION}/apache-yetus-${YETUS_VERSION}-bin.tar.gz";
| \
+RUN curl
"https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=/yetus/${YETUS_VERSION}/apache-yetus-${YETUS_VERSION}-bin.tar.gz";
| \
tar xvz -C /opt
ENV YETUS_HOME /opt/apache-yetus-${YETUS_VERSION}
diff --git a/dev-support/create-release/release-build.sh
b/dev-support/create-release/release-build.sh
index 44a594f..12cef12 100755
--- a/dev-support/create-release/release-build.sh
+++ b/dev-support/create-release/release-build.sh
@@ -136,19 +136,21 @@ if [[ "$1" == "tag" ]]; then
git config user.name "$GIT_NAME"
git config user.email "$GIT_EMAIL"
+ git config user.signingkey "${GPG_KEY}"
# Create release version
maven_set_version "$RELEASE_VERSION"
+ find . -name pom.xml -exec git add {} \;
git add RELEASENOTES.md CHANGES.md
- git commit -a -m "Preparing ${PROJECT} release $RELEASE_TAG; tagging and
updates to CHANGES.md and RELEASENOTES.md"
+ git commit -s -m "Preparing ${PROJECT} release $RELEASE_TAG; tagging and
updates to CHANGES.md and RELEASENOTES.md"
log "Creating tag $RELEASE_TAG at the head of $GIT_BRANCH"
- git tag "$RELEASE_TAG"
+ git tag -s -m "Via create-release" "$RELEASE_TAG"
# Create next version
maven_set_version "$NEXT_VERSION"
-
- git commit -a -m "Preparing development version $NEXT_VERSION"
+ find . -name pom.xml -exec git add {} \;
+ git commit -s -m "Preparing development version $NEXT_VERSION"
if ! is_dry_run; then
# Push changes
