From ac4c448c3292e9f55643345638b4af2eed45a32f Mon Sep 17 00:00:00 2001
From: John Ed Quinn <johqunn@amazon.com>
Date: Mon, 4 Nov 2024 16:07:04 -0800
Subject: [PATCH] Fixes build failure

---
 partiql-ast/build.gradle.kts  | 12 +++---------
 partiql-eval/build.gradle.kts |  5 +++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/partiql-ast/build.gradle.kts b/partiql-ast/build.gradle.kts
index 3303ef482..7d99c0b8c 100644
--- a/partiql-ast/build.gradle.kts
+++ b/partiql-ast/build.gradle.kts
@@ -28,15 +28,9 @@ dependencies {
     annotationProcessor(Deps.lombok)
 }
 
-tasks.shadowJar {
-    configurations = listOf(project.configurations.shadow.get())
-}
-
-// Workaround for https://github.com/johnrengelman/shadow/issues/651
-components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
-    c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {
-        skip()
-    }
+// TODO: Figure out why this is needed.
+tasks.withType<Jar> {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 tasks.shadowJar {
diff --git a/partiql-eval/build.gradle.kts b/partiql-eval/build.gradle.kts
index 90a93b1ba..14a036a90 100644
--- a/partiql-eval/build.gradle.kts
+++ b/partiql-eval/build.gradle.kts
@@ -47,6 +47,11 @@ tasks.shadowJar {
     configurations = listOf(project.configurations.shadow.get())
 }
 
+// TODO: Figure out why this is needed.
+tasks.withType<Jar> {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 // Workaround for https://github.com/johnrengelman/shadow/issues/651
 components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
     c.withVariantsFromConfiguration(project.configurations.shadowRuntimeElements.get()) {