open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #915 from DataDog/mar-kolya/avoid-jetty-10 

Avoid Jetty 10
This commit is contained in:
Nikolay Martynov 2019-07-15 10:43:29 -04:00 committed by GitHub
parent 5b3d4b8e35 1fbe395586
commit 3884cc088e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-java-agent/instrumentation/jetty-8/jetty-8.gradle
View File

@ -34,7 +34,9 @@ dependencies {
testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
testCompile group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '8.0.0.v20110901'
latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '+'
latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '+'
latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-continuation', 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.eclipse.jetty', name: 'jetty-continuation', version: '9.+'
}

6
dd-java-agent/instrumentation/servlet-3/servlet-3.gradle
View File

@ -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: '+'
}