Fixed pom generation for gobblin-rest-api project.

apache · Feb 2, 2016 · 116c79b · 116c79b
1 parent f4ad8e7
commit 116c79b
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 80 deletions.
diff --git a/build.gradle b/build.gradle
@@ -256,25 +256,93 @@ if (ext.javadocVersion.indexOf('-') > 0) {
 }
 
 ext.javadocPackages = new HashSet<String>()
-subprojects.each{Project pr -> 
+subprojects.each{Project pr ->
   if (file(pr.projectDir.absolutePath + "/src/main/java").exists()) {
     rootProject.ext.javadocPackages += pr.name
   }
 }
 
 subprojects {
   plugins.withType(JavaPlugin) {
- 
+
     // Sometimes generating javadocs can lead to OOM. This may needs to be increased.
     // Also force javadocs to pick up system proxy settings if available
     javadoc {
       options.jFlags('-Xmx256m', '-Djava.net.useSystemProxies=true');
     }
-    
+
     rootProject.tasks.javadocTarball.dependsOn project.tasks.javadoc
     if ( rootProject.ext.javadocPackages.contains(project.name)) {
       rootProject.tasks.javadocTarball.into(project.name){from(fileTree(dir: "${project.buildDir}/docs/javadoc/"))}
-    } 
+    }
+  }
+}
+
+ext.pomAttributes = {
+  name "${project.name}"
+  packaging 'jar'
+  // optionally artifactId can be defined here
+  description 'Gobblin Ingestion Framework'
+  url 'https://github.com/linkedin/gobblin/'
+
+  scm {
+    connection 'scm:git:[email protected]:linkedin/gobblin.git'
+    developerConnection 'scm:git:[email protected]:linkedin/gobblin.git'
+    url '[email protected]:linkedin/gobblin.git'
+  }
+
+  licenses {
+    license {
+      name 'The Apache License, Version 2.0'
+      url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    }
+  }
+
+  developers {
+    developer {
+      name 'Abhishek Tiwari'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Chavdar Botev'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Issac Buenrostro'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Min Tu'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Narasimha Veeramreddy'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Pradhan Cadabam'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Sahil Takiar'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Shirshanka Das'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Yinan Li'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Ying Dai'
+      organization 'LinkedIn'
+    }
+    developer {
+      name 'Ziyang Liu'
+      organization 'LinkedIn'
+    }
   }
 }
 
@@ -380,73 +448,7 @@ subprojects {
               authentication(userName: ossrhUsername, password: ossrhPassword)
             }
 
-            pom.project {
-              name "${project.name}"
-              packaging 'jar'
-              // optionally artifactId can be defined here
-              description 'Gobblin Ingestion Framework'
-              url 'https://github.com/linkedin/gobblin/'
-
-              scm {
-                connection 'scm:git:[email protected]:linkedin/gobblin.git'
-                developerConnection 'scm:git:[email protected]:linkedin/gobblin.git'
-                url '[email protected]:linkedin/gobblin.git'
-              }
-
-              licenses {
-                license {
-                  name 'The Apache License, Version 2.0'
-                  url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                }
-              }
-
-              developers {
-                developer {
-                  name 'Abhishek Tiwari'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Chavdar Botev'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Issac Buenrostro'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Min Tu'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Narasimha Veeramreddy'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Pradhan Cadabam'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Sahil Takiar'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Shirshanka Das'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Yinan Li'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Ying Dai'
-                  organization 'LinkedIn'
-                }
-                developer {
-                  name 'Ziyang Liu'
-                  organization 'LinkedIn'
-                }
-              }
-            }
+            pom.project pomAttributes
           }
         }
       }
@@ -483,7 +485,7 @@ subprojects {
                                 "https://dropwizard.github.io/metrics/${dropwizardMetricsVersion}/apidocs/"
     rootProject.ext.javadocPackages.each {
       tasks.javadoc.options.linksOffline "http://linkedin.github.io/gobblin/javadoc/${javadocVersion}/${it}/",
-                                       "${rootProject.buildDir}/${it}/docs/javadoc/" 
+                                       "${rootProject.buildDir}/${it}/docs/javadoc/"
     }
 
     afterEvaluate {

diff --git a/gobblin-rest-service/gobblin-rest-api/build.gradle b/gobblin-rest-service/gobblin-rest-api/build.gradle
@@ -28,31 +28,31 @@ if (rootProject.ext.publishToMaven) {
   configure(uploadArchives.repositories.mavenDeployer) {
     addFilter('gobblin-rest-api-rest-client') {artifact, file ->
       artifact.name == 'gobblin-rest-api-rest-client'
-    }.artifactId = 'gobblin-rest-api-rest-client'
+    }.project(rootProject.pomAttributes).artifactId = 'gobblin-rest-api-rest-client'
 
     addFilter('gobblin-rest-api-data-template') {artifact, file ->
       artifact.name == 'gobblin-rest-api-data-template'
-    }.artifactId = 'gobblin-rest-api-data-template'
+    }.project(rootProject.pomAttributes).artifactId = 'gobblin-rest-api-data-template'
 
     addFilter('gobblin-rest-api') {artifact, file ->
       artifact.name == 'gobblin-rest-api'
-    }.artifactId = 'gobblin-rest-api'
+    }.project(rootProject.pomAttributes).artifactId = 'gobblin-rest-api'
     // artifact names for 'data-model', 'avro-schema' and 'rest-model' may be added as well if needed
   }
 }
 
 configure(install.repositories.mavenInstaller) {
   addFilter('gobblin-rest-api-rest-client') {artifact, file ->
     artifact.name == 'gobblin-rest-api-rest-client'
-  }.artifactId = 'gobblin-rest-api-rest-client'
+  }.project(rootProject.pomAttributes).artifactId = 'gobblin-rest-api-rest-client'
 
   addFilter('gobblin-rest-api-data-template') {artifact, file ->
     artifact.name == 'gobblin-rest-api-data-template'
-  }.artifactId = 'gobblin-rest-api-data-template'
+  }.project(rootProject.pomAttributes).artifactId = 'gobblin-rest-api-data-template'
 
   addFilter('gobblin-rest-api') {artifact, file ->
     artifact.name == 'gobblin-rest-api'
-  }.artifactId = 'gobblin-rest-api'  
+  }.project(rootProject.pomAttributes).artifactId = 'gobblin-rest-api'
   // artifact names for 'data-model', 'avro-schema' and 'rest-model' may be added as well if needed
 }
 
@@ -101,8 +101,8 @@ task restClientJavadocJar(type: Jar, dependsOn: 'restClientJavadoc') {
     classifier = 'javadoc'
 }
 
-artifacts { 
-    archives dataTemplateSourcesJar, dataTemplateJavadocJar, restClientSourcesJar, restClientJavadocJar 
+artifacts {
+    archives dataTemplateSourcesJar, dataTemplateJavadocJar, restClientSourcesJar, restClientJavadocJar
 }
 
 buildscript {