HADOOP-13996. Fix some release build issues, include gpg timeout and disable sign for hadoop-dist. Contributed by Andrew Wang.
This commit is contained in:
parent
9016614eb1
commit
98759b426c
|
@ -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
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
Loading…
Reference in New Issue