Refactor multiple instrumentation module

.github/CODEOWNERS

@@ -77,16 +77,14 @@
 /dd-java-agent/agent-ci-visibility/                 @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/cucumber/            @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/jacoco/              @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/junit-4.10/          @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/junit-5.3/           @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/junit                @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/karate/              @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/scalatest/           @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/selenium/            @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/testng/              @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/gradle-3.0/          @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/gradle-8.3/          @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/gradle/              @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/gradle-testing/      @DataDog/ci-app-libraries-java
-/dd-java-agent/instrumentation/maven-3.2.1/         @DataDog/ci-app-libraries-java
+/dd-java-agent/instrumentation/maven                @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/maven-surefire/      @DataDog/ci-app-libraries-java
 /dd-java-agent/instrumentation/weaver/              @DataDog/ci-app-libraries-java
 /dd-smoke-tests/gradle/                             @DataDog/ci-app-libraries-java

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

@@ -9,7 +9,7 @@ repositories {
 // gradle >= v5.1
 dependencies {
   compileOnly gradleApi()
-  compileOnly project(":dd-java-agent:instrumentation:junit-4.10")
+  compileOnly project(":dd-java-agent:instrumentation:junit:junit-4.10")
 }
 
 forbiddenApisMain {

dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle → dd-java-agent/instrumentation/junit/junit-4.10/cucumber-junit-4/build.gradle

@@ -11,7 +11,7 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
-  implementation project(':dd-java-agent:instrumentation:junit-4.10')
+  implementation project(':dd-java-agent:instrumentation:junit:junit-4.10')
   compileOnly group: 'io.cucumber', name: 'cucumber-junit', version: '5.4.0'
 
   testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures')

dd-java-agent/instrumentation/junit-4.10/junit-4.13/build.gradle → dd-java-agent/instrumentation/junit/junit-4.10/junit-4.13/build.gradle

@@ -11,7 +11,7 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
-  implementation project(':dd-java-agent:instrumentation:junit-4.10')
+  implementation project(':dd-java-agent:instrumentation:junit:junit-4.10')
   compileOnly group: 'junit', name: 'junit', version: '4.13'
 
   testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures')

dd-java-agent/instrumentation/junit-4.10/munit-junit-4/build.gradle → dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle

@@ -12,7 +12,7 @@ muzzle {
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
-  implementation project(':dd-java-agent:instrumentation:junit-4.10')
+  implementation project(':dd-java-agent:instrumentation:junit:junit-4.10')
   compileOnly group: 'org.scalameta', name: 'munit_2.13', version: '0.7.28'
 
   testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures')