You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/04/06 17:20:11 UTC

[maven-gpg-plugin] branch MGPG-59 updated: Improve docs and logging

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

rfscholte pushed a commit to branch MGPG-59
in repository https://gitbox.apache.org/repos/asf/maven-gpg-plugin.git


The following commit(s) were added to refs/heads/MGPG-59 by this push:
     new ea85659  Improve docs and logging
ea85659 is described below

commit ea8565959676ff76b384c868c6e06d502ed11032
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Apr 6 19:20:00 2019 +0200

    Improve docs and logging
---
 src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java | 8 +++++---
 src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java       | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java b/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
index b46aff1..cb61615 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
+++ b/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
@@ -102,10 +102,12 @@ public abstract class AbstractGpgMojo
     private boolean defaultKeyring;
 
     /**
-     * The path to a secret keyring to add to the list of keyrings. By default, only the {@code secring.gpg} from gpg's
-     * home directory is considered. Use this option (in combination with {@link #publicKeyring} and
+     * <p>The path to a secret keyring to add to the list of keyrings. By default, only the {@code secring.gpg} from 
+     * gpg's home directory is considered. Use this option (in combination with {@link #publicKeyring} and
      * {@link #defaultKeyring} if required) to use a different secret key. <em>Note:</em> Relative paths are resolved
-     * against gpg's home directory, not the project base directory.
+     * against gpg's home directory, not the project base directory.</p>
+     * <strong>NOTE: </strong>As of gpg 2.1 this is an obsolete option and ignored. All secret keys are stored in the
+     * ‘private-keys-v1.d’ directory below the GnuPG home directory.
      *
      * @since 1.2
      */
diff --git a/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java b/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
index 641706e..0fb63a8 100644
--- a/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
+++ b/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
@@ -69,6 +69,8 @@ public class GpgSigner
         GpgVersionParser versionParser = GpgVersionParser.parse( executable );
         
         GpgVersion gpgVersion = versionParser.getGpgVersion();
+        
+        getLog().debug( gpgVersion.toString() );
 
         if ( args != null )
         {