Group jetty modules

Author: amarziali

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle

@@ -38,7 +38,7 @@ dependencies {
   // to instrument the integration test
   iastIntegrationTestImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
   iastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
-  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-9'))
+  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-lang'))

dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle

@@ -72,18 +72,18 @@ dependencies {
     exclude group: 'org.slf4j', module: 'slf4j-api'
   }
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty-9'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty-11'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0'))
 
   testImplementation(project(':dd-java-agent:instrumentation-testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
   // always mix everything up
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
-  testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty-util'))
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-appsec-9.3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
+  testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31'))
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
   testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
   testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
 

dd-java-agent/instrumentation/cxf-2.1/build.gradle

@@ -61,11 +61,11 @@ dependencies {
   testCompileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.1'
   testRuntimeOnly group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
   testRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-7.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-7.6')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty-12')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:trace-annotation')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3')

dd-java-agent/instrumentation/jersey/build.gradle

@@ -54,7 +54,7 @@ dependencies {
   jersey2JettyTestImplementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: jersey2Version
   jersey2JettyTestRuntimeOnly group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0'
   jersey2JettyTestRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
-  jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
+  jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
   jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec')
   jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
 
@@ -69,8 +69,8 @@ dependencies {
   jersey3JettyTestRuntimeOnly group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: jersey3Version
   jersey3JettyTestRuntimeOnly group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0'
   jersey3JettyTestRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
-  jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-9')
-  jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty-11')
+  jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
+  jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec')
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-3-appsec')
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3')