From 74344a22965c9369586a5255cfc51e98e77e3620 Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 23 Oct 2023 15:49:10 +0200 Subject: [PATCH] Optimize dependencies for jaxws-metro testing --- .../jaxws/jaxws-2.0-common-testing/build.gradle.kts | 4 ---- .../jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts | 4 ++-- .../jaxws/jaxws-3.0-common-testing/build.gradle.kts | 4 ---- .../jaxws/jaxws-3.0-metro-2.2-testing/build.gradle.kts | 4 ++-- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts index b3d89f72b792..607effb0c6c1 100644 --- a/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts @@ -14,10 +14,6 @@ dependencies { api("javax.xml.ws:jaxws-api:2.0") api("javax.jws:javax.jws-api:1.1") - api("ch.qos.logback:logback-classic") - api("org.slf4j:log4j-over-slf4j") - api("org.slf4j:jcl-over-slf4j") - api("org.slf4j:jul-to-slf4j") api("org.eclipse.jetty:jetty-webapp:9.4.35.v20201120") api("org.springframework.ws:spring-ws-core:3.0.0.RELEASE") diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts index 9dd6990cf05e..b36fc90fa2bc 100644 --- a/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-metro-2.2-testing/build.gradle.kts @@ -3,9 +3,9 @@ plugins { } dependencies { - testImplementation("javax.servlet:javax.servlet-api:3.0.1") - testImplementation("com.sun.xml.ws:jaxws-rt:2.3.6") + testLibrary("com.sun.xml.ws:jaxws-rt:2.2.0.1") + testImplementation("javax.servlet:javax.servlet-api:3.0.1") testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing")) testInstrumentation(project(":instrumentation:jaxws:jaxws-metro-2.2:javaagent")) diff --git a/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts index ecd8f75a5c37..0827852d5c94 100644 --- a/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts @@ -14,10 +14,6 @@ dependencies { api("jakarta.xml.ws:jakarta.xml.ws-api:3.0.0") api("jakarta.jws:jakarta.jws-api:3.0.0") - api("ch.qos.logback:logback-classic") - api("org.slf4j:log4j-over-slf4j") - api("org.slf4j:jcl-over-slf4j") - api("org.slf4j:jul-to-slf4j") api("org.eclipse.jetty:jetty-webapp:11.0.17") api("org.springframework.ws:spring-ws-core:4.0.0") diff --git a/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/build.gradle.kts index e0e7bd07cb60..02678cdb140b 100644 --- a/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-3.0-metro-2.2-testing/build.gradle.kts @@ -3,9 +3,9 @@ plugins { } dependencies { - testImplementation("jakarta.servlet:jakarta.servlet-api:5.0.0") - testImplementation("com.sun.xml.ws:jaxws-rt:3.0.0") + testLibrary("com.sun.xml.ws:jaxws-rt:3.0.0") + testImplementation("jakarta.servlet:jakarta.servlet-api:5.0.0") testImplementation(project(":instrumentation:jaxws:jaxws-3.0-common-testing")) testInstrumentation(project(":instrumentation:jaxws:jaxws-metro-2.2:javaagent"))