[MGPG-112] serverId def value was unintentionally dropped (#80)

That caused that settings.xml could not deliver GPG passphrase as it was set up in setup-java. Plus, related IT was neutered and it did not do what it was supposed to do. This yields 3.2.1 release as 3.2.0 broke pw pickup from settings.xml --- https://issues.apache.org/jira/browse/MGPG-112
apache · Mar 15, 2024 · 75d8ed5 · 75d8ed5
1 parent 2a11a2d
commit 75d8ed5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -274,9 +274,6 @@ under the License.
                 <goal>clean</goal>
                 <goal>install</goal>
               </goals>
-              <properties>
-                <gpg.homedir>${project.build.testOutputDirectory}/gnupg</gpg.homedir>
-              </properties>
             </configuration>
             <executions>
               <execution>
@@ -299,6 +296,7 @@ under the License.
                 <configuration>
                   <properties>
                     <gpg.signer>gpg</gpg.signer>
+                    <gpg.homedir>${project.build.testOutputDirectory}/gnupg</gpg.homedir>
                   </properties>
                 </configuration>
               </execution>

diff --git a/src/it/settings.xml b/src/it/settings.xml
@@ -23,4 +23,12 @@ under the License.
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
 
+    <servers>
+        <server>
+            <!-- is here only for sign-with-passphase-from-maven-settings IT -->
+            <id>gpg.passphrase-sign-with-passphase-from-maven-settings</id>
+            <passphrase>TEST</passphrase>
+        </server>
+    </servers>
+
 </settings>
diff --git a/src/it/sign-with-passphase-from-maven-settings/invoker.properties b/src/it/sign-with-passphase-from-maven-settings/invoker.properties
diff --git a/src/it/sign-with-passphase-from-maven-settings/pom.xml b/src/it/sign-with-passphase-from-maven-settings/pom.xml
@@ -22,7 +22,7 @@ under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.maven.its.gpg.nma</groupId>
+  <groupId>org.apache.maven.its.gpg.swpfmc</groupId>
   <artifactId>test</artifactId>
   <version>1.0</version>
   <packaging>jar</packaging>
@@ -48,6 +48,8 @@ under the License.
         <version>@project.version@</version>
         <configuration>
           <!-- load passphrase from settings.xml -->
+          <!-- but not the default -->
+          <passphraseServerId>gpg.passphrase-sign-with-passphase-from-maven-settings</passphraseServerId>
         </configuration>
         <executions>
           <execution>

diff --git a/src/it/sign-with-passphase-from-maven-settings/verify.groovy b/src/it/sign-with-passphase-from-maven-settings/verify.groovy
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-var artifactDir = new File(localRepositoryPath, "org/apache/maven/its/gpg/nma/test/1.0")
+var artifactDir = new File(localRepositoryPath, "org/apache/maven/its/gpg/swpfmc/test/1.0")
 
 var expectedFiles = [
     "test-1.0.pom",

diff --git a/src/main/java/org/apache/maven/plugins/gpg/AbstractGpgMojo.java b/src/main/java/org/apache/maven/plugins/gpg/AbstractGpgMojo.java
@@ -121,7 +121,7 @@ public abstract class AbstractGpgMojo extends AbstractMojo {
      * variables instead.
      **/
     @Deprecated
-    @Parameter(property = "gpg.passphrase")
+    @Parameter(property = GPG_PASSPHRASE)
     private String passphrase;
 
     /**
@@ -134,7 +134,7 @@ public abstract class AbstractGpgMojo extends AbstractMojo {
      * variables instead.
      **/
     @Deprecated
-    @Parameter(property = "gpg.passphraseServerId")
+    @Parameter(property = "gpg.passphraseServerId", defaultValue = GPG_PASSPHRASE)
     private String passphraseServerId;
 
     /**
@@ -392,7 +392,7 @@ private boolean isNotBlank(String string) {
 
     @Deprecated
     private String loadGpgPassphrase() throws MojoFailureException {
-        if (isNotBlank(passphrase)) {
+        if (isNotBlank(passphraseServerId)) {
             Server server = settings.getServer(passphraseServerId);
             if (server != null) {
                 if (isNotBlank(server.getPassphrase())) {

diff --git a/src/main/java/org/apache/maven/plugins/gpg/GpgSigner.java b/src/main/java/org/apache/maven/plugins/gpg/GpgSigner.java
@@ -178,6 +178,8 @@ protected void generateSignatureForFile(File file, File signature) throws MojoEx
         // Execute the command line
         // ----------------------------------------------------------------------------
 
+        getLog().debug("CMD: " + cmd);
+
         try {
             int exitCode = CommandLineUtils.executeCommandLine(cmd, in, new DefaultConsumer(), new DefaultConsumer());