[sling-whiteboard] 02/04: SLING-6585 - Switch to the ASF code signing service

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git

commit 9fc871e4db0ef518aae090f24702d42df42d5109
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Jan 15 16:40:47 2018 +0200

    SLING-6585 - Switch to the ASF code signing service
    
    Allow mojo parameters to be overridden by settings or CLI args.
    Also fix minor typo.
---
 .../java/org/apache/tomcat/buildutil/SignCodeMojo.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/codesign/src/main/java/org/apache/tomcat/buildutil/SignCodeMojo.java b/codesign/src/main/java/org/apache/tomcat/buildutil/SignCodeMojo.java
index 950dbd0..221f18b 100644
--- a/codesign/src/main/java/org/apache/tomcat/buildutil/SignCodeMojo.java
+++ b/codesign/src/main/java/org/apache/tomcat/buildutil/SignCodeMojo.java
@@ -93,19 +93,19 @@ public class SignCodeMojo extends AbstractMojo {
     /**
      * The username of the API user
      */
-    @Parameter(required = true)
+    @Parameter(required = true, defaultValue="${codesign.userName}")
     private String userName;
     
     /**
      * The password of the API user
      */
-    @Parameter(required = true)
+    @Parameter(required = true, defaultValue="${codesign.password}")
     private String password;
     
     /**
      * The partner code, initially sent via an email to you titled 'Your Secure App Service API username'
      */
-    @Parameter(required = true)
+    @Parameter(required = true, defaultValue="${codesign.partnerCode}")
     private String partnerCode;
     
     @Parameter(defaultValue = "${project.name}")
@@ -114,10 +114,10 @@ public class SignCodeMojo extends AbstractMojo {
     @Parameter(defaultValue = "${project.version}")
     private String applicationVersion;
 
-    @Parameter(required = true)
+    @Parameter(required = true, defaultValue="${codesign.keyStorePassword}")
     private String keyStorePassword;
     
-    @Parameter(required = true)
+    @Parameter(required = true, defaultValue="${codesign.keyStore}")
     private String keyStore;
     
     @Parameter
@@ -132,7 +132,7 @@ public class SignCodeMojo extends AbstractMojo {
     /**
      * Use <tt>Java TEST Signing Sha256</tt> for testing and <tt>Java Signing Sha256</tt> for prod 
      */
-    @Parameter(required = true)
+    @Parameter(required = true, defaultValue="${codesign.signingService}")
     private String signingService;
 
 
@@ -218,7 +218,7 @@ public class SignCodeMojo extends AbstractMojo {
         SOAPConnectionFactory soapConnectionFactory = SOAPConnectionFactory.newInstance();
         SOAPConnection connection = soapConnectionFactory.createConnection();
 
-        log("Sending singing request to server and waiting for response");
+        log("Sending signing request to server and waiting for response");
         SOAPMessage response = connection.call(message, SIGNING_SERVICE_URL);
 
         if ( getLog().isDebugEnabled()) {

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.