This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 8109ad9 [NETBEANS-4819] Applied Emilian Bold's patch that fixes missing time-stamp authority for nbm signing patch found at https://bugzilla-attachments-243213.netbeans.org/bugzilla/attachment.cgi?id=161749 new 0e88bed Merge pull request #2413 from SirIntellegence/NETBEANS-4819 8109ad9 is described below commit 8109ad9c434363732198597d7d498f8a19a92dab Author: Austin Stephens <sirintellegen...@gmail.com> AuthorDate: Thu Oct 1 14:42:23 2020 -0600 [NETBEANS-4819] Applied Emilian Bold's patch that fixes missing time-stamp authority for nbm signing patch found at https://bugzilla-attachments-243213.netbeans.org/bugzilla/attachment.cgi?id=161749 --- nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java | 15 +++++++++++++++ nbbuild/templates/common.xml | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java b/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java index f8524e3..018157f 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java +++ b/nbbuild/antsrc/org/netbeans/nbbuild/MakeNBM.java @@ -264,6 +264,7 @@ public class MakeNBM extends Task { public /*static*/ class Signature { public File keystore; public String storepass, alias; + public String tsaurl, tsacert; /** Path to the keystore (private key). */ public void setKeystore(File f) { keystore = f; @@ -279,6 +280,14 @@ public class MakeNBM extends Task { public void setAlias(String s) { alias = s; } + /** Time Stamping Authority (TSA) URL */ + public void setTsaurl(String s) { + tsaurl = s; + } + /** Alias for the TSA's public key certificate */ + public void setTsacert(String s) { + tsacert = s; + } } private File productDir = null; @@ -843,6 +852,12 @@ public class MakeNBM extends Task { } catch (Exception x) { throw new BuildException(x); } + if(signature.tsaurl != null && !signature.tsaurl.isEmpty()) { + signjar.setTsaurl(signature.tsaurl); + } + if(signature.tsacert != null && !signature.tsacert.isEmpty()) { + signjar.setTsacert(signature.tsacert); + } signjar.setStorepass (signature.storepass); signjar.setAlias (signature.alias); signjar.setLocation(getLocation()); diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml index 5533eff..22b6738 100644 --- a/nbbuild/templates/common.xml +++ b/nbbuild/templates/common.xml @@ -82,6 +82,8 @@ <available file="${nbplatform.active.dir}/platform/core/asm-8.0.1.jar"/> </condition> <property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-8.0.1.jar"/> + <property name="tsaurl" value=""/> + <property name="tsacert" value=""/> </target> <target name="-release.dir"> @@ -467,7 +469,7 @@ locales="${nbm.locales}" > <license file="${license.file.override}"/> - <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}"/> + <signature keystore="${keystore}" storepass="${storepass}" alias="${nbm_alias}" tsaurl="${tsaurl}" tsacert="${tsacert}"/> <updaterjar> <pathfileset> <path refid="cluster.path.id"/> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists