From ec5eee1480cd57a2ca903174ab58cb793d832f11 Mon Sep 17 00:00:00 2001 From: hengyunabc Date: Wed, 15 May 2019 17:30:49 +0800 Subject: [PATCH] prepare release --- Dockerfile | 2 +- Dockerfile-No-Jdk | 2 +- bin/as.sh | 6 +++--- boot/src/main/java/com/taobao/arthas/boot/Bootstrap.java | 2 +- site/src/site/sphinx/en/release-notes.md | 6 ++++++ site/src/site/sphinx/release-notes.md | 6 ++++++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2bc984b09..2ab98fe9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8-jdk-alpine -ARG ARTHAS_VERSION="3.1.0" +ARG ARTHAS_VERSION="3.1.1" ARG MIRROR=false ENV MAVEN_HOST=https://repo1.maven.org/maven2 \ diff --git a/Dockerfile-No-Jdk b/Dockerfile-No-Jdk index 66b53e491..a93a90ad6 100644 --- a/Dockerfile-No-Jdk +++ b/Dockerfile-No-Jdk @@ -1,6 +1,6 @@ FROM alpine -ARG ARTHAS_VERSION="3.1.0" +ARG ARTHAS_VERSION="3.1.1" ARG MIRROR=false ENV MAVEN_HOST=https://repo1.maven.org/maven2 \ diff --git a/bin/as.sh b/bin/as.sh index 82e5405f8..827cc3d36 100755 --- a/bin/as.sh +++ b/bin/as.sh @@ -8,10 +8,10 @@ # program : Arthas # author : Core Engine @ Taobao.com -# date : 2019-02-14 +# date : 2019-05-15 # current arthas script version -ARTHAS_SCRIPT_VERSION=3.1.0 +ARTHAS_SCRIPT_VERSION=3.1.1 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -426,7 +426,7 @@ EXAMPLES: ./as.sh --telnet-port 9999 --http-port -1 ./as.sh -c 'sysprop; thread' ./as.sh -f batch.as - ./as.sh --use-version 3.1.0 + ./as.sh --use-version 3.1.1 ./as.sh --session-timeout 3600 ./as.sh --attach-only ./as.sh --repo-mirror aliyun --use-http diff --git a/boot/src/main/java/com/taobao/arthas/boot/Bootstrap.java b/boot/src/main/java/com/taobao/arthas/boot/Bootstrap.java index 868bb6a91..005fe1e75 100644 --- a/boot/src/main/java/com/taobao/arthas/boot/Bootstrap.java +++ b/boot/src/main/java/com/taobao/arthas/boot/Bootstrap.java @@ -44,7 +44,7 @@ import com.taobao.middleware.cli.annotations.Summary; + " java -jar arthas-boot.jar --telnet-port 9999 --http-port -1\n" + " java -jar arthas-boot.jar -c 'sysprop; thread' \n" + " java -jar arthas-boot.jar -f batch.as \n" - + " java -jar arthas-boot.jar --use-version 3.1.0\n" + + " java -jar arthas-boot.jar --use-version 3.1.1\n" + " java -jar arthas-boot.jar --versions\n" + " java -jar arthas-boot.jar --session-timeout 3600\n" + " java -jar arthas-boot.jar --attach-only\n" + " java -jar arthas-boot.jar --repo-mirror aliyun --use-http\n" + "WIKI:\n" diff --git a/site/src/site/sphinx/en/release-notes.md b/site/src/site/sphinx/en/release-notes.md index 14d7f1470..29632d5c5 100644 --- a/site/src/site/sphinx/en/release-notes.md +++ b/site/src/site/sphinx/en/release-notes.md @@ -1,6 +1,12 @@ Release Notes ============= + +v3.1.1 +--- + +* [https://github.com/alibaba/arthas/releases/tag/3.1.1](https://github.com/alibaba/arthas/releases/tag/3.1.1) + v3.1.0 --- diff --git a/site/src/site/sphinx/release-notes.md b/site/src/site/sphinx/release-notes.md index f25c2b81c..56ec07c14 100644 --- a/site/src/site/sphinx/release-notes.md +++ b/site/src/site/sphinx/release-notes.md @@ -2,6 +2,12 @@ Release Notes === + +v3.1.1 +--- + +* [https://github.com/alibaba/arthas/releases/tag/3.1.1](https://github.com/alibaba/arthas/releases/tag/3.1.1) + v3.1.0 ---