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

Fix resteasy-3.0 latest test dep versions (#4800)

This commit is contained in:
Trask Stalnaker 2021-12-05 22:26:52 -08:00 committed by GitHub
parent 7c387853a0
commit 030d2e06d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsHttpServerTest.groovy
View File

@ -221,7 +221,7 @@ abstract class JaxRsHttpServerTest<S> extends HttpServerTest<S> implements Agent
false
}
private static boolean shouldTestCompletableStageAsync() {
boolean shouldTestCompletableStageAsync() {
Boolean.getBoolean("testLatestDeps")
}

6
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts
View File

@ -43,9 +43,9 @@ dependencies {
testLibrary("io.undertow:undertow-servlet:1.4.28.Final")
testLibrary("org.jboss.resteasy:resteasy-servlet-initializer:3.0.4.Final")
latestDepTestLibrary("org.jboss.resteasy:resteasy-servlet-initializer:5.+")
latestDepTestLibrary("org.jboss.resteasy:resteasy-jaxrs:3.+")
latestDepTestLibrary("org.jboss.resteasy:resteasy-undertow:3.+") {
latestDepTestLibrary("org.jboss.resteasy:resteasy-servlet-initializer:3.0.+")
latestDepTestLibrary("org.jboss.resteasy:resteasy-jaxrs:3.0.+")
latestDepTestLibrary("org.jboss.resteasy:resteasy-undertow:3.0.+") {
exclude("org.jboss.resteasy", "resteasy-client")
}
}

5
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy
View File

@ -27,4 +27,9 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
void stopServer(UndertowJaxrsServer server) {
server.stop()
}
// resteasy 3.0.x does not support JAX-RS 2.1
boolean shouldTestCompletableStageAsync() {
false
}
}

4
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/test/groovy/ResteasyJettyHttpServerTest.groovy
View File

@ -5,4 +5,8 @@
class ResteasyJettyHttpServerTest extends JaxRsJettyHttpServerTest {
// resteasy 3.0.x does not support JAX-RS 2.1
boolean shouldTestCompletableStageAsync() {
false
}
}