From e598df7e3ccb4543d02e7d4b9c524d3f471228cd Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Wed, 6 Nov 2024 22:46:45 -0500
Subject: [PATCH] Remove antlr from dependency from java-core pom (#33030)

* Remove antlr from dependency of jaca-core pom

* Fix to use java-core shadowjar as source to build direct-runner-java
---
 runners/direct-java/build.gradle | 22 ++++++++++++----------
 sdks/java/core/build.gradle      |  1 -
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle
index c357b8a04328..404b864c9c31 100644
--- a/runners/direct-java/build.gradle
+++ b/runners/direct-java/build.gradle
@@ -22,12 +22,12 @@ plugins { id 'org.apache.beam.module' }
 // Shade away runner execution utilities till because this causes ServiceLoader conflicts with
 // TransformPayloadTranslatorRegistrar amongst other runners. This only happens in the DirectRunner
 // because it is likely to appear on the classpath of another runner.
-def dependOnProjects = [
-                        ":runners:core-java",
-                        ":runners:local-java",
-                        ":runners:java-fn-execution",
-                        ":sdks:java:core",
-                        ]
+def dependOnProjectsAndConfigs = [
+        ":runners:core-java":null,
+        ":runners:local-java":null,
+        ":runners:java-fn-execution":null,
+        ":sdks:java:core":"shadow",
+]
 
 applyJavaNature(
         automaticModuleName: 'org.apache.beam.runners.direct',
@@ -36,8 +36,8 @@ applyJavaNature(
         ],
         shadowClosure: {
           dependencies {
-            dependOnProjects.each {
-              include(project(path: it, configuration: "shadow"))
+            dependOnProjectsAndConfigs.each {
+              include(project(path: it.key, configuration: "shadow"))
             }
           }
         },
@@ -63,8 +63,10 @@ configurations {
 dependencies {
   shadow library.java.vendored_guava_32_1_2_jre
   shadow project(path: ":model:pipeline", configuration: "shadow")
-  dependOnProjects.each {
-    implementation project(it)
+  dependOnProjectsAndConfigs.each {
+    // For projects producing shadowjar, use the packaged jar as dependency to
+    // handle redirected packages from it
+    implementation project(path: it.key, configuration: it.value)
   }
   shadow library.java.vendored_grpc_1_60_1
   shadow library.java.joda_time
diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
index e150c22de62d..07144c8de053 100644
--- a/sdks/java/core/build.gradle
+++ b/sdks/java/core/build.gradle
@@ -81,7 +81,6 @@ dependencies {
   shadow library.java.vendored_grpc_1_60_1
   shadow library.java.vendored_guava_32_1_2_jre
   shadow library.java.byte_buddy
-  shadow library.java.antlr_runtime
   shadow library.java.commons_compress
   shadow library.java.commons_lang3
   testImplementation library.java.mockito_inline