From ac8908ec7f7a237124c2031eed7b14804909a1ce Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Fri, 23 Jun 2023 12:16:30 -0700
Subject: [PATCH] xds: Plumb thirdparty classes through sourceSet instead of
 jar

Plumbing through sourceSet lets cross-project dependencies work the same
way as artifacts published to Maven. This fixes an issue for
interop-testing where build/install would include all the raw files from
thirdparty in addition to the grpc-xds.jar. For example:
build/install/grpc-interop-testing/lib/com/github/xds/data/orca/v3/OrcaLoadReport$1.class

b/288577812
---
 xds/build.gradle | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/xds/build.gradle b/xds/build.gradle
index 538aa61269..d284c3bb4e 100644
--- a/xds/build.gradle
+++ b/xds/build.gradle
@@ -24,6 +24,9 @@ sourceSets {
             srcDir 'third_party/istio/src/main/proto'
         }
     }
+    main {
+        output.classesDirs.from(sourceSets.thirdparty.output.classesDirs)
+    }
     test {
         java {
             srcDir "${projectDir}/third_party/zero-allocation-hashing/test/java"
@@ -42,7 +45,7 @@ dependencies {
     thirdpartyImplementation project(':grpc-protobuf'),
             project(':grpc-stub'),
             libraries.opencensus.proto
-    implementation sourceSets.thirdparty.output
+    compileOnly sourceSets.thirdparty.output
     implementation project(':grpc-stub'),
             project(':grpc-core'),
             project(':grpc-services'),
@@ -137,7 +140,6 @@ tasks.named("compileJava").configure {
 
 tasks.named("jar").configure {
     archiveClassifier = 'original'
-    from sourceSets.thirdparty.output
 }
 
 tasks.named("javadoc").configure {
@@ -236,10 +238,6 @@ publishing {
             pom.withXml {
                 def dependenciesNode = new Node(null, 'dependencies')
                 project.configurations.pomDeps.allDependencies.each { dep ->
-                    if (dep.group == null && dep.name == 'unspecified') {
-                        // Ignore the thirdparty self-dependency
-                        return;
-                    }
                     def dependencyNode = dependenciesNode.appendNode('dependency')
                     dependencyNode.appendNode('groupId', dep.group)
                     dependencyNode.appendNode('artifactId', dep.name)