update on 2020/11/20

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+**/.factorypath
 /core/core.iml
 /agent/agent.iml
 /target
@@ -16,3 +17,8 @@ site/src/site/sphinx/_build
 site/src/site/sphinx/en/_build
 
 **/__pycache__
+
+dependency-reduced-pom.xml
+pom.xml.versionsBackup
+.pmd
+**/.flattened-pom.xml

.travis.yml

@@ -1,24 +1,47 @@
-language: generic
+language: java
 sudo: false
 
-jdk:
-  - openjdk7
-  - openjdk8
-  - openjdk9
-  - openjdk10
-  - openjdk11
-  - oraclejdk7
-  - oraclejdk8
-  - oraclejdk9
-  - oraclejdk10
-  - oraclejdk11
+matrix:
+  include:
+# Target option 6 is no longer supported. Use 7 or later.
+#  - env:
+#      - ZULUJDK=12
+  - env:
+      - ZULUJDK=11
+  - env:
+      - ZULUJDK=10
+  - env:
+      - ZULUJDK=9
+  - env:
+      - ZULUJDK=8
+  - env:
+      - ZULUJDK=7
+# TLS error
+#  - env:
+#      - ZULUJDK=6
+
+before_install:
+  # installing the rpm package 
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq rpm
+  # adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation
+  - "[[ -d $HOME/.sdkman/bin/ ]] || rm -rf $HOME/.sdkman/"
+  - curl -sL https://get.sdkman.io | bash
+  - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config
+  - source "$HOME/.sdkman/bin/sdkman-init.sh"
+
+install:
+  - sdk install java $(sdk list java | grep -o "$ZULUJDK\.[0-9\.]*-zulu" | head -1)
+  - unset JAVA_HOME
 
 cache:
   directories:
     - "$HOME/.m2/repository"
     - "$HOME/.m2/wrapper"
+
 script:
-  - ./mvnw clean cobertura:cobertura package -P full -Dsphinx.binUrl=https://github.com/hengyunabc/sphinx-binary/releases/download/v0.4.0.1/sphinx.linux-x86_64
+  - ./mvnw -version
+  - travis_wait 30 ./mvnw clean package --batch-mode -P full
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
@@ -31,7 +54,11 @@ deploy:
   api_key:
     - secure: "V+omzrcAJ/awN3EsDkiELejjInz/rpgPLdyb4uZrcQnqhagbHYE+nY2KcjPEtRBVNkqlh6dxIIsUFvKrs5kxe5EVvI6rLQeZLFMqWUeNfWuhbuQWCV9ZPyQiqXCqNicj+LLHArzQRLx5w5YBvxdzMuXSWo1ZE4wy+c3koprulUSjr6XhNPKyyasq4EXKMXuLCjcvBVPHhXviG59Jbshb2lRHbkxMqYeLhWi/gUOBRbNC1CmcGGAMviFX7HpBOx5fMaVKPR7rzcULw3lXnLhdSwhXJ6ybnsN/osfN8zAx6XZIwvwvVQ12yM8S9eVthnjblFh+WKwOT1AS6hHFXkMTjh1FE5CtUVu+sFbGIngJ4C4O78VzWCKvH/IrIi4p2IkF+fcu8USnm7YZGuyoAwe3O5PqmWBuQV0iCEx0IGo/nPwVzj1+jnz38Go/DP1aVDJZMenysBNxi4l45d3J3CgMPvF00DDQKvxYrkBjdnByANrOisZPjIeUOc7GsWoDLCK9jZtXMID2NM+ehQnDbOJ3BS2Bjg7ojPc0Rw2yJjbzwNqaMiOPXp2ym/5DpaB/l5k2gSi2NCRUFCXhFNRCq9ChFXv+pYJwk0e17sleGvo6tnFDVCR6lFcXrYo/vGC43bL1dT4rY8E6VSRlE0jfoXdFFp4jw3v3a+DqVLGVC9UcTpw="
   file_glob: true
