You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2013/08/10 14:35:16 UTC
svn commit: r1512676 - in
/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg:
AbstractGpgMojo.java GpgSignAttachedMojo.java GpgSigner.java
SignAndDeployFileMojo.java
Author: dennisl
Date: Sat Aug 10 12:35:16 2013
New Revision: 1512676
URL: http://svn.apache.org/r1512676
Log:
Start using the new super class, instead of the implementation specific GpgSigner. That requires that the implementation specific fields are initialized in the constructor.
Modified:
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java?rev=1512676&r1=1512675&r2=1512676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java Sat Aug 10 12:35:16 2013
@@ -107,12 +107,11 @@ public abstract class AbstractGpgMojo
@Parameter( property = "gpg.publicKeyring" )
private String publicKeyring;
- GpgSigner newSigner( MavenProject project )
+ AbstractGpgSigner newSigner( MavenProject project )
throws MojoExecutionException, MojoFailureException
{
- GpgSigner signer = new GpgSigner();
+ AbstractGpgSigner signer = new GpgSigner( executable );
- signer.setExecutable( executable );
signer.setInteractive( interactive );
signer.setKeyName( keyname );
signer.setUseAgent( useAgent );
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java?rev=1512676&r1=1512675&r2=1512676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSignAttachedMojo.java Sat Aug 10 12:35:16 2013
@@ -112,7 +112,7 @@ public class GpgSignAttachedMojo
}
excludes = newExcludes;
- GpgSigner signer = newSigner( project );
+ AbstractGpgSigner signer = newSigner( project );
// ----------------------------------------------------------------------------
// What we need to generateSignatureForArtifact here
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java?rev=1512676&r1=1512675&r2=1512676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/GpgSigner.java Sat Aug 10 12:35:16 2013
@@ -41,7 +41,7 @@ public class GpgSigner
{
private String executable;
- public void setExecutable( String executable )
+ public GpgSigner( String executable )
{
this.executable = executable;
}
Modified: maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java?rev=1512676&r1=1512675&r2=1512676&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/SignAndDeployFileMojo.java Sat Aug 10 12:35:16 2013
@@ -288,7 +288,7 @@ public class SignAndDeployFileMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- GpgSigner signer = newSigner( null );
+ AbstractGpgSigner signer = newSigner( null );
signer.setOutputDirectory( ascDirectory );
signer.setBaseDirectory( new File( "" ).getAbsoluteFile() );