Move common testing modules to match convention a bit better(?) (open…

…-telemetry#4451) * Rename jsf modules to match convention * Couchbase too * Mongo too * Play WS too * Log4j too * Elasticsearch too * JAX-RS too * JAX-WS sort of * Spotless * empty commit
RashmiRam · May 23, 2022 · 7172fae · 7172fae
1 parent 06e1870
commit 7172fae
Show file tree

Hide file tree

Showing 92 changed files with 39 additions and 39 deletions.
diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 
   library("com.couchbase.client:java-client:2.0.0")
 
-  testImplementation(project(":instrumentation:couchbase:couchbase-testing"))
+  testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
 
   latestDepTestLibrary("org.springframework.data:spring-data-couchbase:3.+")
   latestDepTestLibrary("com.couchbase.client:java-client:2.+")

diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
   library("com.couchbase.client:java-client:2.6.0")
 
   testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
-  testImplementation(project(":instrumentation:couchbase:couchbase-testing"))
+  testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
 
   testLibrary("org.springframework.data:spring-data-couchbase:3.1.0.RELEASE")
   testLibrary("com.couchbase.client:encryption:1.0.0")

diff --git a/...chbase/couchbase-testing/build.gradle.kts → ...couchbase-common/testing/build.gradle.kts b/...chbase/couchbase-testing/build.gradle.kts → ...couchbase-common/testing/build.gradle.kts
diff --git a/...y/AbstractCouchbaseAsyncClientTest.groovy → ...y/AbstractCouchbaseAsyncClientTest.groovy b/...y/AbstractCouchbaseAsyncClientTest.groovy → ...y/AbstractCouchbaseAsyncClientTest.groovy
@@ -47,7 +47,7 @@ abstract class AbstractCouchbaseAsyncClientTest extends AbstractCouchbaseTest {
 
     environment = envBuilder(bucketSettings).build()
     cluster = CouchbaseAsyncCluster.create(environment, Arrays.asList("127.0.0.1"))
-    manager = cluster.clusterManager(USERNAME, PASSWORD).toBlocking().single()
+    manager = cluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD).toBlocking().single()
     type = bucketSettings.type().name()
   }
 

diff --git a/...groovy/AbstractCouchbaseClientTest.groovy → ...groovy/AbstractCouchbaseClientTest.groovy b/...groovy/AbstractCouchbaseClientTest.groovy → ...groovy/AbstractCouchbaseClientTest.groovy
@@ -37,7 +37,7 @@ abstract class AbstractCouchbaseClientTest extends AbstractCouchbaseTest {
 
     environment = envBuilder(bucketSettings).build()
     cluster = CouchbaseCluster.create(environment, Arrays.asList("127.0.0.1"))
-    manager = cluster.clusterManager(USERNAME, PASSWORD)
+    manager = cluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD)
     type = bucketSettings.type().name()
   }
 

diff --git a/...tractCouchbaseSpringRepositoryTest.groovy → ...tractCouchbaseSpringRepositoryTest.groovy b/...tractCouchbaseSpringRepositoryTest.groovy → ...tractCouchbaseSpringRepositoryTest.groovy
diff --git a/...bstractCouchbaseSpringTemplateTest.groovy → ...bstractCouchbaseSpringTemplateTest.groovy b/...bstractCouchbaseSpringTemplateTest.groovy → ...bstractCouchbaseSpringTemplateTest.groovy
@@ -42,8 +42,8 @@ class AbstractCouchbaseSpringTemplateTest extends AbstractCouchbaseTest {
 
     couchbaseCluster = CouchbaseCluster.create(couchbaseEnvironment, Arrays.asList("127.0.0.1"))
     memcacheCluster = CouchbaseCluster.create(memcacheEnvironment, Arrays.asList("127.0.0.1"))
-    ClusterManager couchbaseManager = couchbaseCluster.clusterManager(USERNAME, PASSWORD)
-    ClusterManager memcacheManager = memcacheCluster.clusterManager(USERNAME, PASSWORD)
+    ClusterManager couchbaseManager = couchbaseCluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD)
+    ClusterManager memcacheManager = memcacheCluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD)
 
     Bucket bucketCouchbase = couchbaseCluster.openBucket(bucketCouchbase.name(), bucketCouchbase.password())
     Bucket bucketMemcache = memcacheCluster.openBucket(bucketMemcache.name(), bucketMemcache.password())

