Author: dantran
Date: Tue Jan 13 17:31:19 2015
New Revision: 1651418
URL: http://svn.apache.org/r1651418
Log:
[MGPG-31] rename passphraseServerKey to passphraseServerId. Back to
1.6-SNAPSHOT for re-vote
Modified:
maven/plugins/trunk/maven-gpg-plugin/pom.xml
maven/plugins/trunk/maven-gpg-plugin/src/main/java/org/apache/maven/plugin/gpg/AbstractGpgMojo.java
maven/plugins/trunk/maven-gpg-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-gpg-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/pom.xml?rev=1651418&r1=1651417&r2=1651418&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-gpg-plugin/pom.xml Tue Jan 13 17:31:19 2015
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.7-SNAPSHOT</version>
+ <version>1.6-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven GPG Plugin</name>
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=1651418&r1=1651417&r2=1651418&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
Tue Jan 13 17:31:19 2015
@@ -62,8 +62,8 @@ public abstract class AbstractGpgMojo
* Server id to lookup the passphase under Maven settings.
* @since 1.6
*/
- @Parameter( property = "gpg.passphraseServerKey", defaultValue =
"gpg.passphrase" )
- private String passphraseServerKey;
+ @Parameter( property = "gpg.passphraseServerId", defaultValue =
"gpg.passphrase" )
+ private String passphraseServerId;
/**
* The "name" of the key to sign with. Passed to gpg as
<code>--local-user</code>.
@@ -213,7 +213,7 @@ public abstract class AbstractGpgMojo
{
if ( StringUtils.isEmpty( this.passphrase ) )
{
- Server server = this.settings.getServer( passphraseServerKey );
+ Server server = this.settings.getServer( passphraseServerId );
if ( server != null )
{
Modified: maven/plugins/trunk/maven-gpg-plugin/src/site/apt/usage.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/site/apt/usage.apt.vm?rev=1651418&r1=1651417&r2=1651418&view=diff
==============================================================================
--- maven/plugins/trunk/maven-gpg-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-gpg-plugin/src/site/apt/usage.apt.vm Tue Jan 13
17:31:19 2015
@@ -99,7 +99,7 @@ mvn release:perform -Darguments=-Dgpg.pa
* Configure passphase under settings.xml with a keyname
- To allow discovery of keyname and passphrase at build time, configure this
plugin to map both <keyname> and <passphraseServerKey> to
+ To allow discovery of keyname and passphrase at build time, configure this
plugin to map both <keyname> and <passphraseServerId> to
a fixed property
@@ -121,7 +121,7 @@ mvn release:perform -Darguments=-Dgpg.pa
</goals>
<configuration>
<keyname>${gpg.keyname}</keyname>
- <passphraseServerKey>${gpg.keyname}</passphraseServerKey>
+ <passphraseServerId>${gpg.keyname}</passphraseServerId>
</configuration>
</execution>
</executions>
