[beam] branch release-2.25.0 updated: Cherry-pick PR 13133 into release-2.25.0 branch

[robinyqiu]

This is an automated email from the ASF dual-hosted git repository.

robinyqiu pushed a commit to branch release-2.25.0
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/release-2.25.0 by this push:
     new 10d894a  Cherry-pick PR 13133 into release-2.25.0 branch
10d894a is described below

commit 10d894ae292eaf57849ff5e31640c63df44f3c63
Author: Yueyang Qiu <robiny...@gmail.com>
AuthorDate: Mon Oct 19 16:01:53 2020 -0700

    Cherry-pick PR 13133 into release-2.25.0 branch
---
 sdks/java/bom/build.gradle | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sdks/java/bom/build.gradle b/sdks/java/bom/build.gradle
index c6b0534..72327384 100644
--- a/sdks/java/bom/build.gradle
+++ b/sdks/java/bom/build.gradle
@@ -66,7 +66,15 @@ assemble.dependsOn copyPom
 // the pom.xml generation and have the publish tasks depend on `copyPom` 
instead.
 tasks.whenTaskAdded { task ->
   if (task.name == 'generatePomFileForMavenJavaPublication') {
-    task.enabled = false
+    // Ensures the pom file is signed later if we are performing a release 
(see BEAM-11068)
+    task.doLast {
+      copy {
+        from 'pom.xml.template'
+        into mavenJavaDir
+        rename 'pom.xml.template', 'pom-default.xml'
+        expand(version: project.version, modules: bomModuleNames)
+      }
+    }
   } else if (task.name.startsWith('publishMavenJavaPublication')) {
     task.dependsOn copyPom
   }