diff --git a/.../groovy/springdata/CouchbaseConfig.groovy → .../groovy/springdata/CouchbaseConfig.groovy b/.../groovy/springdata/CouchbaseConfig.groovy → .../groovy/springdata/CouchbaseConfig.groovy
diff --git a/...ing/src/main/groovy/springdata/Doc.groovy → ...ing/src/main/groovy/springdata/Doc.groovy b/...ing/src/main/groovy/springdata/Doc.groovy → ...ing/src/main/groovy/springdata/Doc.groovy
diff --git a/...in/groovy/springdata/DocRepository.groovy → ...in/groovy/springdata/DocRepository.groovy b/...in/groovy/springdata/DocRepository.groovy → ...in/groovy/springdata/DocRepository.groovy
diff --git a/.../groovy/util/AbstractCouchbaseTest.groovy → .../groovy/util/AbstractCouchbaseTest.groovy b/.../groovy/util/AbstractCouchbaseTest.groovy → .../groovy/util/AbstractCouchbaseTest.groovy
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
-  testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing"))
+  testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
   testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
   testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
 

diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
   testInstrumentation(project(":instrumentation:spring:spring-data-1.8:javaagent"))
 
-  testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing"))
+  testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
   testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
   testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
 

diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 
   testLibrary("org.elasticsearch.plugin:transport-netty4-client:6.0.0")
 
-  testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing"))
+  testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
   testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
   testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
 }

diff --git a/...search-transport-testing/build.gradle.kts → ...transport-common/testing/build.gradle.kts b/...search-transport-testing/build.gradle.kts → ...transport-common/testing/build.gradle.kts
diff --git a/...vy/AbstractElasticsearchClientTest.groovy → ...vy/AbstractElasticsearchClientTest.groovy b/...vy/AbstractElasticsearchClientTest.groovy → ...vy/AbstractElasticsearchClientTest.groovy
diff --git a/...bstractElasticsearchNodeClientTest.groovy → ...bstractElasticsearchNodeClientTest.groovy b/...bstractElasticsearchNodeClientTest.groovy → ...bstractElasticsearchNodeClientTest.groovy
diff --git a/...ctElasticsearchTransportClientTest.groovy → ...ctElasticsearchTransportClientTest.groovy b/...ctElasticsearchTransportClientTest.groovy → ...ctElasticsearchTransportClientTest.groovy
diff --git a/...rs-2.0/jaxrs-2.0-testing/build.gradle.kts → ...jaxrs-2.0-common/testing/build.gradle.kts b/...rs-2.0/jaxrs-2.0-testing/build.gradle.kts → ...jaxrs-2.0-common/testing/build.gradle.kts
diff --git a/...ng/src/main/groovy/JaxRsFilterTest.groovy → ...ng/src/main/groovy/JaxRsFilterTest.groovy b/...ng/src/main/groovy/JaxRsFilterTest.groovy → ...ng/src/main/groovy/JaxRsFilterTest.groovy
diff --git a/...rc/main/groovy/JaxRsHttpServerTest.groovy → ...rc/main/groovy/JaxRsHttpServerTest.groovy b/...rc/main/groovy/JaxRsHttpServerTest.groovy → ...rc/main/groovy/JaxRsHttpServerTest.groovy
diff --git a/...in/groovy/JaxRsJettyHttpServerTest.groovy → ...in/groovy/JaxRsJettyHttpServerTest.groovy b/...in/groovy/JaxRsJettyHttpServerTest.groovy → ...in/groovy/JaxRsJettyHttpServerTest.groovy
@@ -8,7 +8,7 @@ import org.eclipse.jetty.webapp.WebAppContext
 
 import static org.eclipse.jetty.util.resource.Resource.newResource
 
