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

Move app servers to runtime dependencies. (#3178) 

* Move app servers to runtime dependencies.

* Add CDI API
This commit is contained in:
Anuraag Agrawal 2021-06-04 10:01:43 +09:00 committed by GitHub
parent b8aec6a671
commit c8dc9d52a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/jaxrs-2.0-payara-testing.gradle
View File

@ -13,8 +13,8 @@ repositories {
dependencies { dependencies {
testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing') testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing')
testImplementation "fish.payara.arquillian:arquillian-payara-server-embedded:2.4.1" testRuntimeOnly "fish.payara.arquillian:arquillian-payara-server-embedded:2.4.1"
testImplementation 'fish.payara.extras:payara-embedded-web:5.2021.2' testRuntimeOnly 'fish.payara.extras:payara-embedded-web:5.2021.2'
testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent')
testInstrumentation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') testInstrumentation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent')

7
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/jaxrs-2.0-tomee-testing.gradle
View File

@ -13,9 +13,10 @@ repositories {
dependencies { dependencies {
testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing') testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing')
testImplementation "org.apache.tomee:arquillian-tomee-embedded:8.0.6" testCompileOnly "jakarta.enterprise:jakarta.enterprise.cdi-api:2.0.2"
testImplementation "org.apache.tomee:tomee-embedded:8.0.6" testRuntimeOnly "org.apache.tomee:arquillian-tomee-embedded:8.0.6"
testImplementation "org.apache.tomee:tomee-jaxrs:8.0.6" testRuntimeOnly "org.apache.tomee:tomee-embedded:8.0.6"
testRuntimeOnly "org.apache.tomee:tomee-jaxrs:8.0.6"
testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent')
testInstrumentation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') testInstrumentation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent')

2
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/jaxrs-2.0-wildfly-testing.gradle
View File

@ -19,7 +19,7 @@ dependencies {
testImplementation "javax:javaee-api:7.0" testImplementation "javax:javaee-api:7.0"
testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing') testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing')
testImplementation "org.wildfly.arquillian:wildfly-arquillian-container-embedded:2.2.0.Final" testRuntimeOnly "org.wildfly.arquillian:wildfly-arquillian-container-embedded:2.2.0.Final"
testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent')
testInstrumentation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') testInstrumentation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent')

12
instrumentation/servlet/glassfish-testing/glassfish-testing.gradle
View File

@ -10,10 +10,14 @@ dependencies {
testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent')
testInstrumentation project(':instrumentation:grizzly-2.0:javaagent') testInstrumentation project(':instrumentation:grizzly-2.0:javaagent')
// NB: testLibrary fails for some reason. testCompileOnly "org.glassfish.main.common:scattered-archive-api:4.0"
testImplementation "org.glassfish.main.extras:glassfish-embedded-all:4.0" testCompileOnly "org.glassfish.main.common:simple-glassfish-api:4.0"
testCompileOnly "javax.servlet:javax.servlet-api:3.0.1"
latestDepTestLibrary "org.glassfish.main.extras:glassfish-embedded-all:5.1.0" if (!testLatestDeps) {
testRuntimeOnly "org.glassfish.main.extras:glassfish-embedded-all:4.0"
} else {
testRuntimeOnly "org.glassfish.main.extras:glassfish-embedded-all:5.1.0"
}
} }
tasks.withType(Test).configureEach { tasks.withType(Test).configureEach {