Merge pull request #33479: [Release-2.62] cherry-pick #33472 into release branch (Make Beam expansion service shadowJar multi-release)

kennknowles · web-flow · commit 88f1f3c0f554 · 2025-01-03T12:57:56.000-05:00
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 }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,8 @@ task runExpansionService (type: JavaExec) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`shadowJar {`
	`51`	`+ manifest {`
	`52`	`+ attributes(["Multi-Release": true])`
	`53`	`+ }`
`51`	`54`	`outputs.upToDateWhen { false }`
`52`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ configurations.runtimeClasspath {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`shadowJar {`
	`37`	`+ manifest {`
	`38`	`+ attributes(["Multi-Release": true])`
	`39`	`+ }`
`37`	`40`	`mergeServiceFiles()`
`38`	`41`	`outputs.upToDateWhen { false }`
`39`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,8 @@ task runExpansionService (type: JavaExec) {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`shadowJar {`
	`52`	`+ manifest {`
	`53`	`+ attributes(["Multi-Release": true])`
	`54`	`+ }`
`52`	`55`	`outputs.upToDateWhen { false }`
`53`	`56`	`}`