Skip to content

Commit f0a638f

Browse files
authored
Set max JVM test version for log4j1 (#9437)
1 parent d31896a commit f0a638f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

dd-java-agent/instrumentation/log4j1/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
ext {
2+
// Log4j 1.x reached EOL in 2015 and is not compatible with Java 25+: https://endoflife.date/log4j
3+
maxJavaVersionForTests = JavaVersion.VERSION_24
4+
}
5+
16
muzzle {
27
pass {
38
group = 'log4j'

dd-java-agent/instrumentation/log4j1/src/test/groovy/MdcTest.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
import datadog.environment.JavaVirtualMachine
21
import datadog.trace.agent.test.AgentTestRunner
32
import org.apache.log4j.Category
43
import org.apache.log4j.MDC
54
import org.apache.log4j.Priority
65
import org.apache.log4j.spi.LoggingEvent
7-
import spock.lang.IgnoreIf
86

97
class MdcTest extends AgentTestRunner {
10-
@IgnoreIf(reason = "TODO: Fix for Java 25.", value = {
11-
JavaVirtualMachine.isJavaVersionAtLeast(25)
12-
})
138
def "should preserve mdc when logging injection is #injectionEnabled"() {
149
setup:
1510
injectSysConfig("logs.injection", injectionEnabled)

0 commit comments

Comments
 (0)