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

Make sure finatra is included on normal test classpath even when runn… (#1163) 

* Make sure finatra is included on normal test classpath even when running latest dep tests.

* Move comment
This commit is contained in:
Anuraag Agrawal 2020-09-03 16:00:19 +09:00 committed by GitHub
parent 2b83c310da
commit 6f783bc576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
instrumentation/finatra-2.9/finatra-2.9.gradle
View File

@ -9,6 +9,7 @@ apply from: "$rootDir/gradle/test-with-scala.gradle"
apply plugin: 'org.unbroken-dome.test-sets'
testSets {
// We need separate test sources to compile against latest Finatra.
latestDepTest
}
@ -33,16 +34,11 @@ dependencies {
compileOnly group: 'com.twitter', name: 'finatra-http_2.11', version: '2.9.0'
testImplementation project(':instrumentation:netty:netty-4.1')
// TODO(anuraaga): Something about finatra test compilation doesn't work well when this is
// present with testLatestDeps.
if (!testLatestDeps) {
testLibrary group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
}
testLibrary(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10'
// Required for older versions of finatra on JDKs >= 11
testImplementation group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'
// TODO latestDepTestLibrary doesn't work here
latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
}