Refactor spring instrumentation folders (#9485)

Author: amarziali

.github/CODEOWNERS

@@ -54,7 +54,7 @@
 /dd-smoke-tests/iast-util/                                      @DataDog/asm-java
 /dd-smoke-tests/spring-security/                                @DataDog/asm-java
 /dd-java-agent/instrumentation/commons-fileupload/              @DataDog/asm-java
-/dd-java-agent/instrumentation/spring-security-5/               @DataDog/asm-java
+/dd-java-agent/instrumentation/spring/spring-security/          @DataDog/asm-java
 /dd-trace-api/src/main/java/datadog/trace/api/EventTracker.java @DataDog/asm-java
 /internal-api/src/main/java/datadog/trace/api/gateway/          @DataDog/asm-java
 **/appsec/                                                      @DataDog/asm-java

dd-java-agent/instrumentation/elasticsearch/transport-5.3/build.gradle

@@ -27,7 +27,7 @@ dependencies {
 
   testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0')
   testImplementation project(':dd-java-agent:instrumentation:netty-4.1')
-  testImplementation project(':dd-java-agent:instrumentation:spring-data-1.8')
+  testImplementation project(':dd-java-agent:instrumentation:spring:spring-data-1.8')
   testImplementation project(':dd-java-agent:instrumentation:elasticsearch:transport')
 
   testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'

dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle

@@ -31,7 +31,7 @@ dependencies {
   testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
   testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
   testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
-  testRuntimeOnly project(':dd-java-agent:instrumentation:spring-scheduling-3.1')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:spring:spring-scheduling-3.1')
   testRuntimeOnly project(':dd-java-agent:instrumentation:reactor-core-3.1')
   testRuntimeOnly project(':dd-java-agent:instrumentation:reactive-streams')
   testImplementation(testFixtures(project(':dd-java-agent:agent-iast')))

dd-java-agent/instrumentation/kafka-clients-3.8/build.gradle

@@ -57,7 +57,7 @@ dependencies {
   testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
   testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
   testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
-  testRuntimeOnly project(':dd-java-agent:instrumentation:spring-scheduling-3.1')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:spring:spring-scheduling-3.1')
 
   latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.+'
   latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '3.+'