-class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest<Server> {
+abstract class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest<Server> {
 
   @Override
   Server startServer(int port) {

diff --git a/...axrsAnnotationsInstrumentationTest.groovy → ...axrsAnnotationsInstrumentationTest.groovy b/...axrsAnnotationsInstrumentationTest.groovy → ...axrsAnnotationsInstrumentationTest.groovy
diff --git a/...main/groovy/test/JaxRsTestResource.groovy → ...main/groovy/test/JaxRsTestResource.groovy b/...main/groovy/test/JaxRsTestResource.groovy → ...main/groovy/test/JaxRsTestResource.groovy
diff --git a/...testing/src/main/java/JavaInterfaces.java → ...testing/src/main/java/JavaInterfaces.java b/...testing/src/main/java/JavaInterfaces.java → ...testing/src/main/java/JavaInterfaces.java
diff --git a/...s-2.0-testing/src/main/java/Resource.java → ...ommon/testing/src/main/java/Resource.java b/...s-2.0-testing/src/main/java/Resource.java → ...ommon/testing/src/main/java/Resource.java
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
 
-  testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
+  testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
   testImplementation("javax.xml.bind:jaxb-api:2.2.3")
   testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
 

diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 
-  testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
+  testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
 
   // First version with DropwizardTestSupport:
   testLibrary("io.dropwizard:dropwizard-testing:0.8.0")

diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 
-  testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
+  testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
   testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
 
   testLibrary("org.jboss.resteasy:resteasy-undertow:3.0.4.Final") {

diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 
-  testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
+  testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
   testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
 
   testLibrary("org.jboss.resteasy:resteasy-undertow:3.1.0.Final") {

diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
   testLibrary("org.apache.axis2:axis2-transport-http:$axis2Version")
   testLibrary("org.apache.axis2:axis2-transport-local:$axis2Version")
 
-  testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
+  testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
 
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))

diff --git a/.../jaxws/jaxws-2.0-testing/build.gradle.kts → ...jaxws-2.0-common-testing/build.gradle.kts b/.../jaxws/jaxws-2.0-testing/build.gradle.kts → ...jaxws-2.0-common-testing/build.gradle.kts
diff --git a/.../src/main/groovy/AbstractJaxWsTest.groovy → .../src/main/groovy/AbstractJaxWsTest.groovy b/.../src/main/groovy/AbstractJaxWsTest.groovy → .../src/main/groovy/AbstractJaxWsTest.groovy
diff --git a/...main/groovy/hello/BaseHelloService.groovy → ...main/groovy/hello/BaseHelloService.groovy b/...main/groovy/hello/BaseHelloService.groovy → ...main/groovy/hello/BaseHelloService.groovy
diff --git a/...src/main/groovy/hello/HelloService.groovy → ...src/main/groovy/hello/HelloService.groovy b/...src/main/groovy/hello/HelloService.groovy → ...src/main/groovy/hello/HelloService.groovy
diff --git a/...main/groovy/hello/HelloServiceImpl.groovy → ...main/groovy/hello/HelloServiceImpl.groovy b/...main/groovy/hello/HelloServiceImpl.groovy → ...main/groovy/hello/HelloServiceImpl.groovy
diff --git a/...xws-2.0-testing/src/main/schema/hello.xsd → ...-common-testing/src/main/schema/hello.xsd b/...xws-2.0-testing/src/main/schema/hello.xsd → ...-common-testing/src/main/schema/hello.xsd
diff --git a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
   library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
   testLibrary("org.apache.cxf:cxf-rt-transports-http:3.0.0")
 
-  testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
+  testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
 
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))

diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
 
   compileOnly("javax.servlet:javax.servlet-api:3.0.1")
 
-  testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
+  testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
 
   testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
   testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))

