diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 80e4344366..cf557aa440 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -31,7 +31,7 @@ runs: using: "composite" steps: - name: Check License - uses: apache/skywalking-eyes@a63f4afcc287dfb3727ecc45a4afc55a5e69c15f + uses: apache/skywalking-eyes@a196742f472feaffafea537ce5a2a4c3c53a8de4 # v0.9.0 - name: Add checkstyle-plugin shell: bash run: | @@ -39,12 +39,12 @@ runs: sed -i "/<\/sourceDirectories>/i scenarios\/""${{ inputs.test_case }}""<\/sourceDirectory>" test/plugin/pom.xml echo "::endgroup::" - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-agent-test-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-maven-agent-test- - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 17 @@ -56,12 +56,12 @@ runs: ./mvnw -q --batch-mode clean package -Dmaven.test.skip || \ ./mvnw -q --batch-mode clean package -Dmaven.test.skip echo "::endgroup::" - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 name: Upload Agent with: name: skywalking-agent path: skywalking-agent - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 8 @@ -90,7 +90,7 @@ runs: docker save -o test-containers/skywalking-agent-test-tomcat-1.0.0.tgz skywalking/agent-test-tomcat:1.0.0 ls -la test-containers/ echo "::endgroup::" - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 name: Upload Test Containers with: name: test-tools diff --git a/.github/actions/run/action.yml b/.github/actions/run/action.yml index bb9b3c6143..3227194bd4 100644 --- a/.github/actions/run/action.yml +++ b/.github/actions/run/action.yml @@ -25,11 +25,11 @@ inputs: runs: using: "composite" steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: skywalking-agent path: skywalking-agent - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: test-tools - name: Disable containerd image store @@ -59,7 +59,7 @@ runs: fi docker images - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-agent-test-run-${{ hashFiles('**/pom.xml') }} @@ -70,7 +70,7 @@ runs: echo "::group::Run Plugin Test ${{ inputs.test_case }}" bash test/plugin/run.sh --debug ${{ inputs.test_case }} echo "::endgroup::" - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 name: Upload Agent if: always() with: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e8a4a2bfb1..95fd404a24 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -31,11 +31,11 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Check License Header - uses: apache/skywalking-eyes@9bd5feb86b5817aa6072b008f9866a2c3bbc8587 + uses: apache/skywalking-eyes@a196742f472feaffafea537ce5a2a4c3c53a8de4 # v0.9.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -58,16 +58,16 @@ jobs: - if: matrix.os == 'windows' name: Support longpaths run: git config --system core.longpaths true - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-ci-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-maven-ci- - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: ${{ matrix.java-version }} diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 1abc057ad0..e08fbda170 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -44,21 +44,21 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 17 - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} - run: ./mvnw -q -Dmaven.test.skip=true clean install || ./mvnw -q -Dmaven.test.skip=true clean install - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 diff --git a/.github/workflows/dead-link-checker.yaml b/.github/workflows/dead-link-checker.yaml index a45c5b1341..857bfa9606 100644 --- a/.github/workflows/dead-link-checker.yaml +++ b/.github/workflows/dead-link-checker.yaml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 - run: sudo npm install -g markdown-link-check@3.10.3 - run: | for file in $(find . -name "*.md"); do diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 23115435e2..41ce22f46b 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -34,10 +34,10 @@ jobs: - name: Kafka path: test/e2e/case/kafka/e2e.yaml steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 17 @@ -59,7 +59,7 @@ jobs: uses: apache/skywalking-infra-e2e@56ac8befeb5f910f2dc9339e65d07cd18953f90e with: e2e-file: ${{ matrix.case.path }} - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: ${{ failure() }} name: Upload Logs with: diff --git a/.github/workflows/plugins-jdk11-test.3.yaml b/.github/workflows/plugins-jdk11-test.3.yaml index 238fd4047c..7f5d33512e 100644 --- a/.github/workflows/plugins-jdk11-test.3.yaml +++ b/.github/workflows/plugins-jdk11-test.3.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -72,10 +72,10 @@ jobs: - jdk11-forkjoinpool-scenario - jdk-httpclient-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 11 diff --git a/.github/workflows/plugins-jdk17-test.0.yaml b/.github/workflows/plugins-jdk17-test.0.yaml index 73aa926c3c..a809cdc4dd 100644 --- a/.github/workflows/plugins-jdk17-test.0.yaml +++ b/.github/workflows/plugins-jdk17-test.0.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -88,10 +88,10 @@ jobs: - undertow-2.3.x-scenario - apm-toolkit-logback-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/plugins-jdk17-test.1.yaml b/.github/workflows/plugins-jdk17-test.1.yaml index 824239b5a3..fbde965e57 100644 --- a/.github/workflows/plugins-jdk17-test.1.yaml +++ b/.github/workflows/plugins-jdk17-test.1.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -87,10 +87,10 @@ jobs: - elasticsearch-java-9.x-scenario - webflux-6.x-7.x-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: '17' diff --git a/.github/workflows/plugins-jdk21-test.0.yaml b/.github/workflows/plugins-jdk21-test.0.yaml index 51ed4fe7e9..cd1548c141 100644 --- a/.github/workflows/plugins-jdk21-test.0.yaml +++ b/.github/workflows/plugins-jdk21-test.0.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -74,10 +74,10 @@ jobs: - jdk-virtual-thread-executor-scenario - gateway-5.x-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: '21' diff --git a/.github/workflows/plugins-jdk25-test.0.yaml b/.github/workflows/plugins-jdk25-test.0.yaml index 06526df29f..c6dc114753 100644 --- a/.github/workflows/plugins-jdk25-test.0.yaml +++ b/.github/workflows/plugins-jdk25-test.0.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -76,10 +76,10 @@ jobs: case: - spring-6.x-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: '25' diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml index 0c86b2e8ad..c2467bb7f5 100644 --- a/.github/workflows/plugins-test.0.yaml +++ b/.github/workflows/plugins-test.0.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -105,10 +105,10 @@ jobs: - fastjson-scenario - jackson-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 8 diff --git a/.github/workflows/plugins-test.1.yaml b/.github/workflows/plugins-test.1.yaml index 19e20deb5c..92a47be433 100644 --- a/.github/workflows/plugins-test.1.yaml +++ b/.github/workflows/plugins-test.1.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -100,10 +100,10 @@ jobs: - resteasy-4.x-scenario - netty-http-4.1.x-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 8 diff --git a/.github/workflows/plugins-test.2.yaml b/.github/workflows/plugins-test.2.yaml index 042a14d947..498da1a394 100644 --- a/.github/workflows/plugins-test.2.yaml +++ b/.github/workflows/plugins-test.2.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -100,10 +100,10 @@ jobs: - rocketmq-5-grpc-scenario - elasticsearch-java-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 8 diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml index 0c667a6d06..6b626073ef 100644 --- a/.github/workflows/plugins-test.3.yaml +++ b/.github/workflows/plugins-test.3.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -126,10 +126,10 @@ jobs: - shenyu-2.4.x-sofarpc-scenario - solon-2.x-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 8 diff --git a/.github/workflows/plugins-tomcat10-test.0.yaml b/.github/workflows/plugins-tomcat10-test.0.yaml index 9bac4133d9..5b82d778db 100644 --- a/.github/workflows/plugins-tomcat10-test.0.yaml +++ b/.github/workflows/plugins-tomcat10-test.0.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -71,10 +71,10 @@ jobs: case: - tomcat-10x-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 8 diff --git a/.github/workflows/plugins-tomcat9-test.0.yaml b/.github/workflows/plugins-tomcat9-test.0.yaml index 400e8a0ff6..7e1d4dad4f 100644 --- a/.github/workflows/plugins-tomcat9-test.0.yaml +++ b/.github/workflows/plugins-tomcat9-test.0.yaml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - name: Disable containerd image store @@ -71,10 +71,10 @@ jobs: case: - tomcat-9x-scenario steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: 8 diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 58e63e1328..2660670f59 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -64,19 +64,19 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true # Development images are compiled from the branch. - name: Cache local Maven repository if: env.RELEASE_TAG == '' - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-publish-docker-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-maven-publish-docker- - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v6 if: env.RELEASE_TAG == '' with: distribution: temurin @@ -113,7 +113,7 @@ jobs: # The Makefile passes this directory to the Dockerfile as ARG DIST. test -d skywalking-agent - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 name: Upload Agent with: name: skywalking-agent @@ -135,7 +135,7 @@ jobs: # images keep the existing JRE-only set. base: ${{ github.event.inputs.version && fromJSON('["alpine","java8","java11","java17","java21","java25"]') || fromJSON('["java8","java11","java17","java21","java25"]') }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 with: submodules: true # The workflow file necessarily comes from the default branch on a @@ -152,7 +152,7 @@ jobs: git checkout "refs/tags/v${VERSION}" git submodule update --init --depth 1 git --no-pager log -1 --format='building from %h %d' - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: skywalking-agent path: skywalking-agent @@ -200,7 +200,7 @@ jobs: docker info echo "DOCKER_API_VERSION=$(docker version --format '{{.Server.APIVersion}}')" >> "$GITHUB_ENV" - name: Log in to the Container registry - uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0 + uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0 with: registry: ${{ env.DOCKER_REGISTRY }} username: ${{ env.DOCKER_USERNAME }} diff --git a/.licenserc.yaml b/.licenserc.yaml index ae96eaac94..84e4bc4aa2 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -33,6 +33,7 @@ header: - 'docker/.env' - 'dist' - 'licenses' + - 'dist-material/licenses' - 'dist-material/release-docs' - '**/*.md' - '**/*.json' diff --git a/CLAUDE.md b/CLAUDE.md index e8c354b302..7f8c8e7036 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -168,7 +168,7 @@ Use Lombok annotations for boilerplate code: ## Testing ### Test Frameworks -- JUnit 4.12 for unit tests +- JUnit 4.13.2 for unit tests - Mockito 5.0.0 for mocking ### Test Categories diff --git a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml index de3593d218..60cb26e0f8 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-common/pom.xml @@ -32,7 +32,7 @@ UTF-8 - 8.0.13 + 8.0.33 diff --git a/pom.xml b/pom.xml index bee75ede49..ec35bdd8c5 100755 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ 8 8 6.18 - 4.12 + 4.13.2 5.0.0 2.0.2 1.18.42 diff --git a/test/plugin/pom.xml b/test/plugin/pom.xml index b42f4a69b7..20643ee6a1 100644 --- a/test/plugin/pom.xml +++ b/test/plugin/pom.xml @@ -85,13 +85,13 @@ org.apache.logging.log4j log4j-core - 2.8.1 + 2.25.5 org.apache.logging.log4j log4j-api - 2.8.1 + 2.25.5