Author: tchemit
Date: Tue Jul 10 11:55:56 2012
New Revision: 1359622
URL: http://svn.apache.org/viewvc?rev=1359622&view=rev
Log:
[MJARSIGNER-25] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
Modified: maven/plugins/trunk/maven-jarsigner-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/pom.xml?rev=1359622&r1=1359621&r2=1359622&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Tue Jul 10 11:55:56 2012
@@ -80,6 +80,12 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>2.0.0</version>
@@ -92,6 +98,35 @@ under the License.
</dependencies>
+ <build>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>run-its</id>
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1359622&r1=1359621&r2=1359622&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
Tue Jul 10 11:55:56 2012
@@ -22,6 +22,8 @@ package org.apache.maven.plugins.jarsign
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.jarsigner.JarSigner;
import org.apache.maven.shared.jarsigner.JarSignerException;
@@ -54,32 +56,29 @@ public abstract class AbstractJarsignerM
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.verbose}" default-value="false"
*/
+ @Parameter( property = "jarsigner.verbose", defaultValue = "false" )
private boolean verbose;
/**
* The maximum memory available to the JAR signer, e.g. <code>256M</code>.
See <a
*
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/java.html#Xms";>-Xmx</a>
for more details.
- *
- * @parameter expression="${jarsigner.maxMemory}"
*/
+ @Parameter( property = "jarsigner.maxMemory" )
private String maxMemory;
/**
* Archive to process. If set, neither the project artifact nor any
attachments or archive sets are processed.
- *
- * @parameter expression="${jarsigner.archive}"
*/
+ @Parameter( property = "jarsigner.archive" )
private File archive;
/**
* The base directory to scan for JAR files using Ant-like
inclusion/exclusion patterns.
*
- * @parameter expression="${jarsigner.archiveDirectory}"
* @since 1.1
*/
+ @Parameter( property = "jarsigner.archiveDirectory" )
private File archiveDirectory;
/**
@@ -87,97 +86,92 @@ public abstract class AbstractJarsignerM
* directory given by the parameter {@link #archiveDirectory}. By default,
the pattern
* <code>**/*.?ar</code> is used.
*
- * @parameter
* @since 1.1
*/
+ @Parameter
private String[] includes = { "**/*.?ar" };
/**
* The Ant-like exclusion patterns used to exclude JAR files from
processing. The patterns must be relative to the
* directory given by the parameter {@link #archiveDirectory}.
*
- * @parameter
* @since 1.1
*/
+ @Parameter
private String[] excludes = { };
/**
* List of additional arguments to append to the jarsigner command line.
- *
- * @parameter expression="${jarsigner.arguments}"
*/
+ @Parameter( property = "jarsigner.arguments" )
private String[] arguments;
/**
* Set to {@code true} to disable the plugin.
- *
- * @parameter expression="${jarsigner.skip}" default-value="false"
*/
+ @Parameter( property = "jarsigner.skip", defaultValue = "false" )
private boolean skip;
/**
* Controls processing of the main artifact produced by the project.
*
- * @parameter expression="${jarsigner.processMainArtifact}"
default-value="true"
* @since 1.1
*/
+ @Parameter( property = "jarsigner.processMainArtifact", defaultValue =
"true" )
private boolean processMainArtifact;
/**
* Controls processing of project attachments. If enabled, attached
artifacts that are no JAR/ZIP files will be
* automatically excluded from processing.
*
- * @parameter expression="${jarsigner.processAttachedArtifacts}"
default-value="true"
* @since 1.1
*/
+ @Parameter( property = "jarsigner.processAttachedArtifacts", defaultValue
= "true" )
private boolean processAttachedArtifacts;
/**
* Controls processing of project attachments.
*
- * @parameter expression="${jarsigner.attachments}"
* @deprecated As of version 1.1 in favor of the new parameter
<code>processAttachedArtifacts</code>.
*/
+ @Parameter( property = "jarsigner.attachments" )
private Boolean attachments;
/**
* A set of artifact classifiers describing the project attachments that
should be processed. This parameter is only
* relevant if {@link #processAttachedArtifacts} is <code>true</code>. If
empty, all attachments are included.
*
- * @parameter
* @since 1.2
*/
+ @Parameter
private String[] includeClassifiers;
/**
* A set of artifact classifiers describing the project attachments that
should not be processed. This parameter is
* only relevant if {@link #processAttachedArtifacts} is
<code>true</code>. If empty, no attachments are excluded.
*
- * @parameter
* @since 1.2
*/
+ @Parameter
private String[] excludeClassifiers;
/**
* The Maven project.
- *
- * @parameter default-value="${project}"
- * @required
- * @readonly
*/
+ @Component
private MavenProject project;
/**
* Location of the working directory.
*
- * @parameter default-value="${project.basedir}"
* @since 1.3
*/
+ @Parameter( defaultValue = "${project.basedir}" )
private File workingDirectory;
/**
- * @component
*/
+ @Component
private JarSigner jarSigner;
public final void execute()
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java?rev=1359622&r1=1359621&r2=1359622&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerSignMojo.java
Tue Jul 10 11:55:56 2012
@@ -20,6 +20,9 @@ package org.apache.maven.plugins.jarsign
*/
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.shared.jarsigner.JarSignerRequest;
import org.apache.maven.shared.jarsigner.JarSignerSignRequest;
import org.apache.maven.shared.jarsigner.JarSignerUtil;
@@ -34,85 +37,74 @@ import java.io.IOException;
*
* @author <a href="c...@schulte.it">Christian Schulte</a>
* @version $Id$
- * @goal sign
- * @phase package
* @since 1.0
*/
+@Mojo( name = "sign", defaultPhase = LifecyclePhase.PACKAGE )
public class JarsignerSignMojo
extends AbstractJarsignerMojo
{
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.keystore}"
*/
+ @Parameter( property = "jarsigner.keystore" )
private String keystore;
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.storepass}"
*/
+ @Parameter( property = "jarsigner.storepass" )
private String storepass;
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.keypass}"
*/
+ @Parameter( property = "jarsigner.keypass" )
private String keypass;
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.sigfile}"
*/
+ @Parameter( property = "jarsigner.sigfile" )
private String sigfile;
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.storetype}"
*/
+ @Parameter( property = "jarsigner.storetype" )
private String storetype;
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.providerName}"
*/
+ @Parameter( property = "jarsigner.providerName" )
private String providerName;
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.providerClass}"
*/
+ @Parameter( property = "jarsigner.providerClass" )
private String providerClass;
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.providerArg}"
*/
+ @Parameter( property = "jarsigner.providerArg" )
private String providerArg;
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.alias}"
- * @required
*/
+ @Parameter( property = "jarsigner.alias", required = true )
private String alias;
/**
* Indicates whether existing signatures should be removed from the
processed JAR files prior to signing them. If
* enabled, the resulting JAR will appear as being signed only once.
*
- * @parameter expression="${jarsigner.removeExistingSignatures}"
default-value="false"
* @since 1.1
*/
+ @Parameter( property = "jarsigner.removeExistingSignatures", defaultValue
= "false" )
private boolean removeExistingSignatures;
protected String getCommandlineInfo( final Commandline commandLine )
Modified:
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java?rev=1359622&r1=1359621&r2=1359622&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
(original)
+++
maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/JarsignerVerifyMojo.java
Tue Jul 10 11:55:56 2012
@@ -19,6 +19,9 @@ package org.apache.maven.plugins.jarsign
* under the License.
*/
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.shared.jarsigner.JarSignerRequest;
import org.apache.maven.shared.jarsigner.JarSignerVerifyRequest;
@@ -29,19 +32,17 @@ import java.io.File;
*
* @author <a href="c...@schulte.it">Christian Schulte</a>
* @version $Id$
- * @goal verify
- * @phase verify
* @since 1.0
*/
+@Mojo( name = "verify", defaultPhase = LifecyclePhase.VERIFY )
public class JarsignerVerifyMojo
extends AbstractJarsignerMojo
{
/**
* See <a
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
- *
- * @parameter expression="${jarsigner.certs}" default-value="false"
*/
+ @Parameter( property = "jarsigner.certs", defaultValue = "false" )
private boolean certs;
protected JarSignerRequest createRequest( File archive )
