diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 96b3a0736b..12d60d7d10 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -239,6 +239,8 @@ jobs: include: - os: ubuntu java-version: 17 + - os: ubuntu + java-version: 21 steps: - uses: actions/checkout@v3 with: diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index cb52c4de82..c959d155eb 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -5,6 +5,7 @@ * Bump Java agent to 9.1-dev in the e2e tests. * Bump up netty to 4.1.100. * Update Groovy 3 to 4.0.15. +* Support packaging the project in JDK21. Compiler source and target remain in JDK11. #### OAP Server diff --git a/docs/en/guides/How-to-build.md b/docs/en/guides/How-to-build.md index 52a51ba28e..a76deaf0ce 100644 --- a/docs/en/guides/How-to-build.md +++ b/docs/en/guides/How-to-build.md @@ -16,7 +16,7 @@ If you need to execute build behind the proxy, edit the *.mvn/jvm.config* and se ``` ### Building from GitHub -1. Prepare git, JDK11+, and Maven 3.6+. +1. Prepare git, JDK 11 or 17 (LTS versions), and Maven 3.6+. 1. Clone the project. If you want to build a release from source codes, set a `tag name` by using `git clone -b [tag_name] ...` while cloning. diff --git a/docs/en/setup/backend/backend-setup.md b/docs/en/setup/backend/backend-setup.md index da53b704fd..56916c0f65 100755 --- a/docs/en/setup/backend/backend-setup.md +++ b/docs/en/setup/backend/backend-setup.md @@ -14,7 +14,7 @@ SkyWalking's backend distribution package consists of the following parts: ## Requirements and default settings -Requirement: **JDK11 to JDK17 are tested**. Other versions are not tested and may or may not work. +Requirement: **JDK11 or JDK17**. Before you begin, you should understand that the main purpose of the following quickstart is to help you obtain a basic configuration for previews/demos. Performance and long-term running are **NOT** among the purposes of the quickstart. diff --git a/pom.xml b/pom.xml index c30d397a65..91a13360e4 100755 --- a/pom.xml +++ b/pom.xml @@ -153,11 +153,14 @@ 1693572743 + 2.0.9 6.18 5.9.2 4.11.0 - 1.18.22 + 2.1.4 + 1.18.30 + 1.14.9 1.53.0 @@ -194,8 +197,6 @@ false --add-opens java.base/java.lang=ALL-UNNAMED - 2.0.2 - ${project.build.directory}/delombok @@ -284,6 +285,28 @@ mockito-junit-jupiter ${mockito-core.version} test + + + net.bytebuddy + byte-buddy + + + net.bytebuddy + byte-buddy-agent + + + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + test + + + net.bytebuddy + byte-buddy-agent + ${byte-buddy.version} + test @@ -303,6 +326,16 @@ system-stubs-jupiter ${system-stubs.version} test + + + net.bytebuddy + byte-buddy + + + net.bytebuddy + byte-buddy-agent + +