Skip to content

Commit 84d0670

Browse files
authored
Use lower jetty version for ssl socket tests (#7787)
1 parent 9a9da2a commit 84d0670

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ muzzle {
55
}
66

77
apply from: "$rootDir/gradle/java.gradle"
8+
9+
// IBM8 is having troubles with TLS set up by jetty 9.4.
10+
// As a temporary workaround we used a lower jetty version for ssl socket tests
11+
configurations.all {
12+
resolutionStrategy {
13+
force group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428'
14+
}
15+
}

dd-java-agent/instrumentation/sslsocket/gradle.lockfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
107107
org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
108108
org.codenarc:CodeNarc:2.2.0=codenarc
109109
org.dom4j:dom4j:2.1.3=spotbugs
110-
org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
111-
org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
112-
org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
113-
org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
110+
org.eclipse.jetty:jetty-http:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
111+
org.eclipse.jetty:jetty-io:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
112+
org.eclipse.jetty:jetty-server:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
113+
org.eclipse.jetty:jetty-util:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
114114
org.gmetrics:GMetrics:1.1=codenarc
115115
org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
116116
org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)