Refactor jaxws / jaxrs instrumentations (#9972)

* Refactor jaxws / jaxrs instrumentations

* reorder

Author: amarziali

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

@@ -68,9 +68,8 @@ dependencies {
   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')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jakarta-rs-annotations-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jakarta-rs-annotations-3')
 
   cxf3LatestDepTestImplementation group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxrs', version: '3.+'
   cxf3LatestDepTestImplementation group: 'org.apache.cxf', name:'cxf-rt-transports-http-jetty', version: '3.+'

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

@@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle"
 //addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
-  testImplementation project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
+  testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2')
   testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
 
   // Don't want to conflict with jetty from the test server.

dd-java-agent/instrumentation/grizzly/grizzly-http-2.3.20/build.gradle

@@ -26,7 +26,7 @@ dependencies {
   testImplementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.18'
   testImplementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '2.18'
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jersey:jersey-appsec:jersey-appsec-2.0')
 
   latestDepTestImplementation group: 'org.glassfish.grizzly', name: 'grizzly-http-server', version: '2.3.20+'
   latestDepTestImplementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: '2.+'

dd-java-agent/instrumentation/jersey/build.gradle renamed to dd-java-agent/instrumentation/jersey/jersey-2.0/build.gradle

@@ -53,8 +53,8 @@ dependencies {
   jersey2JettyTestRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
   jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
   jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0.4')
-  jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec')
-  jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
+  jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey:jersey-appsec:jersey-appsec-2.0')
+  jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2')
 
   jersey3JettyTestImplementation project(':dd-java-agent:instrumentation-testing'), {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
@@ -70,9 +70,9 @@ dependencies {
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-10.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')
+  jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey:jersey-appsec:jersey-appsec-2.0')
+  jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey:jersey-appsec:jersey-appsec-3.0')
+  jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:rs:jakarta-rs-annotations-3')
 }
 
 configurations.named('jersey3JettyTestRuntimeClasspath') {