From c8dc9d52a67897065457b1e34883945b549f3a49 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Fri, 4 Jun 2021 10:01:43 +0900 Subject: [PATCH] Move app servers to runtime dependencies. (#3178) * Move app servers to runtime dependencies. * Add CDI API --- .../jaxrs-2.0-payara-testing.gradle | 4 ++-- .../jaxrs-2.0-tomee-testing.gradle | 7 ++++--- .../jaxrs-2.0-wildfly-testing.gradle | 2 +- .../glassfish-testing/glassfish-testing.gradle | 12 ++++++++---- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/jaxrs-2.0-payara-testing.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/jaxrs-2.0-payara-testing.gradle index 7ed606e19e..ea8cc4171b 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/jaxrs-2.0-payara-testing.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-payara-testing/jaxrs-2.0-payara-testing.gradle @@ -13,8 +13,8 @@ repositories { dependencies { testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing') - testImplementation "fish.payara.arquillian:arquillian-payara-server-embedded:2.4.1" - testImplementation 'fish.payara.extras:payara-embedded-web:5.2021.2' + testRuntimeOnly "fish.payara.arquillian:arquillian-payara-server-embedded:2.4.1" + testRuntimeOnly 'fish.payara.extras:payara-embedded-web:5.2021.2' testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/jaxrs-2.0-tomee-testing.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/jaxrs-2.0-tomee-testing.gradle index d62ea29b2b..3d3b0cad29 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/jaxrs-2.0-tomee-testing.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-tomee-testing/jaxrs-2.0-tomee-testing.gradle @@ -13,9 +13,10 @@ repositories { dependencies { testImplementation project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-arquillian-testing') - testImplementation "org.apache.tomee:arquillian-tomee-embedded:8.0.6" - testImplementation "org.apache.tomee:tomee-embedded:8.0.6" - testImplementation "org.apache.tomee:tomee-jaxrs:8.0.6" + testCompileOnly "jakarta.enterprise:jakarta.enterprise.cdi-api:2.0.2" + testRuntimeOnly "org.apache.tomee:arquillian-tomee-embedded: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:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/jaxrs-2.0-wildfly-testing.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/jaxrs-2.0-wildfly-testing.gradle index 8131b248ff..f5b18fe6c8 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/jaxrs-2.0-wildfly-testing.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/jaxrs-2.0-wildfly-testing.gradle @@ -19,7 +19,7 @@ dependencies { testImplementation "javax:javaee-api:7.0" 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:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent') diff --git a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle index be7e314d88..6674defdf1 100644 --- a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle +++ b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle @@ -10,10 +10,14 @@ dependencies { testInstrumentation project(':instrumentation:servlet:servlet-javax-common:javaagent') testInstrumentation project(':instrumentation:grizzly-2.0:javaagent') - // NB: testLibrary fails for some reason. - testImplementation "org.glassfish.main.extras:glassfish-embedded-all:4.0" - - latestDepTestLibrary "org.glassfish.main.extras:glassfish-embedded-all:5.1.0" + testCompileOnly "org.glassfish.main.common:scattered-archive-api:4.0" + testCompileOnly "org.glassfish.main.common:simple-glassfish-api:4.0" + testCompileOnly "javax.servlet:javax.servlet-api:3.0.1" + 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 {