Rename spring instrumentation modules (#1125)

instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle

@@ -17,9 +17,9 @@ dependencies {
   compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-aop', version: versions.springboot
   compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springboot
   compileOnly group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: versions.springboot
-  implementation project(':instrumentation:spring:spring-web-3.1:spring-web-3.1-library')
-  implementation project(':instrumentation:spring:spring-webmvc-3.1:spring-webmvc-3.1-library')
-  implementation project(':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-library')
+  implementation project(':instrumentation:spring:spring-web-3.1:library')
+  implementation project(':instrumentation:spring:spring-webmvc-3.1:library')
+  implementation project(':instrumentation:spring:spring-webflux-5.0:library')
 
   compileOnly deps.opentelemetryAutoAnnotations
   compileOnly group: 'io.grpc', name: 'grpc-api', version: '1.30.2'

instrumentation/spring/spring-web-3.1/library/spring-web-3.1-library.gradle

@@ -1,5 +1,4 @@
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
-archivesBaseName = "spring-web-3.1"
 
 dependencies {
   compileOnly "org.springframework:spring-web:3.1.0.RELEASE"

instrumentation/spring/spring-webflux-5.0/auto/spring-webflux-5.0-auto.gradle

@@ -42,7 +42,7 @@ muzzle {
 }
 
 dependencies {
-  implementation project(':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-library')
+  implementation project(':instrumentation:spring:spring-webflux-5.0:library')
   compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
   compileOnly group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE'
 

settings.gradle

@@ -159,11 +159,11 @@ include ':instrumentation:servlet:servlet-3.0'
 include ':instrumentation:spark-web-framework-2.3'
 include ':instrumentation:spring:spring-data-1.8'
 include ':instrumentation:spring:spring-scheduling-3.1'
-include ':instrumentation:spring:spring-web-3.1:spring-web-3.1-library'
-include ':instrumentation:spring:spring-webmvc-3.1:spring-webmvc-3.1-auto'
-include ':instrumentation:spring:spring-webmvc-3.1:spring-webmvc-3.1-library'
-include ':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-auto'
-include ':instrumentation:spring:spring-webflux-5.0:spring-webflux-5.0-library'
+include ':instrumentation:spring:spring-web-3.1:library'
+include ':instrumentation:spring:spring-webmvc-3.1:auto'
+include ':instrumentation:spring:spring-webmvc-3.1:library'
+include ':instrumentation:spring:spring-webflux-5.0:auto'
+include ':instrumentation:spring:spring-webflux-5.0:library'
 include ':instrumentation:spring:spring-boot-autoconfigure'
 include ':instrumentation:spring:starters:spring-starter'
 include ':instrumentation:spring:starters:jaeger-exporter-starter'