tomcat test project

Author: zeitlinger

instrumentation/servlet/servlet-3.0/javaagent/build.gradle.kts

@@ -21,27 +21,4 @@ dependencies {
   bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
   compileOnly("javax.servlet:javax.servlet-api:3.0.1")
-
-  testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
-  testImplementation(project(":instrumentation:servlet:servlet-common:bootstrap"))
-
-  testLibrary("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
-  testLibrary("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")
-  testLibrary("org.apache.tomcat.embed:tomcat-embed-core:8.0.41")
-  testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:8.0.41")
-
-  latestDepTestLibrary("org.eclipse.jetty:jetty-server:10.+") // see servlet-5.0 module
-  latestDepTestLibrary("org.eclipse.jetty:jetty-servlet:10.+") // see servlet-5.0 module
-
-  latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:9.+") // see servlet-5.0 module
-  latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:9.+") // see servlet-5.0 module
-}
-
-tasks {
-  withType<Test>().configureEach {
-    jvmArgs("-Dotel.instrumentation.servlet.experimental.capture-request-parameters=test-parameter")
-    // required on jdk17
-    jvmArgs("--add-opens=java.base/java.util=ALL-UNNAMED")
-    jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
-  }
 }

instrumentation/servlet/servlet-5.0/javaagent/build.gradle.kts

@@ -16,24 +16,4 @@ dependencies {
   bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
   compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
-
-  testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
-
-  testImplementation(project(":instrumentation:servlet:servlet-5.0:testing"))
-
-  testLibrary("org.eclipse.jetty:jetty-server:11.0.0")
-  testLibrary("org.eclipse.jetty:jetty-servlet:11.0.0")
-  testLibrary("org.apache.tomcat.embed:tomcat-embed-core:10.0.0")
-  testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:10.0.0")
-
-  // Tomcat 10.1 requires Java 11
-  latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:10.0.+")
-  latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:10.0.+")
-  latestDepTestLibrary("org.eclipse.jetty:jetty-server:11.+")
-}
-
-tasks {
-  withType<Test>().configureEach {
-    jvmArgs("-Dotel.instrumentation.servlet.experimental.capture-request-parameters=test-parameter")
-  }
 }

instrumentation/servlet/servlet-5.0/testing/build.gradle.kts

@@ -1,28 +1,10 @@
 plugins {
-  id("otel.javaagent-testing")
+  id("otel.java-conventions")
 }
 
 dependencies {
   api(project(":testing-common"))
-  api(project(":instrumentation:servlet:servlet-common:javaagent"))
   api(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
   compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
-
-  testInstrumentation(project(":instrumentation:jetty:jetty-11.0:javaagent"))
-
-  testImplementation(project(":instrumentation:servlet:servlet-5.0:testing"))
-
-  testLibrary("org.apache.tomcat.embed:tomcat-embed-core:10.0.0")
-  testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:10.0.0")
-
-  // Tomcat 10.1 requires Java 11
-  latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:10.0.+")
-  latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:10.0.+")
-}
-
-tasks {
-  withType<Test>().configureEach {
-    jvmArgs("-Dotel.instrumentation.servlet.experimental.capture-request-parameters=test-parameter")
-  }
 }