diff --git a/...n/jsf/jsf-testing-common/build.gradle.kts → ...n/jsf/jsf-common/testing/build.gradle.kts b/...n/jsf/jsf-testing-common/build.gradle.kts → ...n/jsf/jsf-common/testing/build.gradle.kts
diff --git a/...common/src/main/groovy/BaseJsfTest.groovy → ...esting/src/main/groovy/BaseJsfTest.groovy b/...common/src/main/groovy/BaseJsfTest.groovy → ...esting/src/main/groovy/BaseJsfTest.groovy
diff --git a/...on/src/main/groovy/ExceptionFilter.groovy → ...ng/src/main/groovy/ExceptionFilter.groovy b/...on/src/main/groovy/ExceptionFilter.groovy → ...ng/src/main/groovy/ExceptionFilter.groovy
diff --git a/...ommon/src/main/groovy/GreetingForm.groovy → ...sting/src/main/groovy/GreetingForm.groovy b/...ommon/src/main/groovy/GreetingForm.groovy → ...sting/src/main/groovy/GreetingForm.groovy
diff --git a/...ces/test-app-1.2/WEB-INF/faces-config.xml → ...ces/test-app-1.2/WEB-INF/faces-config.xml b/...ces/test-app-1.2/WEB-INF/faces-config.xml → ...ces/test-app-1.2/WEB-INF/faces-config.xml
diff --git a/...in/resources/test-app-1.2/WEB-INF/web.xml → ...in/resources/test-app-1.2/WEB-INF/web.xml b/...in/resources/test-app-1.2/WEB-INF/web.xml → ...in/resources/test-app-1.2/WEB-INF/web.xml
diff --git a/...ain/resources/test-app-1.2/greeting.xhtml → ...ain/resources/test-app-1.2/greeting.xhtml b/...ain/resources/test-app-1.2/greeting.xhtml → ...ain/resources/test-app-1.2/greeting.xhtml
diff --git a/...c/main/resources/test-app-1.2/hello.xhtml → ...c/main/resources/test-app-1.2/hello.xhtml b/...c/main/resources/test-app-1.2/hello.xhtml → ...c/main/resources/test-app-1.2/hello.xhtml
diff --git a/...urces/test-app-2/WEB-INF/faces-config.xml → ...urces/test-app-2/WEB-INF/faces-config.xml b/...urces/test-app-2/WEB-INF/faces-config.xml → ...urces/test-app-2/WEB-INF/faces-config.xml
diff --git a/...main/resources/test-app-2/WEB-INF/web.xml → ...main/resources/test-app-2/WEB-INF/web.xml b/...main/resources/test-app-2/WEB-INF/web.xml → ...main/resources/test-app-2/WEB-INF/web.xml
diff --git a/.../main/resources/test-app-2/greeting.xhtml → .../main/resources/test-app-2/greeting.xhtml b/.../main/resources/test-app-2/greeting.xhtml → .../main/resources/test-app-2/greeting.xhtml
diff --git a/...src/main/resources/test-app-2/hello.xhtml → ...src/main/resources/test-app-2/hello.xhtml b/...src/main/resources/test-app-2/hello.xhtml → ...src/main/resources/test-app-2/hello.xhtml
diff --git a/...sf/mojarra-1.2/javaagent/build.gradle.kts → ...sf-mojarra-1.2/javaagent/build.gradle.kts b/...sf/mojarra-1.2/javaagent/build.gradle.kts → ...sf-mojarra-1.2/javaagent/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
 
   implementation(project(":instrumentation:jsf:jsf-common:library"))
 
-  testImplementation(project(":instrumentation:jsf:jsf-testing-common"))
+  testImplementation(project(":instrumentation:jsf:jsf-common:testing"))
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 

diff --git a/...ra/ActionListenerImplInstrumentation.java → ...ra/ActionListenerImplInstrumentation.java b/...ra/ActionListenerImplInstrumentation.java → ...ra/ActionListenerImplInstrumentation.java
diff --git a/...mojarra/MojarraInstrumentationModule.java → ...mojarra/MojarraInstrumentationModule.java b/...mojarra/MojarraInstrumentationModule.java → ...mojarra/MojarraInstrumentationModule.java
diff --git a/...umentation/mojarra/MojarraSingletons.java → ...umentation/mojarra/MojarraSingletons.java b/...umentation/mojarra/MojarraSingletons.java → ...umentation/mojarra/MojarraSingletons.java
diff --git a/...arra/RestoreViewPhaseInstrumentation.java → ...arra/RestoreViewPhaseInstrumentation.java b/...arra/RestoreViewPhaseInstrumentation.java → ...arra/RestoreViewPhaseInstrumentation.java
diff --git a/...mojarra12Test/groovy/Mojarra12Test.groovy → ...mojarra12Test/groovy/Mojarra12Test.groovy b/...mojarra12Test/groovy/Mojarra12Test.groovy → ...mojarra12Test/groovy/Mojarra12Test.groovy
diff --git a/...t-app-1.2-extra/META-INF/web-fragment.xml → ...t-app-1.2-extra/META-INF/web-fragment.xml b/...t-app-1.2-extra/META-INF/web-fragment.xml → ...t-app-1.2-extra/META-INF/web-fragment.xml
diff --git a/...testTest/groovy/Mojarra2LatestTest.groovy → ...testTest/groovy/Mojarra2LatestTest.groovy b/...testTest/groovy/Mojarra2LatestTest.groovy → ...testTest/groovy/Mojarra2LatestTest.groovy
diff --git a/...c/mojarra2Test/groovy/Mojarra2Test.groovy → ...c/mojarra2Test/groovy/Mojarra2Test.groovy b/...c/mojarra2Test/groovy/Mojarra2Test.groovy → ...c/mojarra2Test/groovy/Mojarra2Test.groovy
diff --git a/...sf/myfaces-1.2/javaagent/build.gradle.kts → ...sf-myfaces-1.2/javaagent/build.gradle.kts b/...sf/myfaces-1.2/javaagent/build.gradle.kts → ...sf-myfaces-1.2/javaagent/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 
   implementation(project(":instrumentation:jsf:jsf-common:library"))
 
