Fix

Author: peachisai

.github/workflows/plugins-jdk25-test.0.yaml

@@ -0,0 +1,70 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Test
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/plugins-*.yaml'
+      - 'apm-application-toolkit/**'
+      - 'apm-commons/**'
+      - 'apm-protocol/**'
+      - 'apm-sniffer/**'
+      - 'test/plugin/**'
+      - '**/pom.xml'
+      - '!**.md'
+
+concurrency:
+  group: plugins-jdk25-1-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Build
+        uses: ./.github/actions/build
+        with:
+          base_image_java: eclipse-temurin:25-jdk
+          base_image_tomcat: tomcat:10.1-jdk25-temurin
+
+  test:
+    needs: [ build ]
+    name: ${{ matrix.case }}-jdk25
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+    strategy:
+      matrix:
+        case:
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '25'
+      - name: Run Test
+        uses: ./.github/actions/run
+        with:
+          test_case: ${{ matrix.case }}

.github/workflows/publish-docker.yaml

@@ -64,7 +64,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java-version: [ 8, 11, 17, 21 ]
+        java-version: [ 8, 11, 17, 21, 25 ]
     env:
       TAG: ${{ github.sha }}
     steps:

CHANGES.md

@@ -22,6 +22,7 @@ Release Notes.
 * Fix Gateway 2.0.x plugin not activated for spring-cloud-starter-gateway 2.0.0.RELEASE.
 * Support kafka-clients-3.9.x intercept.
 * Upgrade kafka-clients version in optional-reporter-plugins to 3.9.1.
+* Bump up Lombok to v1.18.42 to adopt JDK25 compiling.
 
 All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1)
 

Makefile

@@ -34,14 +34,15 @@ dist: build
 
 # Docker build
 
-base.all := alpine java8 java11 java17 java21
+base.all := alpine java8 java11 java17 java21 java25
 base.each = $(word 1, $@)
 
 base.image.alpine := alpine:3
 base.image.java8 := eclipse-temurin:8-jre
 base.image.java11 := eclipse-temurin:11-jre
 base.image.java17 := eclipse-temurin:17-jre
 base.image.java21 := eclipse-temurin:21-jre
+base.image.java25 := eclipse-temurin:25-jre
 
 docker.%: PLATFORMS =
 docker.%: LOAD_OR_PUSH = --load

docs/en/contribution/compiling.md

@@ -1,7 +1,7 @@
 # Compiling project
 This document will help you compile and build a project in your maven and set your IDE.
 
-Prepare JDK 17 or 21.
+Prepare JDK 17, 21 or 25.
 
 * If you clone codes from https://github.com/apache/skywalking-java
 ```shell

docs/en/setup/service-agent/java-agent/Plugin-test.md

@@ -682,6 +682,7 @@ You can run `python3 tools/select-group.py` to see which file contains the least
 
 If a test case required to run in JDK 17 environment, please add you test case into file `plugins-jdk17-test.<n>.yaml`.
 If a test case required to run in JDK 21 environment, please add you test case into file `plugins-jdk21-test.<n>.yaml`.
+If a test case required to run in JDK 25 environment, please add you test case into file `plugins-jdk25-test.<n>.yaml`.
 
 ```yaml
 jobs:

docs/en/setup/service-agent/java-agent/README.md

@@ -1,6 +1,6 @@
 # Setup java agent
 
-1. Agent is available for JDK 8 - 21.
+1. Agent is available for JDK 8 - 25.
 1. Find `agent` folder in SkyWalking release package
 1. Set `agent.service_name` in `config/agent.config`. Could be any String in English.
 1. Set `collector.backend_service` in `config/agent.config`. Default point to `127.0.0.1:11800`, only works for local