Author: dennisl
Date: Thu Jan 15 19:05:05 2015
New Revision: 1652229
URL: http://svn.apache.org/r1652229
Log:
[MPGP-31] Fix some typos
Modified:
maven/plugins/trunk/maven-gpg-plugin/src/it/sign-with-passphase-from-maven-settings/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/src/it/sign-with-passphase-from-maven-settings/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-gpg-plugin/src/it/sign-with-passphase-from-maven-settings/pom.xml?rev=1652229&r1=1652228&r2=1652229&view=diff
==============================================================================
---
maven/plugins/trunk/maven-gpg-plugin/src/it/sign-with-passphase-from-maven-settings/pom.xml
(original)
+++
maven/plugins/trunk/maven-gpg-plugin/src/it/sign-with-passphase-from-maven-settings/pom.xml
Thu Jan 15 19:05:05 2015
@@ -47,7 +47,7 @@ under the License.
<artifactId>maven-gpg-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <!-- load passphase from settings.xml -->
+ <!-- load passphrase from settings.xml -->
</configuration>
<executions>
<execution>
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=1652229&r1=1652228&r2=1652229&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
Thu Jan 15 19:05:05 2015
@@ -59,7 +59,7 @@ public abstract class AbstractGpgMojo
private String passphrase;
/**
- * Server id to lookup the passphase under Maven settings.
+ * Server id to lookup the passphrase under Maven settings.
* @since 1.6
*/
@Parameter( property = "gpg.passphraseServerId", defaultValue =
"gpg.passphrase" )
@@ -204,7 +204,7 @@ public abstract class AbstractGpgMojo
}
/**
- * Load and decrypt gpg passphase from maven settings if not given from
plugin configuration
+ * Load and decrypt gpg passphrase from Maven settings if not given from
plugin configuration
*
* @throws MojoFailureException
*/
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=1652229&r1=1652228&r2=1652229&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 Thu Jan 15
19:05:05 2015
@@ -79,9 +79,9 @@ mvn release:perform -Darguments=-Dgpg.pa
unfortunately not automatically propagated to the forked Maven session (see
also {{{http://jira.codehaus.org/browse/MGPG-9}MGPG-9}}).
-* Configure passphase under settings.xml
+* Configure passphrase in settings.xml
- Instead of specifying the passphrase at command line, you can place it under
your local settings.xml
+ Instead of specifying the passphrase on the command line, you can place it
in your local <<<settings.xml>>>
either in clear or
{{{http://maven.apache.org/guides/mini/guide-encryption.html}encrypted}} text.
+----------+
@@ -97,10 +97,10 @@ mvn release:perform -Darguments=-Dgpg.pa
</settings>
+----------+
-* Configure passphase under settings.xml with a keyname
+* Configure passphrase in settings.xml with a keyname
To allow discovery of keyname and passphrase at build time, configure this
plugin to map both <keyname> and <passphraseServerId> to
- a fixed property
+ a fixed property.
+----------+
@@ -133,7 +133,7 @@ mvn release:perform -Darguments=-Dgpg.pa
+----------+
- and use local settings.xml to discover the passphrase via the key name
+ and use local <<<settings.xml>>> to discover the passphrase via the keyname
+----------+
<settings>
@@ -157,6 +157,5 @@ mvn release:perform -Darguments=-Dgpg.pa
</properties>
</profile>
<profiles>
-
</settings>
-+----------+
\ No newline at end of file
++----------+