-  testImplementation(project(":instrumentation:jsf:jsf-testing-common"))
+  testImplementation(project(":instrumentation:jsf:jsf-common:testing"))
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 

diff --git a/...es/ActionListenerImplInstrumentation.java → ...es/ActionListenerImplInstrumentation.java b/...es/ActionListenerImplInstrumentation.java → ...es/ActionListenerImplInstrumentation.java
diff --git a/...n/myfaces/MyFacesErrorCauseExtractor.java → ...n/myfaces/MyFacesErrorCauseExtractor.java b/...n/myfaces/MyFacesErrorCauseExtractor.java → ...n/myfaces/MyFacesErrorCauseExtractor.java
diff --git a/...myfaces/MyFacesInstrumentationModule.java → ...myfaces/MyFacesInstrumentationModule.java b/...myfaces/MyFacesInstrumentationModule.java → ...myfaces/MyFacesInstrumentationModule.java
diff --git a/...umentation/myfaces/MyFacesSingletons.java → ...umentation/myfaces/MyFacesSingletons.java b/...umentation/myfaces/MyFacesSingletons.java → ...umentation/myfaces/MyFacesSingletons.java
diff --git a/...s/RestoreViewExecutorInstrumentation.java → ...s/RestoreViewExecutorInstrumentation.java b/...s/RestoreViewExecutorInstrumentation.java → ...s/RestoreViewExecutorInstrumentation.java
diff --git a/...myfaces12Test/groovy/Myfaces12Test.groovy → ...myfaces12Test/groovy/Myfaces12Test.groovy b/...myfaces12Test/groovy/Myfaces12Test.groovy → ...myfaces12Test/groovy/Myfaces12Test.groovy
diff --git a/...t-app-1.2-extra/META-INF/web-fragment.xml → ...t-app-1.2-extra/META-INF/web-fragment.xml b/...t-app-1.2-extra/META-INF/web-fragment.xml → ...t-app-1.2-extra/META-INF/web-fragment.xml
diff --git a/...testTest/groovy/Myfaces2LatestTest.groovy → ...testTest/groovy/Myfaces2LatestTest.groovy b/...testTest/groovy/Myfaces2LatestTest.groovy → ...testTest/groovy/Myfaces2LatestTest.groovy
diff --git a/...est-app-2-extra/META-INF/web-fragment.xml → ...est-app-2-extra/META-INF/web-fragment.xml b/...est-app-2-extra/META-INF/web-fragment.xml → ...est-app-2-extra/META-INF/web-fragment.xml
diff --git a/...c/myfaces2Test/groovy/Myfaces2Test.groovy → ...c/myfaces2Test/groovy/Myfaces2Test.groovy b/...c/myfaces2Test/groovy/Myfaces2Test.groovy → ...c/myfaces2Test/groovy/Myfaces2Test.groovy
diff --git a/...est-app-2-extra/META-INF/web-fragment.xml → ...est-app-2-extra/META-INF/web-fragment.xml b/...est-app-2-extra/META-INF/web-fragment.xml → ...est-app-2-extra/META-INF/web-fragment.xml
diff --git a/...on/log4j/log4j-2-testing/build.gradle.kts → ...j/log4j-2-common/testing/build.gradle.kts b/...on/log4j/log4j-2-testing/build.gradle.kts → ...j/log4j-2-common/testing/build.gradle.kts
diff --git a/...testing/src/main/groovy/Log4j2Test.groovy → ...testing/src/main/groovy/Log4j2Test.groovy b/...testing/src/main/groovy/Log4j2Test.groovy → ...testing/src/main/groovy/Log4j2Test.groovy
diff --git a/...mentation/log4j/v2_13_2/ListAppender.java → ...mentation/log4j/v2_13_2/ListAppender.java b/...mentation/log4j/v2_13_2/ListAppender.java → ...mentation/log4j/v2_13_2/ListAppender.java
diff --git a/...esting/src/main/resources/log4j2-test.xml → ...esting/src/main/resources/log4j2-test.xml b/...esting/src/main/resources/log4j2-test.xml → ...esting/src/main/resources/log4j2-test.xml
diff --git a/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 
   implementation(project(":instrumentation:log4j:log4j-2.13.2:library"))
 
