This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push: new d23e386 [NETBEANS-281] Add ASF license template (#367) d23e386 is described below commit d23e386c221cf689d65b1c2a1711b9e81c45d907 Author: lbruun <32431476+lbr...@users.noreply.github.com> AuthorDate: Sun Jan 14 15:15:10 2018 +0100 [NETBEANS-281] Add ASF license template (#367) * [NETBEANS-281] Merge with PR174 Merge the idea in PR174 into this change. --- .../apisupport/project/queries/TemplateAttributesProvider.java | 2 +- .../src/org/netbeans/modules/apisupport/project/resources/layer.xml | 5 ----- .../src/org/netbeans/modules/apisupport/project/ui/Bundle.properties | 1 - dlight.nativeexecution/nbproject/project.properties | 2 +- .../netbeans/modules/project/ui/resources/apache20-asf-license.txt | 0 projectui/src/org/netbeans/modules/project/ui/resources/layer.xml | 5 +++++ terminal/nbproject/project.properties | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java b/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java index 26c856f..1e18549 100644 --- a/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java +++ b/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/TemplateAttributesProvider.java @@ -63,7 +63,7 @@ public class TemplateAttributesProvider implements CreateFromTemplateAttributesP String licensePath = props.getProperty("project.licensePath"); // NOI18N if (license == null && netbeansOrg) { - license = "apache20-netbeans"; // NOI18N + license = "apache20-asf"; // NOI18N } if (license == null && licensePath == null && project != null) { SuiteProject sp; diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml b/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml index 457ff40..2b0ad2d 100644 --- a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml +++ b/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/layer.xml @@ -261,11 +261,6 @@ <attr name="displayName" bundlevalue="org.netbeans.modules.apisupport.project.ui.Bundle#Templates/Licenses/license-cddl-netbeans-sun.txt"/> <attr name="mavenLicenseURL" stringvalue="http://www.netbeans.org/cddl-gplv2.html"/> </file> - <file name="license-apache20-netbeans.txt" url="license-apache20-netbeans.txt"> - <attr name="template" boolvalue="true"/> - <attr name="displayName" bundlevalue="org.netbeans.modules.apisupport.project.ui.Bundle#Templates/Licenses/license-apache20-netbeans.txt"/> - <attr name="mavenLicenseURL" stringvalue="http://www.apache.org/licenses/LICENSE-2.0"/> - </file> </folder> <folder name="Project"> <folder name="APISupport"> diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties b/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties index 4ceb39a..267ae49 100644 --- a/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties +++ b/apisupport.ant/src/org/netbeans/modules/apisupport/project/ui/Bundle.properties @@ -75,7 +75,6 @@ HINT_suite_project_root_node=Module suite project in {0} LBL_jnlp_master=JNLP Descriptor Templates/Licenses/license-cddl-netbeans-sun.txt=NetBeans CDDL/GPL -Templates/Licenses/license-apache20-netbeans.txt=NetBeans Apache License 2.0 TestDataDirsNodeFactory.unit_test_data=Unit Test Data TestDataDirsNodeFactory.qa-functional_test_data=Functional Test Data diff --git a/dlight.nativeexecution/nbproject/project.properties b/dlight.nativeexecution/nbproject/project.properties index 14f5991..345cefd 100644 --- a/dlight.nativeexecution/nbproject/project.properties +++ b/dlight.nativeexecution/nbproject/project.properties @@ -18,7 +18,7 @@ is.autoload=true javac.source=1.7 javac.compilerargs=-Xlint -Xlint:-serial javadoc.arch=${basedir}/arch.xml -project.license=apache20-netbeans +project.license=apache20-asf nbm.executable.files=bin/nativeexecution/** jnlp.indirect.files=bin/nativeexecution/** spec.version.base=1.40.13 diff --git a/apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-apache20-netbeans.txt b/projectui/src/org/netbeans/modules/project/ui/resources/apache20-asf-license.txt similarity index 100% rename from apisupport.ant/src/org/netbeans/modules/apisupport/project/resources/license-apache20-netbeans.txt rename to projectui/src/org/netbeans/modules/project/ui/resources/apache20-asf-license.txt diff --git a/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml b/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml index bf38bc5..c94adac 100644 --- a/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml +++ b/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml @@ -179,6 +179,11 @@ <attr name="template" boolvalue="true"/> <attr name="mavenLicenseURL" stringvalue="https://opensource.org/licenses/Apache-2.0 http://opensource.org/licenses/Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0.txt"/> </file> + <file name="license-apache20-asf.txt" url="apache20-asf-license.txt"> + <attr name="displayName" stringvalue="ASF - Apache License 2.0"/> + <attr name="template" boolvalue="true"/> + <attr name="mavenLicenseURL" stringvalue="https://opensource.org/licenses/Apache-2.0 http://opensource.org/licenses/Apache-2.0 http://www.apache.org/licenses/LICENSE-2.0.txt"/> + </file> <file name="license-mit.txt" url="mit-license.txt"> <attr name="displayName" stringvalue="MIT License"/> <attr name="template" boolvalue="true"/> diff --git a/terminal/nbproject/project.properties b/terminal/nbproject/project.properties index 10dc858..bf03c09 100644 --- a/terminal/nbproject/project.properties +++ b/terminal/nbproject/project.properties @@ -30,7 +30,7 @@ javac.compilerargs=-Xlint -Xlint:-serial javadoc.arch=${basedir}/arch.xml nbm.homepage=http://wiki.netbeans.org/TerminalEmulator is.autoload=true -project.license=apache20-netbeans +project.license=apache20-asf test.config.stableBTD.includes=**/*Test.class test.config.stableBTD.excludes=\ -- To stop receiving notification emails like this one, please contact ['"commits@netbeans.apache.org" <commits@netbeans.apache.org>']. --------------------------------------------------------------------- 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