svn commit: r1805410 - in /maven/shared/trunk/maven-jarsigner: pom.xml src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java

[olamy]

Author: olamy
Date: Fri Aug 18 12:30:12 2017
New Revision: 1805410

URL: http://svn.apache.org/viewvc?rev=1805410&view=rev
Log:
merge pr #24 fixes #24 Thanks Oleg Nenashev

Modified:
    maven/shared/trunk/maven-jarsigner/pom.xml
    
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
    
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java

Modified: maven/shared/trunk/maven-jarsigner/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/pom.xml?rev=1805410&r1=1805409&r2=1805410&view=diff
==============================================================================
--- maven/shared/trunk/maven-jarsigner/pom.xml (original)
+++ maven/shared/trunk/maven-jarsigner/pom.xml Fri Aug 18 12:30:12 2017
@@ -61,15 +61,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-shared-utils</artifactId>
-      <!--
-      https://issues.apache.org/jira/browse/MSHARED-617
-      https://issues.apache.org/jira/browse/MSHARED-618
-      https://issues.apache.org/jira/browse/MSHARED-619
-      https://issues.apache.org/jira/browse/MSHARED-620
-      https://issues.apache.org/jira/browse/MSHARED-621
-      https://issues.apache.org/jira/browse/MSHARED-622
-      -->
-      <version>3.2.0-SNAPSHOT</version>
+      <version>3.2.0</version>
     </dependency>
 
     <dependency>

Modified: 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java?rev=1805410&r1=1805409&r2=1805410&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
 (original)
+++ 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerCommandLineBuilder.java
 Fri Aug 18 12:30:12 2017
@@ -211,6 +211,13 @@ public class JarSignerCommandLineBuilder
             cli.createArg().setValue( "-signedjar" );
             cli.createArg().setValue( signedjar.getAbsolutePath() );
         }
+        
+        final File certchain = request.getCertchain();
+        if ( certchain != null )
+        {
+            cli.createArg().setValue( "-certchain" );
+            cli.createArg().setValue( certchain.getAbsolutePath() );
+        }
     }
 
     protected void build( JarSignerVerifyRequest request, Commandline cli )

Modified: 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java?rev=1805410&r1=1805409&r2=1805410&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
 (original)
+++ 
maven/shared/trunk/maven-jarsigner/src/main/java/org/apache/maven/shared/jarsigner/JarSignerSignRequest.java
 Fri Aug 18 12:30:12 2017
@@ -57,6 +57,13 @@ public class JarSignerSignRequest
      */
     protected File signedjar;
 
+    /**
+     * Location of the extra certchain file to be used during signing.
+     * 
+     * See <a 
href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/jarsigner.html#Options";>options</a>.
+     * @since TODO
+     */
+    protected File certchain;
 
     public String getKeypass()
     {
@@ -108,4 +115,23 @@ public class JarSignerSignRequest
         this.signedjar = signedjar;
     }
 
+    /**
+     * Sets certchain to be used.
+     * 
+     * @param certchain Cert Chain file path or {@code null} to remove the 
option
+     * @since TODO
+     */
+    public void setCertchain( File certchain )
+    {
+        this.certchain = certchain;
+    }
+
+    /**
+     * Get certificate chain.
+     * @return Path to the certificate chain file or {@code null} if undefined
+     */
+    public File getCertchain()
+    {
+        return certchain;
+    }
 }