-  testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
+  testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
 }
 
 tasks {

diff --git a/instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts b/instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts
@@ -9,5 +9,5 @@ dependencies {
   // around it.
   testLibrary("org.apache.logging.log4j:log4j-core:2.13.3")
 
-  testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
+  testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
 }
diff --git a/instrumentation/log4j/log4j-2.7/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-2.7/javaagent/build.gradle.kts
@@ -14,7 +14,7 @@ muzzle {
 dependencies {
   library("org.apache.logging.log4j:log4j-core:2.7")
 
-  testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
+  testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
 
   latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.13.1")
 }
diff --git a/instrumentation/mongo/mongo-3.1/testing/build.gradle.kts b/instrumentation/mongo/mongo-3.1/testing/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(project(":instrumentation:mongo:mongo-testing"))
+  api(project(":instrumentation:mongo:mongo-common:testing"))
 
   compileOnly("org.mongodb:mongo-java-driver:3.1.0")
 

diff --git a/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
   // a couple of test attribute verifications don't pass until 3.8.0
   library("org.mongodb:mongo-java-driver:3.8.0")
 
-  testImplementation(project(":instrumentation:mongo:mongo-testing"))
+  testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
 }
 
 tasks {

diff --git a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
   testLibrary("org.mongodb:mongodb-driver-sync:4.0.0")
   testLibrary("org.mongodb:mongodb-driver-reactivestreams:4.0.0")
 
-  testImplementation(project(":instrumentation:mongo:mongo-testing"))
+  testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
   testImplementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5")
 }
 

diff --git a/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
 
   library("org.mongodb:mongodb-driver-async:3.3.0")
 
-  testImplementation(project(":instrumentation:mongo:mongo-testing"))
+  testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
 
   testInstrumentation(project(":instrumentation:mongo:mongo-3.7:javaagent"))
 }

diff --git a/...tion/mongo/mongo-testing/build.gradle.kts → ...ngo/mongo-common/testing/build.gradle.kts b/...tion/mongo/mongo-testing/build.gradle.kts → ...ngo/mongo-common/testing/build.gradle.kts
diff --git a/...go/testing/AbstractMongoClientTest.groovy → ...go/testing/AbstractMongoClientTest.groovy b/...go/testing/AbstractMongoClientTest.groovy → ...go/testing/AbstractMongoClientTest.groovy
diff --git a/instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts b/instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
 
   implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
 
-  testImplementation(project(":instrumentation:play-ws:play-ws-testing"))
+  testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
 
   // These are to ensure cross compatibility
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

diff --git a/instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts b/instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 
   implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
 
-  testImplementation(project(":instrumentation:play-ws:play-ws-testing"))
+  testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
 
   // These are to ensure cross compatibility
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

diff --git a/instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts b/instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
 
   implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
 
-  testImplementation(project(":instrumentation:play-ws:play-ws-testing"))
+  testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
 
   // These are to ensure cross compatibility
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

