From 98759b426c9aef2304c937fddba02c4d21177dbb Mon Sep 17 00:00:00 2001
From: Junping Du <junping_du@apache.org>
Date: Thu, 6 Apr 2017 13:06:10 -0700
Subject: [PATCH] HADOOP-13996. Fix some release build issues, include gpg
 timeout and disable sign for hadoop-dist. Contributed by Andrew Wang.

---
 dev-support/bin/create-release |  5 ++++-
 hadoop-dist/pom.xml            | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release
index 473aab32fd9..64bd02ad400 100755
--- a/dev-support/bin/create-release
+++ b/dev-support/bin/create-release
@@ -249,7 +249,7 @@ function startgpgagent
   if [[ "${SIGN}" = true ]]; then
     if [[ -n "${GPGAGENT}" && -z "${GPG_AGENT_INFO}" ]]; then
       echo "starting gpg agent"
-      echo "default-cache-ttl 7200" > "${LOGDIR}/gpgagent.conf"
+      echo "default-cache-ttl 14400" > "${LOGDIR}/gpgagent.conf"
       # shellcheck disable=2046
       eval $("${GPGAGENT}" --daemon \
         --options "${LOGDIR}/gpgagent.conf" \
@@ -506,6 +506,9 @@ function makearelease
 
   mkdir -p "${LOGDIR}"
 
+  # Install the Hadoop maven plugins first
+  run_and_redirect "${LOGDIR}/mvn_install_maven_plugins.log" "${MVN}" "${MVN_ARGS[@]}" -pl hadoop-maven-plugins -am clean install
+
   # mvn clean for sanity
   run_and_redirect "${LOGDIR}/mvn_clean.log" "${MVN}" "${MVN_ARGS[@]}" clean
 
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index b7d56d8d712..3cbfbf6a90b 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -68,6 +68,24 @@
         <configuration>
         </configuration>
       </plugin>
+
+      <!--
+           The "dist" profile automatically attaches many artifacts
+           to the module.
+
+           Disable these, since we are only concerned with assembling
+           the dist layout.
+      -->
+      <!-- Disable the sign plugin, since there isn't anything to sign -->
+      <plugin>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>never</phase>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>