From 83db004837361103b20c8538dbca0cfefd0692f4 Mon Sep 17 00:00:00 2001 From: Jihun Cho Date: Fri, 1 Feb 2019 11:02:16 -0800 Subject: [PATCH] alts: fix missing dependencies (#5307) fix missing dependencies for grpc-alts by using java plugin --- alts/build.gradle | 3 +++ build.gradle | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/alts/build.gradle b/alts/build.gradle index ab0013957e..6b619ba762 100644 --- a/alts/build.gradle +++ b/alts/build.gradle @@ -80,7 +80,10 @@ shadowJar { publishing { publications { maven(MavenPublication) { + // use shadowJar and remove the original Jar artifact shadowJar + def originalJar = artifacts.find { dep -> dep.classifier == 'original'} + artifacts.remove(originalJar) pom.withXml { // Swap our dependency to grpc-netty-shaded. Projects depending on this via diff --git a/build.gradle b/build.gradle index 330d1a4f91..c4848bbca9 100644 --- a/build.gradle +++ b/build.gradle @@ -343,8 +343,7 @@ subprojects { publications { // do not use mavenJava, as java plugin will modify it via "magic" maven(MavenPublication) { - if (!project.name.contains("grpc-netty-shaded") && !name.contains("grpc-alts") - && !name.contains("grpc-compiler")) { + if (project.name != 'grpc-netty-shaded') { from components.java }