From a325bb465ca8c5f4da7993db06e1a2f3174628ee Mon Sep 17 00:00:00 2001
From: Zbigniew Halas <zbigniew@sumologic.com>
Date: Tue, 30 Jun 2020 00:00:02 +0200
Subject: [PATCH] Fix publising to Nexus (#722) (#725)

This consolidates publishing shadow artifact and the rest into a single task.
The problem was that shadow publishing task was trying to publish its own POM
and that POM was messing up with the main POM.

Signed-off-by: Zbigniew Halas <zbigniew@sumologic.com>
---
 gradle/publish.gradle      |  3 +++
 jaeger-thrift/build.gradle | 14 --------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 6233ca900..f1e322c44 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -19,6 +19,9 @@ publishing {
             from components.java
             artifact sourcesJar
             artifact javadocJar
+            project.plugins.withId('com.github.johnrengelman.shadow') {
+                artifact project.tasks.shadowJar
+            }
 
             pom {
                 name = 'jaeger-client'
diff --git a/jaeger-thrift/build.gradle b/jaeger-thrift/build.gradle
index 305ea9812..0376a5fb7 100644
--- a/jaeger-thrift/build.gradle
+++ b/jaeger-thrift/build.gradle
@@ -80,17 +80,3 @@ artifacts {
     }
     tests testJar
 }
-
-publishing {
-    publications {
-        shadow(MavenPublication) { publication ->
-            project.shadow.component(publication)
-        }
-    }
-}
-
-signing {
-    if (isReleaseVersion) {
-        sign publishing.publications.shadow
-    }
-}