From 138128e25143899d7ebbdb74ae4b4258c8cf20ca Mon Sep 17 00:00:00 2001
From: Munir Abdinur <62392438+mabdinur@users.noreply.github.com>
Date: Tue, 4 Aug 2020 02:12:14 -0400
Subject: [PATCH] Fix instrumentation core artifact names (#885)

---
 instrumentation-core/servlet/servlet.gradle                    | 1 +
 .../spring/spring-web-3.1/spring-web-3.1.gradle                | 3 ++-
 .../spring/spring-webflux-5.0/spring-webflux-5.0.gradle        | 3 ++-
 .../spring/spring-webmvc-3.1/spring-webmvc-3.1.gradle          | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/instrumentation-core/servlet/servlet.gradle b/instrumentation-core/servlet/servlet.gradle
index 6938430c83..4b1e82c3c7 100644
--- 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
index 4e6e84bb57..88480fd413 100644
--- 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"
-}
\ No newline at end of file
+}
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
index 56a6f5184e..74901edb98 100644
--- 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'
-}
\ No newline at end of file
+}
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
index cbcc4f166e..2c5abff40b 100644
--- 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'