diff --git a/.../play-ws/play-ws-testing/build.gradle.kts → ...s/play-ws-common/testing/build.gradle.kts b/.../play-ws/play-ws-testing/build.gradle.kts → ...s/play-ws-common/testing/build.gradle.kts
diff --git a/...c/main/groovy/PlayWsClientTestBase.groovy → ...c/main/groovy/PlayWsClientTestBase.groovy b/...c/main/groovy/PlayWsClientTestBase.groovy → ...c/main/groovy/PlayWsClientTestBase.groovy
diff --git a/...in/groovy/PlayWsClientTestBaseBase.groovy → ...in/groovy/PlayWsClientTestBaseBase.groovy b/...in/groovy/PlayWsClientTestBaseBase.groovy → ...in/groovy/PlayWsClientTestBaseBase.groovy
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -136,15 +136,15 @@ include(":instrumentation:couchbase:couchbase-3.1.6:javaagent")
 include(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded")
 include(":instrumentation:couchbase:couchbase-3.2:javaagent")
 include(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded")
-include(":instrumentation:couchbase:couchbase-testing")
+include(":instrumentation:couchbase:couchbase-common:testing")
 include(":instrumentation:dropwizard-views-0.7:javaagent")
 include(":instrumentation:dropwizard-testing")
 include(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-rest-5.0:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-rest-6.4:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-rest-7.0:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-transport-common:library")
-include(":instrumentation:elasticsearch:elasticsearch-transport-testing")
+include(":instrumentation:elasticsearch:elasticsearch-transport-common:testing")
 include(":instrumentation:elasticsearch:elasticsearch-transport-5.0:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-transport-5.3:javaagent")
 include(":instrumentation:elasticsearch:elasticsearch-transport-6.0:javaagent")
@@ -179,7 +179,7 @@ include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-payara-testing")
 include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.0:javaagent")
 include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1:javaagent")
 include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent")
-include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing")
+include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing")
 include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-tomee-testing")
 include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-wildfly-testing")
 include(":instrumentation:jaxrs-client:jaxrs-client-1.1:javaagent")
@@ -194,7 +194,7 @@ include(":instrumentation:jaxws:jaxws-2.0-axis2-1.6:library")
 include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent")
 include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:library")
 include(":instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent")
-include(":instrumentation:jaxws:jaxws-2.0-testing")
+include(":instrumentation:jaxws:jaxws-2.0-common-testing")
 include(":instrumentation:jaxws:jaxws-2.0-tomee-testing")
 include(":instrumentation:jaxws:jaxws-2.0-wildfly-testing")
 include(":instrumentation:jaxws:jaxws-common:library")
@@ -213,9 +213,9 @@ include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing")
 include(":instrumentation:jms-1.1:javaagent")
 include(":instrumentation:jms-1.1:javaagent-unit-tests")
 include(":instrumentation:jsf:jsf-common:library")
-include(":instrumentation:jsf:jsf-testing-common")
-include(":instrumentation:jsf:mojarra-1.2:javaagent")
-include(":instrumentation:jsf:myfaces-1.2:javaagent")
+include(":instrumentation:jsf:jsf-common:testing")
+include(":instrumentation:jsf:jsf-mojarra-1.2:javaagent")
+include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent")
 include(":instrumentation:jsp-2.3:javaagent")
 include(":instrumentation:kafka-clients:kafka-clients-0.11:bootstrap")
 include(":instrumentation:kafka-clients:kafka-clients-0.11:javaagent")
@@ -239,7 +239,7 @@ include(":instrumentation:log4j:log4j-1.2:javaagent")
 include(":instrumentation:log4j:log4j-2.7:javaagent")
 include(":instrumentation:log4j:log4j-2.13.2:javaagent")
 include(":instrumentation:log4j:log4j-2.13.2:library")
-include(":instrumentation:log4j:log4j-2-testing")
+include(":instrumentation:log4j:log4j-2-common:testing")
 include(":instrumentation:logback-1.0:javaagent")
 include(":instrumentation:logback-1.0:library")
 include(":instrumentation:logback-1.0:testing")
@@ -250,7 +250,7 @@ include(":instrumentation:mongo:mongo-3.1:testing")
 include(":instrumentation:mongo:mongo-3.7:javaagent")
 include(":instrumentation:mongo:mongo-4.0:javaagent")
 include(":instrumentation:mongo:mongo-async-3.3:javaagent")
-include(":instrumentation:mongo:mongo-testing")
+include(":instrumentation:mongo:mongo-common:testing")
 include(":instrumentation:netty:netty-3.8:javaagent")
 include(":instrumentation:netty:netty-4.0:javaagent")
 include(":instrumentation:netty:netty-4.1:library")
@@ -274,7 +274,7 @@ include(":instrumentation:play-ws:play-ws-1.0:javaagent")
 include(":instrumentation:play-ws:play-ws-2.0:javaagent")
 include(":instrumentation:play-ws:play-ws-2.1:javaagent")
 include(":instrumentation:play-ws:play-ws-common:javaagent")
-include(":instrumentation:play-ws:play-ws-testing")
+include(":instrumentation:play-ws:play-ws-common:testing")
 include(":instrumentation:quartz-2.0:javaagent")
 include(":instrumentation:quartz-2.0:library")
 include(":instrumentation:quartz-2.0:testing")
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ dependencies { @@
       implementation(project(":instrumentation:log4j:log4j-2.13.2:library"))
-      testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
+      testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
     }
     tasks {
@@ Expand Down @@