From 66a3d099610bd9096c2c6af98bfea3c7017f86d0 Mon Sep 17 00:00:00 2001 From: Richard Startin Date: Fri, 23 Jun 2023 10:25:35 +0100 Subject: [PATCH 1/2] upgrade ddprof to 0.52.0 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 6e56e46e2c9..638bd0d14cd 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -33,7 +33,7 @@ final class CachedData { testcontainers: '1.17.3', jmc : "8.1.0-SNAPSHOT", autoservice : "1.0-rc7", - ddprof : "0.49.0", + ddprof : "0.52.0", asm : "9.5" ] From 9fc973cc14137d6970c8c4cd7d6ab4bc5a68385f Mon Sep 17 00:00:00 2001 From: Stuart McCulloch Date: Wed, 21 Jun 2023 13:49:12 +0100 Subject: [PATCH 2/2] Exclude log4j 3.0.0-alpha1 from log-injection smoke tests (#5440) --- dd-smoke-tests/log-injection/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dd-smoke-tests/log-injection/build.gradle b/dd-smoke-tests/log-injection/build.gradle index 2cd4b5f2092..0d4c75500ef 100644 --- a/dd-smoke-tests/log-injection/build.gradle +++ b/dd-smoke-tests/log-injection/build.gradle @@ -88,12 +88,12 @@ dependencies { slf4jLog4j2Bridge 'org.apache.logging.log4j:log4j-slf4j-impl:2.7' log4j2Slf4jBridge 'org.apache.logging.log4j:log4j-to-slf4j:2.7' - log4j2Latest 'org.apache.logging.log4j:log4j-core:+' - julLog4j2BridgeLatest 'org.apache.logging.log4j:log4j-jul:+' - jclLog4j2BridgeLatest 'org.apache.logging.log4j:log4j-jcl:+' - log4j1Log4j2BridgeLatest 'org.apache.logging.log4j:log4j-1.2-api:+' - slf4jLog4j2BridgeLatest 'org.apache.logging.log4j:log4j-slf4j-impl:+' - log4j2Slf4jBridgeLatest 'org.apache.logging.log4j:log4j-to-slf4j:+' + log4j2Latest 'org.apache.logging.log4j:log4j-core:2.+' + julLog4j2BridgeLatest 'org.apache.logging.log4j:log4j-jul:2.+' + jclLog4j2BridgeLatest 'org.apache.logging.log4j:log4j-jcl:2.+' + log4j1Log4j2BridgeLatest 'org.apache.logging.log4j:log4j-1.2-api:2.+' + slf4jLog4j2BridgeLatest 'org.apache.logging.log4j:log4j-slf4j-impl:2.+' + log4j2Slf4jBridgeLatest 'org.apache.logging.log4j:log4j-to-slf4j:2.+' slf4jInterface deps.slf4j