diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 755159d3e..71e2b2e0a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -121,7 +121,7 @@ Tip: you can use `--versions` to list all available versions. 发布release版本流程: -* 修改`as.sh`里的版本 +* 修改`as.sh`里的版本, `Bootstrap.java`里的版本,Dockerfile里的版本 * 修改本地的maven settings.xml * mvn release:prepare -Darguments="-DskipTests" * mvn release:perform -Darguments="-DskipTests -P full" diff --git a/Dockerfile b/Dockerfile index f602e61f8..babb8eab6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8-jdk-alpine -ARG ARTHAS_VERSION="3.1.1" +ARG ARTHAS_VERSION="3.1.2" ARG MIRROR=false ENV MAVEN_HOST=http://repo1.maven.org/maven2 \ diff --git a/Dockerfile-No-Jdk b/Dockerfile-No-Jdk index c56abb4a1..bcfe3b569 100644 --- a/Dockerfile-No-Jdk +++ b/Dockerfile-No-Jdk @@ -1,6 +1,6 @@ FROM alpine -ARG ARTHAS_VERSION="3.1.1" +ARG ARTHAS_VERSION="3.1.2" ARG MIRROR=false ENV MAVEN_HOST=http://repo1.maven.org/maven2 \ diff --git a/README.md b/README.md index 6d2a89039..c9b7d525f 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ You can enter its interactive interface by executing `as.sh`, or execute `as.sh * [User cases](https://github.com/alibaba/arthas/issues?q=label%3Auser-case) * [Questions and answers](https://github.com/alibaba/arthas/issues?utf8=%E2%9C%93&q=label%3Aquestion-answered+) * [Compile and debug/How to contribute](https://github.com/alibaba/arthas/blob/master/CONTRIBUTING.md) -* [Release Notes](https://alibaba.github.io/arthas/en/release-notes.html) +* [Release Notes](https://github.com/alibaba/arthas/releases) ### Feature Showcase diff --git a/README_CN.md b/README_CN.md index 33d62fcfe..6a60a3ed4 100644 --- a/README_CN.md +++ b/README_CN.md @@ -77,7 +77,7 @@ curl -L https://alibaba.github.io/arthas/install.sh | sh * [用户案例](https://github.com/alibaba/arthas/issues?q=label%3Auser-case) * [常见问题](https://github.com/alibaba/arthas/issues?utf8=%E2%9C%93&q=label%3Aquestion-answered+) * [编译调试/参与贡献](https://github.com/alibaba/arthas/blob/master/CONTRIBUTING.md) -* [Release Notes](https://alibaba.github.io/arthas/release-notes.html) +* [Release Notes](https://github.com/alibaba/arthas/releases) * [QQ群/钉钉群](https://alibaba.github.io/arthas/contact-us.html) Gitee文档镜像: https://arthas.gitee.io/ diff --git a/bin/as.sh b/bin/as.sh index ba1a08c5b..0301a4bfb 100755 --- a/bin/as.sh +++ b/bin/as.sh @@ -8,10 +8,10 @@ # program : Arthas # author : Core Engine @ Taobao.com -# date : 2019-05-15 +# date : 2019-09-09 # current arthas script version -ARTHAS_SCRIPT_VERSION=3.1.1 +ARTHAS_SCRIPT_VERSION=3.1.2 # SYNOPSIS # rreadlink @@ -436,7 +436,7 @@ EXAMPLES: ./as.sh --tunnel-server 'ws://192.168.10.11:7777/ws' --agent-id bvDOe8XbTM2pQWjF4cfw ./as.sh -c 'sysprop; thread' ./as.sh -f batch.as - ./as.sh --use-version 3.1.1 + ./as.sh --use-version 3.1.2 ./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 a17c1ca6d..6496ea9b7 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.1\n" + + " java -jar arthas-boot.jar --use-version 3.1.2\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/index.md b/site/src/site/sphinx/en/index.md index 2136ad418..6a02d5386 100644 --- a/site/src/site/sphinx/en/index.md +++ b/site/src/site/sphinx/en/index.md @@ -50,4 +50,4 @@ Contents * [Questions and answers](https://github.com/alibaba/arthas/issues?q=label%3Aquestion-answered) * [Fork me at GitHub](https://github.com/alibaba/arthas) * [Compile and debug/CONTRIBUTING](https://github.com/alibaba/arthas/blob/master/CONTRIBUTING.md) -* [Release Notes](release-notes.md) +* [Release Notes](https://github.com/alibaba/arthas/releases) diff --git a/site/src/site/sphinx/index.md b/site/src/site/sphinx/index.md index 784d979fb..f29098527 100644 --- a/site/src/site/sphinx/index.md +++ b/site/src/site/sphinx/index.md @@ -38,7 +38,7 @@ Contents * [常见问题](https://github.com/alibaba/arthas/issues?q=label%3Aquestion-answered) * [Fork me at GitHub](https://github.com/alibaba/arthas) * [编译调试/参与贡献](https://github.com/alibaba/arthas/blob/master/CONTRIBUTING.md) -* [Release Notes](release-notes.md) +* [Release Notes](https://github.com/alibaba/arthas/releases) * [QQ群/钉钉群](contact-us.md)