This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release126 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 22aebab0c6dc643e861a7af3d71aea7b7644e4bd Merge: 8388dd1 ee088f9 Author: Neil C Smith <[email protected]> AuthorDate: Wed Nov 3 13:36:36 2021 +0000 Merge pull request #3281 from apache/delivery Merge delivery into release126 for 12.6-rc2 ... => j2ee.jboss4-external-resources-license.txt} | 0 ....weblogic9-generated-schema-classes-license.txt | 421 +++++++++++- ...9-generated-schema-classes-netbeans-license.txt | 141 ---- .../com.oracle.js.parser-ba7a8bc42268-license.txt | 748 +++++++++------------ ..._1.0.0.build220_r167_v20150618_1733-license.txt | 2 +- ...svnkit_1.8.12.r10533_v20160129_0158-license.txt | 58 +- .../external/sqljet-1.1.10-license.txt | 10 +- ...c.wsitmodelext-glassfish-resources-license.txt} | 6 + ...ebsvc.wsitmodelext-oasis-resources-license.txt} | 6 + ... websvc.wsitmodelext-w3c-resources-license.txt} | 6 + .../modules/glassfish/common/Bundle.properties | 1 + .../modules/glassfish/common/ServerDetails.java | 14 + .../netbeans/modules/glassfish/spi/UtilsTest.java | 1 + .../glassfish.tooling/nbproject/project.properties | 2 +- .../glassfish/tooling/data/GlassFishVersion.java | 90 +-- .../server/config/ConfigBuilderProvider.java | 11 +- .../tooling/server/config/GlassFishV6_2_1.xml | 105 +++ .../tooling/server/config/JavaSEPlatform.java | 25 +- .../netbeans/modules/payara/common/StartTask.java | 7 +- .../modules/groovy/support/api/GroovySources.java | 2 + .../codetemplates/CodeTemplateInsertHandler.java | 8 +- ide/xml.retriever/licenseinfo.xml | 28 + .../modules/java/editor/resources/fontsColors.xml | 2 +- .../modules/java/hints/jdk/CheckRegex.java | 3 +- .../modules/java/hints/jdk/CheckRegexTest.java | 4 +- .../maven/execute/CommandLineOutputHandler.java | 24 +- .../modules/java/hints/spiimpl/JackpotTrees.java | 91 +-- .../modules/java/hints/spiimpl/Utilities.java | 13 +- .../jnlp/external/jnlp-definitions-7.0-license.txt | 748 +++++++++------------ .../modules/php/editor/actions/FixUsesAction.java | 2 +- .../php/editor/actions/FixUsesPerformer.java | 86 ++- .../php/editor/actions/UsedNamesCollector.java | 61 +- .../modules/php/editor/model/ModelUtils.java | 99 +++ .../test/unit/data/testfiles/actions/nb4978_01.php | 39 ++ .../data/testfiles/actions/nb4978_01.php.usedNames | 4 + .../test/unit/data/testfiles/actions/nb4978_02.php | 37 + .../data/testfiles/actions/nb4978_02.php.usedNames | 4 + .../test/unit/data/testfiles/actions/nb4978_03.php | 43 ++ .../data/testfiles/actions/nb4978_03.php.usedNames | 4 + .../test/unit/data/testfiles/actions/nb4978_04.php | 45 ++ .../data/testfiles/actions/nb4978_04.php.usedNames | 4 + .../test/unit/data/testfiles/actions/nb4978_05.php | 44 ++ .../data/testfiles/actions/nb4978_05.php.usedNames | 4 + .../test/unit/data/testfiles/actions/nb4978_06.php | 44 ++ .../data/testfiles/actions/nb4978_06.php.usedNames | 4 + .../test/unit/data/testfiles/actions/nb4978_07.php | 45 ++ .../data/testfiles/actions/nb4978_07.php.usedNames | 4 + .../test/unit/data/testfiles/actions/nb4978_08.php | 50 ++ .../data/testfiles/actions/nb4978_08.php.usedNames | 1 + .../actions/testNB4978/01/testNB4978_01.php | 39 ++ .../testNB4978/01/testNB4978_01.php.fixUses | 41 ++ .../actions/testNB4978/02/testNB4978_02.php | 37 + .../testNB4978/02/testNB4978_02.php.fixUses | 39 ++ .../actions/testNB4978/03/testNB4978_03.php | 43 ++ .../testNB4978/03/testNB4978_03.php.fixUses | 45 ++ .../actions/testNB4978/04/testNB4978_04.php | 45 ++ .../testNB4978/04/testNB4978_04.php.fixUses | 47 ++ .../actions/testNB4978/05/testNB4978_05.php | 44 ++ .../testNB4978/05/testNB4978_05.php.fixUses | 46 ++ .../actions/testNB4978/06/testNB4978_06.php | 44 ++ .../testNB4978/06/testNB4978_06.php.fixUses | 46 ++ .../actions/testNB4978/07/testNB4978_07.php | 45 ++ .../testNB4978/07/testNB4978_07.php.fixUses | 47 ++ .../php/editor/actions/FixUsesPerformerTest.java | 42 ++ .../php/editor/actions/UsedNamesCollectorTest.java | 32 + .../modules/php/project/resources/layer.xml | 6 +- .../NewFileWizardIteratorWithNamespace.java | 92 +++ 67 files changed, 2827 insertions(+), 1154 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
