Use lower jetty version for ssl socket tests (#7787)

DataDog · Oct 17, 2024 · 84d0670 · 84d0670
1 parent 9a9da2a
commit 84d0670
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/dd-java-agent/instrumentation/sslsocket/build.gradle b/dd-java-agent/instrumentation/sslsocket/build.gradle
@@ -5,3 +5,11 @@ muzzle {
 }
 
 apply from: "$rootDir/gradle/java.gradle"
+
+// IBM8 is having troubles with TLS set up by jetty 9.4.
+// As a temporary workaround we used a lower jetty version for ssl socket tests
+configurations.all {
+  resolutionStrategy {
+    force group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428'
+  }
+}
diff --git a/dd-java-agent/instrumentation/sslsocket/gradle.lockfile b/dd-java-agent/instrumentation/sslsocket/gradle.lockfile
@@ -107,10 +107,10 @@ org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
 org.codenarc:CodeNarc:2.2.0=codenarc
 org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:9.2.30.v20200428=testCompileClasspath,testRuntimeClasspath
 org.gmetrics:GMetrics:1.1=codenarc
 org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath