Fix instrumentation core artifact names (#885)

mabdinur · web-flow · commit 138128e25143 · 2020-08-03T23:12:14.000-07:00
diff --git a/instrumentation-core/servlet/servlet.gradle b/instrumentation-core/servlet/servlet.gradle
@@ -2,6 +2,7 @@ ext {
   javaSubPackage = 'servlet'
 }
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
+archivesBaseName = "servlet"
 
 dependencies {
   implementation deps.slf4j
diff --git a/instrumentation-core/spring/spring-web-3.1/spring-web-3.1.gradle b/instrumentation-core/spring/spring-web-3.1/spring-web-3.1.gradle
@@ -3,7 +3,8 @@ ext{
 }
 
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
+archivesBaseName = "spring-web-3.1"
 
 dependencies {
   compileOnly "org.springframework:spring-web:3.1.0.RELEASE"
-}
+}
diff --git a/instrumentation-core/spring/spring-webflux-5.0/spring-webflux-5.0.gradle b/instrumentation-core/spring/spring-webflux-5.0/spring-webflux-5.0.gradle
@@ -4,8 +4,9 @@ ext {
 }
 
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
+archivesBaseName = "spring-webflux-5.0"
 
 dependencies {
   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'
-}
+}
diff --git a/instrumentation-core/spring/spring-webmvc-3.1/spring-webmvc-3.1.gradle b/instrumentation-core/spring/spring-webmvc-3.1/spring-webmvc-3.1.gradle
@@ -3,9 +3,10 @@ ext{
 }
 
 apply from: "$rootDir/gradle/instrumentation-library.gradle"
+archivesBaseName = "spring-webmvc-3.1"
 
 dependencies {
-  api project(':instrumentation-core:servlet')
+  implementation project(':instrumentation-core:servlet')
   
   compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '3.1.0.RELEASE'
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ ext {`
`2`	`2`	`javaSubPackage = 'servlet'`
`3`	`3`	`}`
`4`	`4`	`apply from: "$rootDir/gradle/instrumentation-library.gradle"`
	`5`	`+archivesBaseName = "servlet"`
`5`	`6`
`6`	`7`	`dependencies {`
`7`	`8`	`implementation deps.slf4j`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ ext{`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`apply from: "$rootDir/gradle/instrumentation-library.gradle"`
	`6`	`+archivesBaseName = "spring-web-3.1"`
`6`	`7`
`7`	`8`	`dependencies {`
`8`	`9`	`compileOnly "org.springframework:spring-web:3.1.0.RELEASE"`
`9`		`-}`
	`10`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@ ext {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`apply from: "$rootDir/gradle/instrumentation-library.gradle"`
	`7`	`+archivesBaseName = "spring-webflux-5.0"`
`7`	`8`
`8`	`9`	`dependencies {`
`9`	`10`	`compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'`
`10`	`11`	`compileOnly group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE'`
`11`		`-}`
	`12`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,10 @@ ext{`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`apply from: "$rootDir/gradle/instrumentation-library.gradle"`
	`6`	`+archivesBaseName = "spring-webmvc-3.1"`
`6`	`7`
`7`	`8`	`dependencies {`
`8`		`- api project(':instrumentation-core:servlet')`
	`9`	`+ implementation project(':instrumentation-core:servlet')`
`9`	`10`
`10`	`11`	`compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '3.1.0.RELEASE'`
`11`	`12`	`compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'`