[tomcat] branch 8.5.x updated: Move GPG check to deploy-release target

[ma...@apache.org]

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

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 896cba0  Move GPG check to deploy-release target
896cba0 is described below

commit 896cba06bc10ca77a18542d5dfae27c398adce41
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Nov 11 16:47:24 2021 +0000

    Move GPG check to deploy-release target
    
    This allows snapshots to continue without GPG
---
 res/maven/mvn-pub.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index cbc39f6..ea67316 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -396,6 +396,7 @@
   </target>
 
   <target name="deploy-release">
+    <fail unless="gpg.exec.available">GPG is required, but was not found at ${gpg.exec}</fail>
     <antcall target="generic-deploy">
       <param name="maven.repo.repositoryId"
              value="${maven.asf.release.repo.repositoryId}"/>
@@ -409,7 +410,6 @@
 
   <target name="init-gpg-1">
     <available file="${gpg.exec}" property="gpg.exec.available"/>
-    <fail unless="gpg.exec.available">GPG is required, but was not found at ${gpg.exec}</fail>
   </target>
 
   <target name="init-gpg-2" if="${gpg.exec.available}">

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org