[incubator-gobblin] branch master updated: [GOBBLIN-1184] publish gobblin-cluster-test and elasticssearch-deps s…

[le...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lesun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new 31f2ef1  [GOBBLIN-1184] publish gobblin-cluster-test and elasticssearch-deps s…
31f2ef1 is described below

commit 31f2ef1478c3b5d4887cfc772f0e85057cde1c56
Author: vbohra <vb...@linkedin.com>
AuthorDate: Fri Jun 5 11:23:43 2020 -0700

    [GOBBLIN-1184] publish gobblin-cluster-test and elasticssearch-deps s…
    
    Closes #3032 from vikrambohra/clusterTest
---
 gobblin-all/build.gradle                              |  1 +
 gobblin-cluster/build.gradle                          |  6 +++---
 .../gobblin-elasticsearch-deps/build.gradle           | 19 ++++++++++++++++++-
 gobblin-modules/gobblin-orc-dep/build.gradle          |  4 +---
 gradle/scripts/bintrayPublishing.gradle               |  2 +-
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/gobblin-all/build.gradle b/gobblin-all/build.gradle
index daec3c0..c7e25f0 100644
--- a/gobblin-all/build.gradle
+++ b/gobblin-all/build.gradle
@@ -27,6 +27,7 @@ dependencies {
   compile project(':gobblin-modules:gobblin-azure-datalake')
   compile project(':gobblin-binary-management')
   compile project(':gobblin-cluster')
+  compile project(path: ':gobblin-cluster', configuration: 'tests')
   compile project(':gobblin-modules:gobblin-codecs')
   compile project(':gobblin-compaction')
   compile project(':gobblin-modules:gobblin-compliance')
diff --git a/gobblin-cluster/build.gradle b/gobblin-cluster/build.gradle
index 2c8d697..aaa703d 100644
--- a/gobblin-cluster/build.gradle
+++ b/gobblin-cluster/build.gradle
@@ -61,7 +61,7 @@ dependencies {
 }
 
 task testJar(type: Jar, dependsOn: testClasses) {
-  baseName = "test-${project.archivesBaseName}"
+  baseName = "${project.archivesBaseName}-test"
   from sourceSets.test.output
 }
 
@@ -85,11 +85,11 @@ configurations {
     }
   }
 }
-
+// Generates a maven test artifact (gobblin-cluster-test)
 project.publishing {
   publications {
     testsPub(MavenPublication) {
-      artifactId "test-${project.archivesBaseName}"
+      artifactId "${project.archivesBaseName}-test"
       artifacts = [testJar]
       pom pomAttributes
       pom.withXml addRuntimeDependenciesToPom
diff --git a/gobblin-modules/gobblin-elasticsearch-deps/build.gradle b/gobblin-modules/gobblin-elasticsearch-deps/build.gradle
index 5a8e00b..cc0ae24 100644
--- a/gobblin-modules/gobblin-elasticsearch-deps/build.gradle
+++ b/gobblin-modules/gobblin-elasticsearch-deps/build.gradle
@@ -42,10 +42,27 @@ configurations {
     exclude group: "com.sun.jersey.contribs"
   }
 }
-
+// changed classifier of shadow Jar to ""
+// to make it the main jar since shadow jar is only used
+// This will override the main jar on ./gradlew build
 shadowJar {
   zip64 true
+  classifier ""
   relocate 'com.google.common', 'shadow.gobblin.elasticsearch.com.google.common'
 }
 
+// assigning a different classifier to the main jar
+// so that it does not override the shadow jar
+jar {
+  classifier "thin"
+}
+
+publishing.publications {
+  shadowPub(MavenPublication) {
+    artifacts = [shadowJar]
+    pom pomAttributes
+    pom.withXml addRuntimeDependenciesToPom
+  }
+}
+project.bintray.publications = ["shadowPub"]
 ext.classification="library"
diff --git a/gobblin-modules/gobblin-orc-dep/build.gradle b/gobblin-modules/gobblin-orc-dep/build.gradle
index 5fb43eb..a1647b8 100644
--- a/gobblin-modules/gobblin-orc-dep/build.gradle
+++ b/gobblin-modules/gobblin-orc-dep/build.gradle
@@ -71,14 +71,12 @@ jar {
   classifier "thin"
 }
 
-publishing {
-  publications {
+publishing.publications {
     shadowPub(MavenPublication) {
       artifacts = [shadowJar]
       pom pomAttributes
       pom.withXml addRuntimeDependenciesToPom
     }
-  }
 }
 project.bintray.publications = ["shadowPub"]
 
diff --git a/gradle/scripts/bintrayPublishing.gradle b/gradle/scripts/bintrayPublishing.gradle
index 902727f..9f8780f 100644
--- a/gradle/scripts/bintrayPublishing.gradle
+++ b/gradle/scripts/bintrayPublishing.gradle
@@ -60,7 +60,7 @@ subprojects{
             def dependenciesNode = it.asNode().dependencies[0]
             def removed = [] as Set; def added = [] //helps auditing
             configurations.runtime.allDependencies.each { d ->
-              def confToPom = ['restClient': 'rest-client', 'dataTemplate': 'data-template']
+              def confToPom = ['restClient': 'rest-client', 'dataTemplate': 'data-template', 'tests': 'test']
               if (d instanceof ProjectDependency && confToPom.containsKey(d.targetConfiguration)) {
                 boolean dependsOnMainModule = configurations.runtime.allDependencies.any {
                   it.name == d.name && it.targetConfiguration == 'default'