From 1fbe3955865ff895691f9bc501595ec87cbb16c6 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Mon, 15 Jul 2019 10:14:50 -0400 Subject: [PATCH] Avoid Jetty 10 in servlet-3 test Alpha version of Jetty 10 was released and it seems to be compiled for java versions above 8 so tests fail on java8. Limit latest dep Jetty tests to Jetty 9 for now. --- dd-java-agent/instrumentation/servlet-3/servlet-3.gradle | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle b/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle index 3ce592b6c8..7ed27b3c41 100644 --- a/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle +++ b/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle @@ -41,8 +41,10 @@ dependencies { testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.0.41' testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.0.41' - latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '+' - latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '+' + // Jetty 10 seems to refuse to run on java8. + // TODO: we need to setup separate test for Jetty 10 when that is released. + latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+' + latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+' latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '+' latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '+' }