-  file: "packaging/target/*.zip"
+  file:
+    - "packaging/target/*.zip"
+    - "packaging/target/*.deb"
+    - "packaging/target/*.rpm"
+    - "tunnel-server/target/*.jar"
   skip_cleanup: true
   on:
     tags: true

CONTRIBUTING.md

@@ -12,6 +12,10 @@ Welcome to use [issue tracker](https://github.com/alibaba/arthas/issues) to give
 
 Welcome PR to further improve English [documentation](https://github.com/alibaba/arthas/tree/master/site/src/site/sphinx/en).
 
+## Online Tutorials
+
+Please refer to [README.MD at tutorials/katacoda](tutorials/katacoda/README.md#contribution-guide)
+
 ## Developer
 
 * Arthas runtime supports JDK6+
@@ -51,19 +55,18 @@ Tip: you can use `--versions` to list all available versions.
 * Arthas is using [Sphinx](http://www.sphinx-doc.org/en/master/) to generate the static site
 * `sphinx-maven-plugin` configured in [`site/pom.xml`](https://github.com/alibaba/arthas/tree/master/site)
 * `sphinx-maven-plugin` executes by downloading`sphinx-binary/`
-* a [bug](https://github.com/rtfd/recommonmark/issues/93) in Sphinx plugin `recommonmark`; we fix it by packaging another [version](https://github.com/hengyunabc/sphinx-binary/releases/tag/v0.4.0.1)
-* when packaging the whole project (Packaging All), you need to (Only Unix/Linux/Mac supported):
+* when packaging the whole project (Packaging All), you need to execute:
 
     ```bash
-    ./mvnw clean package -DskipTests -P full -Dsphinx.binUrl=https://github.com/hengyunabc/sphinx-binary/releases/download/v0.4.0.1/sphinx.osx-x86_64
+    ./mvnw clean package -DskipTests -P full
     ```
 
 
 ---
 
 
 
-## issue
+## Issue
 
 欢迎在issue里对arthas做反馈，分享使用技巧，排查问题的经历。
 
@@ -75,6 +78,10 @@ Tip: you can use `--versions` to list all available versions.
 
 英文文档在`site/src/site/sphinx/en`目录下，欢迎提交翻译PR。
 
+## 改进在线教程
+
+请参考[tutorials/katacoda下的说明](tutorials/katacoda/README_CN.md#贡献指南)
+
 ## 开发者相关
 
 * Arthas运行支持JDK6+
@@ -111,20 +118,53 @@ Tip: you can use `--versions` to list all available versions.
 * arthas是用sphinx来生成静态网站
 * 在`site/pom.xml`里配置了`sphinx-maven-plugin`
 * `sphinx-maven-plugin`通过下载`sphinx-binary/`来执行
-* sphinx配置的`recommonmark`插件有bug：https://github.com/rtfd/recommonmark/issues/93 ，因此另外打包了一个修复版本： https://github.com/hengyunabc/sphinx-binary/releases/tag/v0.4.0.1
-* 全量打包时，需要配置下面的参数（目前只支持mac/linux）：
+
+
+* 全量打包时，需要配置下面的参数：
 
     ```
-    ./mvnw clean package -DskipTests -P full -Dsphinx.binUrl=https://github.com/hengyunabc/sphinx-binary/releases/download/v0.4.0.1/sphinx.osx-x86_64
+    ./mvnw clean package -DskipTests -P full
     ```
+#### 当 sphinx-maven-plugin 下载出错时，可以用下面的方式
+
+到 https://github.com/trustin/sphinx-binary/releases 下载对应版本的二进制文件，并在本地加上可执行权限。例如：
+
+```
+wget https://github.com/hengyunabc/sphinx-binary/releases/download/v0.4.0.1/sphinx.osx-x86_64 -o /tmp/sphinx.osx-x86_64
+chmod +x /tmp/sphinx.osx-x86_64
+./mvnw clean package -DskipTests -P full -Dsphinx.binUrl=file:/tmp/sphinx.osx-x86_64
+```
 
 ### Release Steps
 
 发布release版本流程：
 
-* 修改`as.sh`里的版本
+* 修改`as.sh`里的版本，最后修改日期， `Bootstrap.java`里的版本，Dockerfile里的版本
 * 修改本地的maven settings.xml
-* mvn release:prepare -Darguments="-DskipTests"
-* mvn release:perform -Darguments="-DskipTests -P full -Dsphinx.binUrl=https://github.com/hengyunabc/sphinx-binary/releases/download/v0.4.0.1/sphinx.osx-x86_64"
+* mvn clean deploy -DskipTests -P full -P release
+
+    如果在下载 sphinx-binary 出错，参考上面的 全量打包 的说明。
+
 * 到 https://oss.sonatype.org/ 上，“Staging Repositories”然后close掉自己的，再release
+* 发布后，可以到这里查看是否同步到仓库里了： https://repo1.maven.org/maven2/com/taobao/arthas/arthas-packaging/
+* 发布完maven仓库之后，需要到阿里云的仓库里检查是否同步，有可能有延时
+
+    比如下载地址： https://maven.aliyun.com/repository/public/com/taobao/arthas/arthas-packaging/3.x.x/arthas-packaging-3.x.x-bin.zip
 
+* 打上tag，push tag到仓库上
+* 需要更新 gh-pages 分支下面的 arthas-boot.jar/arthas-demo.jar/as.sh ，下载 doc.zip，解压覆盖掉文档的更新
+* 需要更新docker镜像，push新的tag：https://hub.docker.com/r/hengyunabc/arthas/tags?page=1&ordering=last_updated
+
+    以 3.1.0 版本为例：
+    ```
+    docker build . --build-arg ARTHAS_VERSION=3.1.0 -t hengyunabc/arthas:3.1.0
+    docker tag hengyunabc/arthas:3.1.0  hengyunabc/arthas:latest
+    docker push hengyunabc/arthas:3.1.0
+    docker push hengyunabc/arthas:latest
+
+    docker build .  --build-arg ARTHAS_VERSION=3.1.0 -f Dockerfile-No-Jdk -t hengyunabc/arthas:3.1.0-no-jdk
+    docker push hengyunabc/arthas:3.1.0-no-jdk
+    ```
+* 更新README.md，比如增加了新命令，要加上说明，更新wiki的链接
+* 更新release页面的 issue信息，修改信息等
+* 更新内部的版本

Dockerfile

@@ -1,11 +1,11 @@
 FROM openjdk:8-jdk-alpine
 
-ARG ARTHAS_VERSION="3.0.5"
+ARG ARTHAS_VERSION="3.4.4"
 ARG MIRROR=false
 
 ENV MAVEN_HOST=https://repo1.maven.org/maven2 \
     ALPINE_HOST=dl-cdn.alpinelinux.org \
-    MIRROR_MAVEN_HOST=http://maven.aliyun.com/repository/public \
+    MIRROR_MAVEN_HOST=https://maven.aliyun.com/repository/public \
     MIRROR_ALPINE_HOST=mirrors.aliyun.com 
 
 # if use mirror change to aliyun mirror site

Dockerfile-No-Jdk

@@ -1,10 +1,10 @@
 FROM alpine
 
-ARG ARTHAS_VERSION="3.0.5"
+ARG ARTHAS_VERSION="3.4.4"
 ARG MIRROR=false
 
 ENV MAVEN_HOST=https://repo1.maven.org/maven2 \
-  MIRROR_MAVEN_HOST=http://maven.aliyun.com/repository/public
+  MIRROR_MAVEN_HOST=https://maven.aliyun.com/repository/public
 
 # if use mirror change to aliyun mirror site
 RUN if $MIRROR; then MAVEN_HOST=${MIRROR_MAVEN_HOST} ; fi && \