delivery

neilcsmith Wed, 26 Jul 2023 01:13:56 -0700

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

neilcsmith pushed a commit to branch release190
in repository https://gitbox.apache.org/repos/asf/netbeans.git


commit 4fe23f8f1057b3bf89ad2df330f64dc8128a0542
Merge: 8df65b70ed 9032ecc28e
Author: Neil C Smith <[email protected]>
AuthorDate: Wed Jul 26 09:13:44 2023 +0100

    Merge pull request #6233 from apache/delivery
    
    Sync delivery to release190 for 19-rc2

 .../modules/glassfish/common/Bundle.properties     |   1 +
 .../modules/glassfish/common/ServerDetails.java    |  14 +
 .../glassfish/tooling/admin/AdminFactory.java      |   1 +
 .../glassfish/tooling/data/GlassFishVersion.java   |  10 +-
 .../server/config/ConfigBuilderProvider.java       |   8 +-
 .../glassfish/tooling/admin/AdminFactoryTest.java  |   4 +-
 .../tooling/data/GlassFishVersionTest.java         |   8 +-
 .../glassfish/tooling/utils/EnumUtilsTest.java     |  26 +-
 .../java/editor/imports/ComputeImportsTest.java    |   4 +-
 .../vscode/src/dbConfigurationProvider.ts          |   6 +-
 java/java.lsp.server/vscode/src/extension.ts       |   5 +-
 .../modules/maven/embedder/MavenEmbedder.java      |  22 +-
 .../maven/junit/JUnitOutputListenerProvider.java   |  17 +-
 .../AbstractProjectClassPathImplTest.java          |   7 +-
 .../modules/php/editor/actions/FixUsesAction.java  |  21 +-
 .../php/editor/actions/FixUsesPerformer.java       |  93 ++--
 .../php/editor/actions/ImportDataCreator.java      |   5 +
 .../modules/php/editor/indent/FmtOptions.java      |   2 +-
 .../php/editor/parser/PHPDocCommentParser.java     |  31 +-
 .../ReturnTypeArrayShapes01.pass                   |   9 +
 .../ReturnTypeArrayShapes02.pass                   |   9 +
 .../ReturnTypeGenerics01.pass                      |   9 +
 .../ReturnTypeGenerics02.pass                      |   9 +
 .../ReturnTypeGenerics03.pass                      |   9 +
 .../ReturnTypeGenerics04.pass                      |   9 +
 .../ReturnTypeGenerics05.pass                      |   9 +
 .../ReturnTypeObjectShapes01.pass                  |   9 +
 .../ReturnTypeObjectShapes02.pass                  |   9 +
 .../testGH4609PSR12_GroupUses01.php}               |   0
 .../testGH4609PSR12_GroupUses01.php.fixUses}       |   0
 .../testGH4609PSR12_GroupUses02.php}               |   0
 .../testGH4609PSR12_GroupUses02.php.fixUses}       |   4 +-
 .../testGH4609PSR12_GroupUsesWithPSR12a01.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12a01.php.fixUses} |   0
 .../testGH4609PSR12_GroupUsesWithPSR12a02.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12a02.php.fixUses} |   2 +-
 .../testGH4609PSR12_GroupUsesWithPSR12b01.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12b01.php.fixUses} |   0
 .../testGH4609PSR12_GroupUsesWithPSR12b02.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12b02.php.fixUses} |   1 -
 .../testGH4609PSR12_GroupUsesWithPSR12c01.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12c01.php.fixUses} |   0
 .../testGH4609PSR12_GroupUsesWithPSR12c02.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12c02.php.fixUses} |   0
 .../testGH4609PSR12_GroupUsesWithPSR12d01.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12d01.php.fixUses} |   0
 .../testGH4609PSR12_GroupUsesWithPSR12d02.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12d02.php.fixUses} |   1 -
 .../testGH4609PSR12_GroupUsesWithPSR12e01.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12e01.php.fixUses} |   0
 .../testGH4609PSR12_GroupUsesWithPSR12e02.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12e02.php.fixUses} |   0
 .../testGH4609PSR12_GroupUsesWithPSR12f01.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12f01.php.fixUses} |   0
 .../testGH4609PSR12_GroupUsesWithPSR12f02.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12f02.php.fixUses} |   1 -
 .../testGH4609PSR12_GroupUsesWithPSR12g01.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12g01.php.fixUses} |   0
 .../testGH4609PSR12_GroupUsesWithPSR12g02.php}     |   0
 ...tGH4609PSR12_GroupUsesWithPSR12g02.php.fixUses} |   0
 .../testGH4609PSR12_MultipleUses01.php}            |   0
 .../testGH4609PSR12_MultipleUses01.php.fixUses}    |  18 +-
 .../testGH4609PSR12_MultipleUses02.php}            |   0
 .../testGH4609PSR12_MultipleUses02.php.fixUses}    |  18 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12a01.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12a01.php.fixUses} |  16 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12a02.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12a02.php.fixUses} |  18 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12b01.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12b01.php.fixUses} |  18 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12b02.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12b02.php.fixUses} |   8 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12c01.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12c01.php.fixUses} |   6 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12c02.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12c02.php.fixUses} |   6 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12d01.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12d01.php.fixUses} |   8 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12d02.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12d02.php.fixUses} |  11 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12e01.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12e01.php.fixUses} |  10 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12e02.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12e02.php.fixUses} |  10 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12f01.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12f01.php.fixUses} |   6 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12f02.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12f02.php.fixUses} |   7 +-
 .../testGH4609PSR12_MultipleUsesWithPSR12g01.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12g01.php.fixUses} |   0
 .../testGH4609PSR12_MultipleUsesWithPSR12g02.php}  |   0
 ...4609PSR12_MultipleUsesWithPSR12g02.php.fixUses} |   0
 .../testGH4609PSR12_SingleLineUses01.php}          |   0
 .../testGH4609PSR12_SingleLineUses01.php.fixUses}  |   0
 .../testGH4609PSR12_SingleLineUses02.php}          |   0
 .../testGH4609PSR12_SingleLineUses02.php.fixUses}  |   4 +-
 ...testGH4609PSR12_SingleLineUsesWithPSR12a01.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12a01.php.fixUses} |   0
 ...testGH4609PSR12_SingleLineUsesWithPSR12a02.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12a02.php.fixUses} |   2 +-
 ...testGH4609PSR12_SingleLineUsesWithPSR12b01.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12b01.php.fixUses} |   0
 ...testGH4609PSR12_SingleLineUsesWithPSR12b02.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12b02.php.fixUses} |   1 -
 ...testGH4609PSR12_SingleLineUsesWithPSR12c01.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12c01.php.fixUses} |   0
 ...testGH4609PSR12_SingleLineUsesWithPSR12c02.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12c02.php.fixUses} |   0
 ...testGH4609PSR12_SingleLineUsesWithPSR12d01.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12d01.php.fixUses} |   0
 ...testGH4609PSR12_SingleLineUsesWithPSR12d02.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12d02.php.fixUses} |   1 -
 ...testGH4609PSR12_SingleLineUsesWithPSR12e01.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12e01.php.fixUses} |   0
 ...testGH4609PSR12_SingleLineUsesWithPSR12e02.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12e02.php.fixUses} |   0
 ...testGH4609PSR12_SingleLineUsesWithPSR12f01.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12f01.php.fixUses} |   0
 ...testGH4609PSR12_SingleLineUsesWithPSR12f02.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12f02.php.fixUses} |   1 -
 ...testGH4609PSR12_SingleLineUsesWithPSR12g01.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12g01.php.fixUses} |   0
 ...testGH4609PSR12_SingleLineUsesWithPSR12g02.php} |   0
 ...09PSR12_SingleLineUsesWithPSR12g02.php.fixUses} |   0
 .../testGH6039_01.php}                             |  74 ++-
 .../testGH6039/testGH6039_01.php.importData        |   7 +
 .../php/editor/actions/FixUsesPerformerTest.java   | 520 ++++++++++++++++++++-
 .../php/editor/actions/ImportDataCreatorTest.java  |   4 +
 .../php/editor/parser/PHPDocCommentParserTest.java |  45 ++
 .../modules/options/export/OptionsExportModel.java |   9 +-
 130 files changed, 936 insertions(+), 267 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

[netbeans] 01/01: Merge pull request #6233 from apache/delivery

Reply via email to