Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: website supports switching to v3.x and add notice for not supporting JDK 6/7 #2891

Merged
merged 3 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Arthas was built to solve these issues. A developer can troubleshoot your produc
* Supports telnet and websocket, which enables both local and remote diagnostics with command line and browsers.
* Supports profiler/Flame Graph
* Support get objects in the heap that are instances of the specified class.
* Supports JDK 6+.
* Supports JDK 6+ (version 4.x no longer supports JDK 6 and JDK 7).
* Supports Linux/Mac/Windows.


Expand Down
2 changes: 1 addition & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ English version goes [here](README.md).
0. 怎么快速定位应用的热点,生成火焰图?
0. 怎样直接从JVM内查找某个类的实例?

`Arthas`支持JDK 6+,支持Linux/Mac/Windows,采用命令行交互模式,同时提供丰富的 `Tab` 自动补全功能,进一步方便进行问题的定位和诊断。
`Arthas`支持JDK 6+(4.x 版本不再支持 JDK 6 和 JDK 7),支持Linux/Mac/Windows,采用命令行交互模式,同时提供丰富的 `Tab` 自动补全功能,进一步方便进行问题的定位和诊断。


### 在线教程(推荐)
Expand Down
2 changes: 2 additions & 0 deletions bin/as.sh
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,8 @@ Usage:
[--use-version <value>] [--repo-mirror <value>] [--versions] [--use-http]
[--attach-only] [-c <value>] [-f <value>] [-v] [pid]

NOTE: This version no longer supports JDK 6 and JDK 7 by default.

Options and Arguments:
-h,--help Print usage
--target-ip <value> The target jvm listen ip, default 127.0.0.1
Expand Down
3 changes: 2 additions & 1 deletion boot/src/main/java/com/taobao/arthas/boot/Bootstrap.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
*/
@Name("arthas-boot")
@Summary("Bootstrap Arthas")
@Description("EXAMPLES:\n" + " java -jar arthas-boot.jar <pid>\n"
@Description("NOTE: This version no longer supports JDK6 and JDK7 by default.\n\n"
+"EXAMPLES:\n" + " java -jar arthas-boot.jar <pid>\n"
+ " java -jar arthas-boot.jar --telnet-port 9999 --http-port -1\n"
+ " java -jar arthas-boot.jar --username admin --password <password>\n"
+ " java -jar arthas-boot.jar --tunnel-server 'ws://192.168.10.11:7777/ws' --app-name demoapp\n"
Expand Down
9 changes: 9 additions & 0 deletions site/docs/.vuepress/configs/navbar/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,13 @@ export const navbarEN = [
text: "DOWNLOAD",
link: "/en/doc/download.md",
},
{
text: "VERSIONS",
children: [
{
text: "v3.x",
link: "https://arthas.aliyun.com/3.x/en/",
},
],
},
];
9 changes: 9 additions & 0 deletions site/docs/.vuepress/configs/navbar/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,13 @@ export const navbarZH = [
text: "专家答疑",
link: "/doc/expert/intro.md",
},
{
text: "版本",
children: [
{
text: "v3.x",
link: "https://arthas.aliyun.com/3.x/",
},
],
},
];
2 changes: 1 addition & 1 deletion site/docs/doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Arthas 旨在解决这些问题。开发人员可以在线解决生产问题。
6. 怎么快速定位应用的热点,生成火焰图?
7. 怎样直接从 JVM 内查找某个类的实例?

`Arthas` 支持 JDK 6+,支持 Linux/Mac/Windows,采用命令行交互模式,同时提供丰富的 `Tab` 自动补全功能,进一步方便进行问题的定位和诊断。
`Arthas` 支持 JDK 6+(4.x 版本不再支持 JDK 6 和 JDK 7),支持 Linux/Mac/Windows,采用命令行交互模式,同时提供丰富的 `Tab` 自动补全功能,进一步方便进行问题的定位和诊断。

**如果您在使用 Arthas,请让我们知道,您的使用对我们非常重要:[查看](https://github.com/alibaba/arthas/issues/111)**

Expand Down
4 changes: 4 additions & 0 deletions site/docs/doc/download.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# 下载

::: warning
当前版本不支持 JDK 6 和 JDK 7,如需使用 JDK 6 或 JDK 7,请点击[此处下载 3.x 版本](https://arthas.aliyun.com/3.x/doc/download.html)。
:::

## 下载全量包

### 从 Maven 仓库下载
Expand Down
4 changes: 4 additions & 0 deletions site/docs/doc/install-detail.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Arthas Install

::: warning
当前版本不支持 JDK 6 和 JDK 7,如需使用 JDK 6 或 JDK 7,请点击[此处 Arthas Install](https://arthas.aliyun.com/3.x/doc/install-detail.html)。
:::

## 快速安装

### 使用`arthas-boot`(推荐)
Expand Down
4 changes: 4 additions & 0 deletions site/docs/doc/quick-start.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# 快速入门

::: warning
siuhui marked this conversation as resolved.
Show resolved Hide resolved
当前版本不支持 JDK 6 和 JDK 7,如需使用 JDK 6 或 JDK 7,请点击[此处快速入门](https://arthas.aliyun.com/3.x/doc/quick-start.html)。
:::

可以通过下面的方式自己动手实践,也可以通过我们的[在线教程](https://arthas.aliyun.com/doc/arthas-tutorials.html?language=cn&id=arthas-basics),跟随教程快速入门。

## 1. 启动 math-game
Expand Down
2 changes: 1 addition & 1 deletion site/docs/en/doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Arthas is built to solve these issues. A developer can troubleshoot production i
- Supports telnet and WebSocket, which enables both local and remote diagnostics with command line and browsers.
- Supports profiler/Flame Graph
- Support get objects in the heap that are instances of the specified class.
- Supports JDK 6+
- Supports JDK 6+ (version 4.x no longer supports JDK 6 and JDK 7)
- Supports Linux/Mac/Windows

**If you are using Arthas, please let us know. Your feedback is very important to us: [View](https://github.com/alibaba/arthas/issues/111)**
Expand Down
4 changes: 4 additions & 0 deletions site/docs/en/doc/download.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Download

:::warning
The current version does not support JDK 6 and JDK 7. If you need to use JDK 6 or JDK 7, please click [here to download version 3.x](https://arthas.aliyun.com/3.x/en/doc/download.html).
:::

## Download full package

### Download from maven central
Expand Down
4 changes: 4 additions & 0 deletions site/docs/en/doc/install-detail.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Install Arthas

::: warning
The current version does not support JDK 6 and JDK 7. If you need to use JDK 6 or JDK 7, please click [here to Install Arthas](https://arthas.aliyun.com/3.x/en/doc/install-detail.html).
:::

## Quick installation

### Use `arthas-boot`(Recommended)
Expand Down
4 changes: 4 additions & 0 deletions site/docs/en/doc/quick-start.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Quick Start

:::warning
The current version does not support JDK 6 and JDK 7. If you need to use JDK 6 or JDK 7, please click [here for quick start](https://arthas.aliyun.com/3.x/en/doc/quick-start.html).
:::

You can practice it yourself by following the instructions below, or you can use our [online tutorials](https://arthas.aliyun.com/doc/arthas-tutorials.html?language=en&id=arthas-basics) to get started quickly.

## 1. Start math-game
Expand Down
Loading
Loading