From 77318e3959b8a8a02ffe040b4e00dfc272544788 Mon Sep 17 00:00:00 2001
From: Jihun Cho <jihuncho@google.com>
Date: Mon, 30 Sep 2019 10:03:54 -0700
Subject: [PATCH 1/2] bom: format(tab->space) build.gradle

---
 bom/build.gradle | 52 ++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/bom/build.gradle b/bom/build.gradle
index 8c1d30b9506..12598bc523d 100644
--- a/bom/build.gradle
+++ b/bom/build.gradle
@@ -1,32 +1,36 @@
+plugins {
+  id "maven-publish"
+}
+
 description = 'gRPC: BOM'
 
 publishing {
-    publications {
-        maven(MavenPublication) {
-            // remove all other artifacts since BOM doesn't generates any Jar
-            artifacts = []
+  publications {
+    maven(MavenPublication) {
+      // remove all other artifacts since BOM doesn't generates any Jar
+      artifacts = []
 
-            pom.withXml {
-                // Generate bom using subprojects
-                def internalProjects = [project.name, 'grpc-xds', 'grpc-gae-interop-testing-jdk8', 'grpc-compiler']
+      pom.withXml {
+        // Generate bom using subprojects
+        def internalProjects = [project.name, 'grpc-xds', 'grpc-gae-interop-testing-jdk8', 'grpc-compiler']
 
-                def dependencyManagement = asNode().appendNode('dependencyManagement')
-                def dependencies = dependencyManagement.appendNode('dependencies')
-                rootProject.subprojects.each { subproject ->
-                    if (internalProjects.contains(subproject.name)) {
-		        return
-		    }
-                    def dependencyNode = dependencies.appendNode('dependency')
-                    dependencyNode.appendNode('groupId', subproject.group)
-                    dependencyNode.appendNode('artifactId', subproject.name)
-                    dependencyNode.appendNode('version', subproject.version)
-                }
-		// add protoc gen (produced by grpc-compiler with different artifact name)
-		def dependencyNode = dependencies.appendNode('dependency')
-	        dependencyNode.appendNode('groupId', project.group)
-	        dependencyNode.appendNode('artifactId', 'protoc-gen-grpc-java')
-	        dependencyNode.appendNode('version', project.version)
-	    }
+        def dependencyManagement = asNode().appendNode('dependencyManagement')
+        def dependencies = dependencyManagement.appendNode('dependencies')
+        rootProject.subprojects.each { subproject ->
+          if (internalProjects.contains(subproject.name)) {
+            return
+          }
+          def dependencyNode = dependencies.appendNode('dependency')
+          dependencyNode.appendNode('groupId', subproject.group)
+          dependencyNode.appendNode('artifactId', subproject.name)
+          dependencyNode.appendNode('version', subproject.version)
         }
+        // add protoc gen (produced by grpc-compiler with different artifact name)
+        def dependencyNode = dependencies.appendNode('dependency')
+        dependencyNode.appendNode('groupId', project.group)
+        dependencyNode.appendNode('artifactId', 'protoc-gen-grpc-java')
+        dependencyNode.appendNode('version', project.version)
+      }
     }
+  }
 }

From f1e5bf425738ed0db55ce0d6b0dc30bef7925ec8 Mon Sep 17 00:00:00 2001
From: Jihun Cho <jihuncho@google.com>
Date: Mon, 30 Sep 2019 10:05:49 -0700
Subject: [PATCH 2/2] bom: specify pom type for protoc-gen-grpc-java

---
 bom/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bom/build.gradle b/bom/build.gradle
index 12598bc523d..67914432227 100644
--- a/bom/build.gradle
+++ b/bom/build.gradle
@@ -30,6 +30,7 @@ publishing {
         dependencyNode.appendNode('groupId', project.group)
         dependencyNode.appendNode('artifactId', 'protoc-gen-grpc-java')
         dependencyNode.appendNode('version', project.version)
+        dependencyNode.appendNode('type', 'pom')
       }
     }
   }