[netbeans] branch master updated: Tomcat 11 increased min supported Java version to 21 - Add support for Java 22 - Use try-with-resources
This is an automated email from the ASF dual-hosted git repository.
pepness 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 07cac8e0e7 Tomcat 11 increased min supported Java version to 21 - Add
support for Java 22 - Use try-with-resources
new 7417cb9ddb Merge pull request #6064 from pepness/tomcat11
07cac8e0e7 is described below
commit 07cac8e0e796c6456a2dc0ddb8e6010dfcbbe875
Author: José Contreras
AuthorDate: Fri Jun 9 14:18:55 2023 -0600
Tomcat 11 increased min supported Java version to 21
- Add support for Java 22
- Use try-with-resources
---
.../modules/tomcat5/AntDeploymentProviderImpl.java| 15 ++-
.../netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java | 14 +++---
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/AntDeploymentProviderImpl.java
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/AntDeploymentProviderImpl.java
index 8ec3fa1ce4..f8e2e44006 100644
---
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/AntDeploymentProviderImpl.java
+++
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/AntDeploymentProviderImpl.java
@@ -66,16 +66,13 @@ public class AntDeploymentProviderImpl implements
AntDeploymentProvider {
name = "resources/tomcat-ant-deploy.xml";
}
-InputStream is =
AntDeploymentProviderImpl.class.getResourceAsStream(name); // NOI18N
-if (is == null) {
-// this should never happen, but better make sure
-LOGGER.log(Level.SEVERE, "Missing resource {0}.", name); // NOI18N
-return;
-}
-try {
+try (InputStream is =
AntDeploymentProviderImpl.class.getResourceAsStream(name)) {
+if (is == null) {
+// this should never happen, but better make sure
+LOGGER.log(Level.SEVERE, "Missing resource {0}.", name); //
NOI18N
+return;
+}
FileUtil.copy(is, os);
-} finally {
-is.close();
}
}
diff --git
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
index fed6b746a3..f092b006be 100644
---
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
+++
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/j2ee/TomcatPlatformImpl.java
@@ -552,10 +552,10 @@ public class TomcatPlatformImpl extends J2eePlatformImpl2
{
if (manager.isTomEE()) {
switch (manager.getTomEEVersion()) {
case TOMEE_90:
-versions = versionRange(11, 21);
+versions = versionRange(11, 22);
break;
case TOMEE_80:
-versions = versionRange(8, 21);
+versions = versionRange(8, 22);
break;
case TOMEE_71:
case TOMEE_70:
@@ -572,20 +572,20 @@ public class TomcatPlatformImpl extends J2eePlatformImpl2
{
} else {
switch (manager.getTomcatVersion()) {
case TOMCAT_110:
-versions = versionRange(17, 21);
+versions = versionRange(21, 22);
break;
case TOMCAT_101:
-versions = versionRange(11, 21);
+versions = versionRange(11, 22);
break;
case TOMCAT_100:
case TOMCAT_90:
-versions = versionRange(8, 21);
+versions = versionRange(8, 22);
break;
case TOMCAT_80:
-versions = versionRange(7, 21);
+versions = versionRange(7, 22);
break;
case TOMCAT_70:
-versions = versionRange(6, 21);
+versions = versionRange(6, 22);
break;
case TOMCAT_60:
versions = versionRange(5, 8);
-
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
[netbeans] branch master updated: - Changed the way null is parsed similar to true and false - Fixed displaying null value for constant in navigator and in autocomplete - Fixed guessing the returned n
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 9d825de877 - Changed the way null is parsed similar to true and false
- Fixed displaying null value for constant in navigator and in autocomplete -
Fixed guessing the returned null type in documentation, in the navigator and
during phpDoc comment generation - Fixed broken tests - Added parser test for
true, false, null - Added documentation test to guess the returned null type -
Added phpDoc generation test to guess the returned null type
new 8cfba329e6 Merge pull request #6065 from troizet/parse_null_as_scalar
9d825de877 is described below
commit 9d825de877aac61ffade893bb45cfa1ac7952f42
Author: Alexey Borokhvostov
AuthorDate: Wed May 17 23:54:51 2023 +0700
- Changed the way null is parsed similar to true and false
- Fixed displaying null value for constant in navigator and in autocomplete
- Fixed guessing the returned null type in documentation, in the navigator
and during phpDoc comment generation
- Fixed broken tests
- Added parser test for true, false, null
- Added documentation test to guess the returned null type
- Added phpDoc generation test to guess the returned null type
---
.../modules/php/editor/parser/ASTPHP5Parser.java |8 +-
.../modules/php/editor/parser/ASTPHP5Symbols.java |2 +-
.../ASTPHP5ParserTest/parser/TrueFalseNull.pass| 1723
.../ASTPHP5ParserTest/parser/nullableTypes_01.pass |4 +-
.../parser/php74/typedPropertiesClass.pass |4 +-
.../parser/php74/typedPropertiesTrait.pass |4 +-
.../php80/constructorPropertyPromotion_01.pass | 12 +-
.../parser/php80/mixedType_01.pass |8 +-
.../parser/php80/namedArguments_01.pass|4 +-
.../parser/php80/throwExpression_01.pass | 16 +-
.../parser/php80/unionTypesTypes.pass |8 +-
.../parser/testVariadicFunctions_01.pass |4 +-
.../parser/testVariadicFunctions_02.pass |4 +-
.../documentation/guessingNullReturnType.php | 42 +
...turnType.php.testGuessingNullReturnType_01.html | 13 +
...turnType.php.testGuessingNullReturnType_02.html | 13 +
.../completion/documentation/nullConstant.php | 30 +
.../nullConstant.php.testNullConstant_01.html |7 +
.../nullConstant.php.testNullConstant_02.html |7 +
.../issue235450.php.testLowercase_01.completion|2 +-
.../issue235450.php.testLowercase_04.completion|2 +-
.../issue235450.php.testLowercase_07.completion|2 +-
.../unit/data/testfiles/parser/TrueFalseNull.php | 114 ++
.../editor/completion/PHPCCDocumentationTest.java | 16 +
.../php/editor/parser/ASTPHP5ParserTest.java |4 +
.../typinghooks/PhpCommentGeneratorTest.java | 28 +-
php/php.editor/tools/ASTPHP5Parser.cup |4 +-
27 files changed, 2022 insertions(+), 63 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
index cd9afd516b..9ec1dfaa08 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
@@ -19,7 +19,7 @@
//
// The following code was generated by CUP v0.11a beta 20060608
-// Wed Feb 08 23:05:51 NOVT 2023
+// Wed May 17 22:19:17 NOVT 2023
//
package org.netbeans.modules.php.editor.parser;
@@ -30,7 +30,7 @@ import org.netbeans.modules.php.editor.parser.astnodes.*;
import org.openide.util.Pair;
/** CUP v0.11a beta 20060608 generated parser.
- * @version Wed Feb 08 23:05:51 NOVT 2023
+ * @version Wed May 17 22:19:17 NOVT 2023
*/
@org.netbeans.api.annotations.common.SuppressWarnings({"EI_EXPOSE_REP",
"MS_PKGPROTECT", "BC_BAD_CAST_TO_CONCRETE_COLLECTION"})
public class ASTPHP5Parser extends java_cup.runtime.lr_parser {
@@ -12918,7 +12918,7 @@ switch (CUP$ASTPHP5Parser$act_num) {
if (!nsn.isGlobal() && list.size() == 1) {
String itemName = ((Identifier) list.get(0)).getName();
String itemNameLower = itemName.toLowerCase();
-if ("true".equals(itemNameLower) || "false".equals(itemNameLower)) {
// NOI18N
+if ("true".equals(itemNameLower) || "false".equals(itemNameLower) ||
"null".equals(itemNameLower)) { // NOI18N
RESULT = new Scalar(nsnleft, nsnright, itemName,
Scalar.Type.STRING);
} else {
RESULT = nsn;
@@ -14181,7 +14181,7 @@ switch (CUP$ASTPHP5Parser$act_num) {
if (!nsn.isGlobal() && list.size() == 1) {
String itemName = ((Identifier)
[netbeans-nbpackage] branch master updated: Remove debugging output from Windows launcher.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git
The following commit(s) were added to refs/heads/master by this push:
new 6d3df24 Remove debugging output from Windows launcher.
new bed510e Merge pull request #31 from neilcsmith-net/win-launcher
6d3df24 is described below
commit 6d3df247baed8f39f6f6b014c630f25f35a5711f
Author: Neil C Smith
AuthorDate: Mon Jun 12 13:55:40 2023 +0100
Remove debugging output from Windows launcher.
---
src/assembly/bin/nbpackage.cmd | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/assembly/bin/nbpackage.cmd b/src/assembly/bin/nbpackage.cmd
index d84170e..60508fa 100644
--- a/src/assembly/bin/nbpackage.cmd
+++ b/src/assembly/bin/nbpackage.cmd
@@ -63,9 +63,6 @@ goto repoSetup
:WinNTGetScriptDir
for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
-echo %~dp0
-echo %~dp0..
-echo %BASEDIR%
:repoSetup
set REPO=
-
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
[netbeans] branch master updated: Adding DB configuration provider for NBLS (#6058)
This is an automated email from the ASF dual-hosted git repository.
jhorvath 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 b973af2fdc Adding DB configuration provider for NBLS (#6058)
b973af2fdc is described below
commit b973af2fdc373ac9d55d58b65fa92006e99d92e1
Author: jhorvath
AuthorDate: Mon Jun 12 13:24:11 2023 +0200
Adding DB configuration provider for NBLS (#6058)
* Adding DB configuration provider for NBLS
---
.../modules/cloud/oracle/actions/AddADBAction.java | 3 +-
.../cloud/oracle/actions/DownloadWalletAction.java | 6 ++-
.../cloud/oracle/actions/DownloadWalletDialog.java | 13 +++--
...etEnvCommand.java => DBConnectionProvider.java} | 36 ++---
java/java.lsp.server/vscode/package.json | 5 --
.../vscode/src/dbConfigurationProvider.ts | 61 ++
java/java.lsp.server/vscode/src/extension.ts | 2 +
7 files changed, 97 insertions(+), 29 deletions(-)
diff --git
a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java
b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java
index d394e81903..9321b41388 100644
---
a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java
+++
b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java
@@ -183,7 +183,8 @@ public class AddADBAction implements ActionListener {
DownloadWalletDialog.getWalletsDir().getAbsolutePath(),
AbstractPasswordPanel.generatePassword(),
(String) result.get(USERNAME),
-((String) result.get(PASSWORD)).toCharArray());
+((String) result.get(PASSWORD)).toCharArray(),
+selectedDatabase.getKey().getValue());
action.addConnection(info);
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
diff --git
a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletAction.java
b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletAction.java
index 3e0df5933d..1f25d17a58 100644
---
a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletAction.java
+++
b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletAction.java
@@ -27,6 +27,7 @@ import java.text.MessageFormat;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
+import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@@ -147,6 +148,8 @@ public class DownloadWalletAction extends AbstractAction
implements ContextAware
return;
}
}
+Properties props = new Properties();
+props.put("OCID", p.getOcid()); //NOI18N
String dbUrl = MessageFormat.format(URL_TEMPLATE,
connectionName, BaseUtilities.escapeParameters(new String[] {
walletPath.toString() }));
DatabaseConnection dbConn = DatabaseConnection.create(
drivers[0],
@@ -155,7 +158,8 @@ public class DownloadWalletAction extends AbstractAction
implements ContextAware
p.getDbUser(),
new String(p.getDbPassword()),
true,
-context.getName());
+context.getName(),
+props);
ConnectionManager.getDefault().addConnection(dbConn);
}
diff --git
a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletDialog.java
b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletDialog.java
index ad82bf0f46..051424b948 100644
---
a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletDialog.java
+++
b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/DownloadWalletDialog.java
@@ -90,7 +90,7 @@ final class DownloadWalletDialog extends
AbstractPasswordPanel {
String path = dlgPanel.jTextFieldLocation.getText();
char[] passwd = dlgPanel.jPasswordField.getPassword();
NbPreferences.forModule(DownloadWalletAction.class).put(LAST_USED_DIR, path);
//NOI18N
-return Optional.of(new WalletInfo(path, passwd, null, null));
+return Optional.of(new WalletInfo(path, passwd, null, null,
db.getKey().getValue()));
}
} else {
try {
@@ -109,7 +109,7 @@ final class DownloadWalletDialog extends
