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 <[email protected]>
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: [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
