Make Beam expansion service shadowJar multi-release so it processes m…

…ulti-release dependencies correctly
apache · Dec 31, 2024 · 94f3e01 · 94f3e01
1 parent 18ec331
commit 94f3e01
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1625,6 +1625,7 @@ class BeamModulePlugin implements Plugin<Project> {
             from "${project.rootProject.projectDir}/LICENSE"
             from "${project.rootProject.projectDir}/NOTICE"
           }
+
         } << configuration.shadowClosure)
 
         // Always configure the shadowTestJar archiveClassifier and merge service files.

diff --git a/sdks/java/extensions/sql/expansion-service/build.gradle b/sdks/java/extensions/sql/expansion-service/build.gradle
@@ -48,5 +48,8 @@ task runExpansionService (type: JavaExec) {
 }
 
 shadowJar {
+  manifest {
+    attributes(["Multi-Release": true])
+  }
   outputs.upToDateWhen { false }
 }
diff --git a/sdks/java/io/expansion-service/build.gradle b/sdks/java/io/expansion-service/build.gradle
@@ -34,6 +34,9 @@ configurations.runtimeClasspath {
 }
 
 shadowJar {
+  manifest {
+    attributes(["Multi-Release": true])
+  }
   mergeServiceFiles()
   outputs.upToDateWhen { false }
 }

diff --git a/sdks/java/io/google-cloud-platform/expansion-service/build.gradle b/sdks/java/io/google-cloud-platform/expansion-service/build.gradle
@@ -49,5 +49,8 @@ task runExpansionService (type: JavaExec) {
 }
 
 shadowJar {
+    manifest {
+        attributes(["Multi-Release": true])
+    }
   outputs.upToDateWhen { false }
 }