This is an automated email from the ASF dual-hosted git repository.
skygo 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 5cdea8f Mark included 3rd-party update centre as trusted and don't
sign bundled nbms.
new a5b65e7 Merge pull request #2109 from
neilcsmith-net/third-party-uc-trust
5cdea8f is described below
commit 5cdea8f247853219f7856ab3ca88c3290bec69cc
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Tue Apr 28 11:43:05 2020 +0100
Mark included 3rd-party update centre as trusted and don't sign bundled
nbms.
---
nb/updatecenters/build.xml | 4 ----
.../src/org/netbeans/modules/updatecenters/resources/mf-layer.xml | 1 +
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/nb/updatecenters/build.xml b/nb/updatecenters/build.xml
index b9a6577..f91f4c0 100644
--- a/nb/updatecenters/build.xml
+++ b/nb/updatecenters/build.xml
@@ -41,8 +41,6 @@
/>
<subant target="nbm" inheritall="false">
<property name="build.dir" location="build/3rdparty-nbms"/>
- <property name="keystore" location="${netbeans.bundled.ks}"/>
- <property name="storepass" value="${netbeans.bundled.ks}"/>
<property name="nbm_alias" value="netbeans-bundled"/>
<fileset dir="${nb_all}/extra" includes="libs.javafx.*/build.xml"/>
</subant>
@@ -56,8 +54,6 @@
</subant>
<subant target="nbm" inheritall="false">
<property name="build.dir" location="build/3rdparty-nbms"/>
- <property name="keystore" location="${netbeans.bundled.ks}"/>
- <property name="storepass" value="${netbeans.bundled.ks}"/>
<property name="nbm_alias" value="netbeans-bundled"/>
<property name="nb_all" location="${nb_all}"/>
<property name="nbplatform.default.netbeans.dest.dir"
location="${netbeans.dest.dir}"/>
diff --git
a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
index b57d7a8..bacad2f 100644
---
a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
+++
b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/mf-layer.xml
@@ -62,6 +62,7 @@
<attr name="url"
bundlevalue="org.netbeans.modules.updatecenters.resources.Bundle#URL_3rdparty"/>
<attr name="category" stringvalue="STANDARD"/>
<attr name="enabled" boolvalue="true"/>
+ <attr name="trusted" boolvalue="true"/>
<attr name="instanceOf"
stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
<attr name="instanceCreate"
methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
</file>
---------------------------------------------------------------------
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
