Fix grpc dependencies (#761)

* exclude protobuf dependencies from pom * fix the test dependencies * fixed test scope dependencies
microsoft · Oct 18, 2018 · 754c76f · 754c76f
1 parent 27bd354
commit 754c76f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/azure-application-insights-spring-boot-starter/build.gradle b/azure-application-insights-spring-boot-starter/build.gradle
@@ -111,5 +111,5 @@ projectPomDescription = "This is the Spring Boot starter of " + project.msftAppI
 
 whenPomConfigured = { p ->
     def agentArtifactId = project(":agent").jar.baseName
-    p.dependencies = p.dependencies.findAll { dep -> dep.artifactId != agentArtifactId }
+    p.dependencies = p.dependencies.findAll { dep -> dep.scope == "test" || dep.artifactId != agentArtifactId }
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -168,9 +168,10 @@ projectPomDescription = "This is the core module of " + project.msftAppInsightsJ
 whenPomConfigured = { p ->
     def agentArtifactId = project(":agent").jar.baseName
     p.dependencies = p.dependencies.findAll { dep ->
-        dep.artifactId != agentArtifactId &&
+        dep.scope == "test" || dep.artifactId != agentArtifactId &&
                 !(dep.groupId in ['org.apache.http', 'eu.infomas', 'org.apache.commons', 'commons-io',
-                                  'com.google.guava', 'com.google.code.gson', 'org.apache.httpcomponents'])
+                                  'com.google.guava', 'com.google.code.gson', 'org.apache.httpcomponents',
+                                  'io.grpc', 'com.google.protobuf'])
     }
 }
 

diff --git a/logging/logging.gradle b/logging/logging.gradle
@@ -61,7 +61,7 @@ findbugs.sourceSets = [sourceSets.main]
 // region Publishing properties
 
 whenPomConfigured = { p ->
-    p.dependencies = p.dependencies.findAll { dep -> dep.artifactId != "junit" && dep.artifactId != "mockito-all" }
+    p.dependencies = p.dependencies.findAll { dep -> dep.scope == "test" || dep.artifactId != "junit" && dep.artifactId != "mockito-all" }
 }
 
 // endregion Publishing properties

diff --git a/web/build.gradle b/web/build.gradle
@@ -68,7 +68,7 @@ projectPomDescription = "This is the web module of " + project.msftAppInsightsJa
 whenPomConfigured = { p ->
     def agentArtifactId = project(":agent").jar.baseName
     p.dependencies = p.dependencies.findAll { dep ->
-        dep.artifactId != agentArtifactId &&
+        dep.scope == "test" || dep.artifactId != agentArtifactId &&
                 !(dep.groupId in ['org.apache.http', 'org.apache.commons', 'commons-io',
                                   'org.apache.httpcomponents'])
     }