svn commit: r1541114 - in /maven/plugins/trunk/maven-jarsigner-plugin: ./ src/main/java/org/apache/maven/plugins/jarsigner/

[tchemit]

Author: tchemit
Date: Tue Nov 12 15:44:38 2013
New Revision: 1541114

URL: http://svn.apache.org/r1541114
Log:
MJARSIGNER-16 - Add the option -tsa to the configuration
MJARSIGNER-27 - Use maven-jarsigner 1.1 (migrates to maven-share-utils)
Add some missing @Override and @inheritDoc


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=1541114&r1=1541113&r2=1541114&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jarsigner-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/pom.xml Tue Nov 12 15:44:38 2013
@@ -87,9 +87,9 @@ under the License.
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.0.15</version>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-shared-utils</artifactId>
+      <version>0.3</version>
     </dependency>
     <dependency>
       <groupId>org.sonatype.plexus</groupId>

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=1541114&r1=1541113&r2=1541114&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 Nov 12 15:44:38 2013
@@ -30,9 +30,9 @@ import org.apache.maven.shared.jarsigner
 import org.apache.maven.shared.jarsigner.JarSignerRequest;
 import org.apache.maven.shared.jarsigner.JarSignerResult;
 import org.apache.maven.shared.jarsigner.JarSignerUtil;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.Commandline;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.cli.Commandline;
+import org.apache.maven.shared.utils.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;

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=1541114&r1=1541113&r2=1541114&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 Nov 12 15:44:38 2013
@@ -27,8 +27,8 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.shared.jarsigner.JarSignerRequest;
 import org.apache.maven.shared.jarsigner.JarSignerSignRequest;
 import org.apache.maven.shared.jarsigner.JarSignerUtil;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.Commandline;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.cli.Commandline;
 import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
 import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
 
@@ -111,11 +111,28 @@ public class JarsignerSignMojo
     private boolean removeExistingSignatures;
 
     /**
+     * See <a 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
+     *
+     * @since 1.3
+     */
+    @Parameter( property = "jarsigner.tsa" )
+    private String tsa;
+
+    /**
+     * See <a 
href="http://java.sun.com/javase/6/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
+     *
+     * @since 1.3
+     */
+    @Parameter( property = "jarsigner.tsacert" )
+    private String tsacert;
+
+    /**
      * @since 1.3
      */
     @Component( hint = "mng-4384")
     private SecDispatcher securityDispatcher;
 
+    @Override
     protected String getCommandlineInfo( final Commandline commandLine )
     {
         String commandLineInfo = commandLine != null ? commandLine.toString() 
: null;
@@ -129,6 +146,7 @@ public class JarsignerSignMojo
         return commandLineInfo;
     }
 
+    @Override
     protected void preProcessArchive( final File archive )
         throws MojoExecutionException
     {
@@ -145,6 +163,9 @@ public class JarsignerSignMojo
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
     protected JarSignerRequest createRequest( File archive )
         throws MojoExecutionException
     {
@@ -156,6 +177,8 @@ public class JarsignerSignMojo
         request.setProviderName( providerName );
         request.setSigfile( sigfile );
         request.setStoretype( storetype );
+        request.setTsaLocation( tsa );
+        request.setTsaAlias( tsacert );
 
         // Special handling for passwords through the Maven Security Dispatcher
         try

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=1541114&r1=1541113&r2=1541114&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 Nov 12 15:44:38 2013
@@ -45,6 +45,9 @@ public class JarsignerVerifyMojo
     @Parameter( property = "jarsigner.certs", defaultValue = "false" )
     private boolean certs;
 
+    /**
+     * {@inheritDoc}
+     */
     protected JarSignerRequest createRequest( File archive )
     {
         JarSignerVerifyRequest request = new JarSignerVerifyRequest();