You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by GitBox <gi...@apache.org> on 2020/02/27 23:44:50 UTC

[GitHub] [beam] kennknowles commented on a change in pull request #10940: [BEAM-9288] Not bundle conscrypt in gRPC vendor

kennknowles commented on a change in pull request #10940: [BEAM-9288] Not bundle conscrypt in gRPC vendor
URL: https://github.com/apache/beam/pull/10940#discussion_r385434469
 
 

 ##########
 File path: buildSrc/src/main/groovy/org/apache/beam/gradle/VendorJavaPlugin.groovy
 ##########
 @@ -286,8 +288,23 @@ artifactId=${project.name}
               pom.withXml {
                 def root = asNode()
                 def dependenciesNode = root.appendNode('dependencies')
+                def unshaded = { dependency ->
+                  if (dependency instanceof ProjectDependency) {
+                    def groupId = dependency.getDependencyProject().mavenGroupId
+                    def artifactId = dependency.getDependencyProject().archivesBaseName
+                    def version = dependency.version
+                    return config.unshadedDependencies != null && config.unshadedDependencies.contains("$groupId:$artifactId:$version")
+                  } else {
+                    def groupId = dependency.group
+                    def artifactId = dependency.name
+                    def version = dependency.version
+                    return config.unshadedDependencies != null && config.unshadedDependencies.contains("$groupId:$artifactId:$version")
 
 Review comment:
   This does not include the classifier. And since leaving out the classifier is equal to `jar` (I think always?) it is not just a string comparison.
   
   Does Gradle utilities have anything to parse the `unshadedDependencies` into `ProjectDependency` objects and then use equality on that object?

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services