From 1114d86eacbd2a2d3149c4c4ba830627449e622b Mon Sep 17 00:00:00 2001 From: Mariusz Jozala Date: Tue, 5 Aug 2025 13:52:41 +0200 Subject: [PATCH 1/2] Update elastic-apm-agent dependency to use Java 8 variant This variant has updated log4j dependency. --- modules/apm/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/apm/build.gradle b/modules/apm/build.gradle index 37d42e4b3fb0c..83d988e966899 100644 --- a/modules/apm/build.gradle +++ b/modules/apm/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation "io.opentelemetry:opentelemetry-api:${otelVersion}" implementation "io.opentelemetry:opentelemetry-context:${otelVersion}" implementation "io.opentelemetry:opentelemetry-semconv:${otelSemconvVersion}" - runtimeOnly "co.elastic.apm:elastic-apm-agent:1.55.0" + runtimeOnly "co.elastic.apm:elastic-apm-agent-java8:1.55.0" javaRestTestImplementation project(':modules:apm') javaRestTestImplementation project(':test:framework') From 8092ce2b7c7ec550ad2c08511759f2b45ddc8406 Mon Sep 17 00:00:00 2001 From: Mariusz Jozala Date: Tue, 5 Aug 2025 14:17:00 +0200 Subject: [PATCH 2/2] updated verification-metadata and related file names --- gradle/verification-metadata.xml | 6 +++--- ...gent-LICENSE.txt => elastic-apm-agent-java8-LICENSE.txt} | 0 ...-agent-NOTICE.txt => elastic-apm-agent-java8-NOTICE.txt} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename modules/apm/licenses/{elastic-apm-agent-LICENSE.txt => elastic-apm-agent-java8-LICENSE.txt} (100%) rename modules/apm/licenses/{elastic-apm-agent-NOTICE.txt => elastic-apm-agent-java8-NOTICE.txt} (100%) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f8f81bd90eeeb..24ede89144e41 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -71,9 +71,9 @@ - - - + + + diff --git a/modules/apm/licenses/elastic-apm-agent-LICENSE.txt b/modules/apm/licenses/elastic-apm-agent-java8-LICENSE.txt similarity index 100% rename from modules/apm/licenses/elastic-apm-agent-LICENSE.txt rename to modules/apm/licenses/elastic-apm-agent-java8-LICENSE.txt diff --git a/modules/apm/licenses/elastic-apm-agent-NOTICE.txt b/modules/apm/licenses/elastic-apm-agent-java8-NOTICE.txt similarity index 100% rename from modules/apm/licenses/elastic-apm-agent-NOTICE.txt rename to modules/apm/licenses/elastic-apm-agent-java8-NOTICE.txt