Repository: hadoop Updated Branches: refs/heads/branch-2 9016614eb -> 98759b426
HADOOP-13996. Fix some release build issues, include gpg timeout and disable sign for hadoop-dist. Contributed by Andrew Wang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/98759b42 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/98759b42 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/98759b42 Branch: refs/heads/branch-2 Commit: 98759b426c9aef2304c937fddba02c4d21177dbb Parents: 9016614 Author: Junping Du <[email protected]> Authored: Thu Apr 6 13:06:10 2017 -0700 Committer: Junping Du <[email protected]> Committed: Thu Apr 6 13:06:10 2017 -0700 ---------------------------------------------------------------------- dev-support/bin/create-release | 5 ++++- hadoop-dist/pom.xml | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/98759b42/dev-support/bin/create-release ---------------------------------------------------------------------- diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release index 473aab3..64bd02a 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/98759b42/hadoop-dist/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml index b7d56d8..3cbfbf6 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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
