Repository navigation
Bump dependencies to fix security alerts - #847
Merged
Merged
Conversation
Plugin-test tooling (test/plugin/pom.xml, inherited by runner-helper, agent-test-tools and containers; still built on JDK 8): - junit:junit 4.11 -> 4.13.2, CVE-2020-15250 - com.google.guava:guava 30.1.1-jre -> 33.7.2-jre, CVE-2020-8908, CVE-2023-2976, CVE-2026-102554 - org.yaml:snakeyaml 1.24 -> 2.7, CVE-2022-1471 and 7 others. The runner-helper only calls Yaml#loadAs with a root class, which 2.x keeps. test/plugin/runner-helper: - org.freemarker:freemarker 2.3.28 -> 2.3.35, CVE-2026-84939 - junit:junit 4.12 -> 4.13.2 (test scope) test/plugin/archetypes/tomcat archetype: - org.apache.logging.log4j:log4j-core/log4j-api 2.8.1 -> 2.25.5, CVE-2021-44228, CVE-2021-45046 and others Unit-test junit.version overrides 4.12 -> 4.13.2 (CVE-2020-15250) in httpClient-4.x-plugin, httpclient-5.x-plugin, solon-2.x-plugin, websphere-liberty-23.x-plugin and apm-test-tools. E2E services (test/e2e/base): - ch.qos.logback:logback-classic/logback-core 1.2.3 -> 1.2.13 (provider), CVE-2023-6378 - com.google.guava:guava 30.1.1-jre -> 33.7.2-jre (provider, consumer) Provided-scope plugin and toolkit dependencies are compile-only compatibility targets and are left unchanged. h2 1.4.199 in the E2E provider is left as is: every fix is in H2 2.x, which reserves the USER keyword the provider's User entity maps to and needs a newer Hibernate than the E2E services' Spring Boot 2.2.5 parent provides.
kezhenxu94
approved these changes
Nov 2, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #846. Bumps the vulnerable test and tooling dependencies that OSV-Scanner still reports on
main. Nothing shipped in the agent changes.Dependencies
Plugin-test tooling,
test/plugin/pom.xml(inherited byrunner-helper,agent-test-tools,containers/*; the tooling is still built on JDK 8 in CI and all new versions have Java 8-compatible baseline classes (Guava and Log4j add a Java 9module-info.class; FreeMarker is a multi-release JAR)):The runner-helper only uses
new Yaml().loadAs(reader, CaseConfiguration.class), which snakeyaml 2.x keeps, so no code change is needed.test/plugin/runner-helper/pom.xml:test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/pom.xml:org.apache.logging.log4j:log4j-coreandlog4j-api2.8.1 -> 2.25.5 (the versiontest/plugin/pom.xmluses since #846), GHSA-jfh8-c2jp-5v3q (CVE-2021-44228), GHSA-7rjr-3q55-vv33 (CVE-2021-45046), GHSA-p6xc-xr62-6r2g (CVE-2021-45105), GHSA-8489-44mv-ggj8 (CVE-2021-44832), GHSA-fxph-q3j8-mv87 (CVE-2017-5645), GHSA-vwqq-5vrc-xw9h (CVE-2020-9488), GHSA-vc5p-v9hr-52mj (CVE-2025-68161), GHSA-3pxv-7cmr-fjr4 (CVE-2026-34480), GHSA-h383-gmxw-35v2 (CVE-2026-34479).Unit-test
junit.versionoverrides 4.12 -> 4.13.2 (GHSA-269g-pwp5-87pp, CVE-2020-15250), matching the root pom:apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin,httpclient-5.x-plugin,solon-2.x-plugin,websphere-liberty-23.x-plugin, andapm-sniffer/apm-test-tools.E2E services:
test/e2e/base/provider/pom.xml:ch.qos.logback:logback-classic1.2.3 -> 1.2.13, GHSA-vmq6-5m68-f53m (CVE-2023-6378). Thelogback.versionproperty also manageslogback-corethrough the Spring Boot parent, so both move to 1.2.13.test/e2e/base/pom.xml:com.google.guava:guava30.1.1-jre -> 33.7.2-jre for the provider and consumer, same advisories as above. OSV does not report this one because it cannot resolve the property without the remote Spring Boot parent; it is the same direct dependency as in the plugin tooling.Manifests touched:
test/plugin/pom.xml,test/plugin/runner-helper/pom.xml,test/plugin/archetypes/tomcat/src/main/resources/archetype-resources/pom.xml, the five module poms above,test/e2e/base/pom.xml,test/e2e/base/provider/pom.xml.Left out on purpose
test/plugin/scenarios/**: scenarios pin the framework versions they test.com.h2database:h21.4.199 in the E2E provider: every fix is in H2 2.x. H2 2.x reservesUSER, the table name of the provider'sUserentity, and needs Hibernate 5.6.5+, while the E2E services' Spring Boot 2.2.5 parent pins Hibernate 5.4.12. Not a trivial bump.log4j:log4j1.2.17 and the providedlog4j-core2.7 in the E2E provider: log4j 1.x has no fixed release, and both are the logging frameworks the toolkit E2E exercises.GitHub Actions
No changes. All
uses:were made current in #846 and still are:actions/*andgithub/codeql-actionare on their latest majors, and the docker actions andapache/skywalking-eyesare pinned to ASF-approved SHAs with no expiry.infra-e2e
Already on
apache/skywalking-infra-e2e@56ac8befeb5f910f2dc9339e65d07cd18953f90e. No change. E2E passed onmainat 09d7f0b.License
No change. Only test and tooling dependencies move, and the dist LICENSE in
dist-materialis not generated from these modules.Changelog
None: test and tooling dependencies only.
Verified locally
./mvnw -f test/plugin/pom.xml -pl runner-helper,containers,containers/jvm-container,containers/tomcat-container -Dmaven.test.skip compile dependency:liston JDK 8: build and checkstyle pass, resolves junit 4.13.2, guava 33.7.2-jre, snakeyaml 2.7, freemarker 2.3.35.plugin-runner-helper.jaron JDK 8 frommainand from this branch and ran both against theconfiguration.ymlof all 198 scenarios undertest/plugin/scenarios: every run succeeds and the generateddocker-compose.ymlandscenario.share identical../mvnw -f test/plugin/pom.xml -pl runner-helper verifyon JDK 8: same result as onmain. 4 tests, with the same 1 error inDockerContainerRunningGeneratorTest(MockitoUnnecessaryStubbingException), which already fails onmain. CI skips these tests../mvnw -pl <the five modules> -am teston JDK 17 (the CI version): all tests pass (httpclient-4.x 9, httpclient-5.x 63, websphere-liberty-23.x 6, apm-agent-core 97). Onmainthese modules cannot run their tests on JDK 8 either, because the root build uses--release 8and Mockito 5../mvnw -f test/e2e/base/pom.xml -Dsw.version=9.8.0 packageon JDK 8, then started the provider and consumer on 127.0.0.1 and called/health,/usersand/infothrough the consumer: all succeed with logback 1.2.13 and guava 33.7.2-jre.scan source --no-resolve) on this branch: every finding listed above is gone. The only findings left in these manifests are the E2E provider's h2, log4j 1.2.17 and provided log4j-core.Not verified locally: the plugin test containers and E2E runs (they need Docker), which CI covers.