[Bug 68958] New: Make connection close configurable on status codes set by the application
https://bz.apache.org/bugzilla/show_bug.cgi?id=68958 Bug ID: 68958 Summary: Make connection close configurable on status codes set by the application Product: Tomcat 9 Version: 9.0.x Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: adwsi...@gmail.com Target Milestone: - Context : https://lists.apache.org/thread/svjh13gswbsl4n6z3hd03r67xlktyydz I have raised the PR for the same, https://github.com/apache/tomcat/pull/723 Before I polish the PR (add tests, provide a configuration etc. etc.), I wanted to get an alignment that this approach is indeed feasible. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68932] Occasional 404 or 500 errors
https://bz.apache.org/bugzilla/show_bug.cgi?id=68932 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #7 from Mark Thomas --- There is insufficient information in this report for the Tomcat team to investigate the issue. Given the lower rate of errors this could just be a small number of invalid requests. Tomcat has generally become more strict about HTTP specification compliance over time. It is possible that 9.0.x will reject requests that 8.5.x would have permitted. Unless sufficient information is provided for the Tomcat team to reproduce the issue, this report will eventually be closed as WORKSFORME. Additional ideas for providing more information over and above the ideas already presented: - Provide more details about the application (does it use async, WebSocket, HTTP/2, JSP, etc) - How is the application deployed? - Is there a ROOT application deployed? - If 8.5.100 also shows these errors, do a binary search to find out which version they start to appear with - What requests trigger the errors? Is there any sort of pattern? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68947] `tomcat-embed-core` `10.1.23` requires Java 11 but includes Java 22 sources
https://bz.apache.org/bugzilla/show_bug.cgi?id=68947 Mark Thomas changed: What|Removed |Added Severity|normal |enhancement --- Comment #6 from Mark Thomas --- Functionally, the current solution works. The issue is that the Maven enforcer plug-in doesn't like it. I assume that that could be worked around with configuration. Marking this an an enhancement (so it plays more nicely with the Maven enforcer plug-in). Options for us are: 1. Do nothing 2. Use MR JAR 3. Use separate JARs Those are options happen to be in my current order or preference. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Align with Commons DBCP 2.12.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cf27ef1a3dacb08b251bf145ae88ac6a973edb84
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:59:25 2024 +0100
Align with Commons DBCP 2.12.0
Based on review of diff
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 3 ++-
.../tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 10 ++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 20b3c0c6ed..6506b3fcbe 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -766,8 +766,9 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the underlying connection pool.
*
* @return the underlying connection pool.
+ * @since DBCP 2.10.0
*/
-protected GenericObjectPool getConnectionPool() {
+public GenericObjectPool getConnectionPool() {
return connectionPool;
}
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
index ae2dc3be23..3007a6cdcb 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -573,11 +573,13 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
assertInitializationAllowed();
connectionProperties = props;
if (connectionProperties != null) {
-if (connectionProperties.containsKey(Constants.KEY_USER)) {
-setUser(connectionProperties.getProperty(Constants.KEY_USER));
+final String user =
connectionProperties.getProperty(Constants.KEY_USER);
+if (user != null) {
+setUser(user);
}
-if (connectionProperties.containsKey(Constants.KEY_PASSWORD)) {
-
setPassword(connectionProperties.getProperty(Constants.KEY_PASSWORD));
+final String password =
connectionProperties.getProperty(Constants.KEY_PASSWORD);
+if (password != null) {
+setPassword(password);
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Update Commons DBCP to 2.12.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8f2e9bd56c4e0942e17c949e059167fb91831419
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:43:36 2024 +0100
Update Commons DBCP to 2.12.0
---
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 2 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 148 +
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 33 ++--
.../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 2 +-
.../dbcp/dbcp2/ConnectionFactoryFactory.java | 3 +-
.../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 13 ++
.../tomcat/dbcp/dbcp2/DelegatingConnection.java| 4 +-
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 6 +-
.../dbcp/dbcp2/DelegatingPreparedStatement.java| 42 ++---
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 2 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 12 +-
.../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 +-
.../dbcp/dbcp2/PoolableCallableStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 177 -
.../dbcp/dbcp2/PoolableConnectionFactory.java | 2 +-
.../dbcp/dbcp2/PoolablePreparedStatement.java | 13 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 36 -
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 8 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 2 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 3 +-
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 23 ++-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 127 +--
.../dbcp2/cpdsadapter/PooledConnectionImpl.java| 20 ++-
.../dbcp/dbcp2/cpdsadapter/package-info.java | 18 +--
.../dbcp2/datasources/CPDSConnectionFactory.java | 34 ++--
.../datasources/KeyedCPDSConnectionFactory.java| 2 +-
.../dbcp2/datasources/PerUserPoolDataSource.java | 6 +-
.../dbcp2/datasources/SharedPoolDataSource.java| 2 +-
.../dbcp/dbcp2/datasources/package-info.java | 58 +++
.../dbcp/dbcp2/managed/BasicManagedDataSource.java | 15 +-
.../managed/DataSourceXAConnectionFactory.java | 7 +-
.../dbcp2/managed/LocalXAConnectionFactory.java| 8 +-
.../dbcp/dbcp2/managed/ManagedConnection.java | 8 +-
.../dbcp/dbcp2/managed/TransactionRegistry.java| 2 +-
.../dbcp/dbcp2/managed/XAConnectionFactory.java| 4 +-
.../org/apache/tomcat/dbcp/dbcp2/package-info.java | 12 +-
webapps/docs/changelog.xml | 3 +
38 files changed, 463 insertions(+), 402 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index e823ce862b..0dd73a4718 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -75,4 +75,4 @@ Sub-tree
src/main/java/org/apache/commons/dbcp2
src/main/resources/org/apache/commons/dbcp2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-b1e0c86d101aa43029625eb191aaee4306911702 (2023-03-08)
+rel/commons-dbcp-2.12.0 (2024-03-04)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
index e57b4108a1..bff2021fd7 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
@@ -37,7 +37,7 @@ import org.apache.tomcat.dbcp.pool2.TrackedUse;
*/
public class AbandonedTrace implements TrackedUse, AutoCloseable {
-static void add(AbandonedTrace receiver, AbandonedTrace trace) {
+static void add(final AbandonedTrace receiver, final AbandonedTrace trace)
{
if (receiver != null) {
receiver.addTrace(trace);
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index fcd65d5f0d..20b3c0c6ed 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -465,7 +465,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
return ConnectionFactoryFactory.createConnectionFactory(this,
DriverFactory.createDriver(this));
}
-
/**
* Creates a connection pool for this datasource. This method only exists
so subclasses can replace the
* implementation class.
@@ -483,6 +482,10 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
updateJmxName(config);
// Disable JMX on the underlying pool if the DS is not registered:
config.setJmxEnabled(registeredJmxObjectName != null);
+// Set up usage tracking if enabled
+if (getAbandonedUsageTracking() && abandonedConfig != null) {
+abandonedConfig.setUseUsageTracking(true);
+}
final GenericObjectPool gop =
createObjectPool(factory, config, abandonedConfig);
(tomcat) 01/03: Update internal fork of Commons BCEL to 6.9.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3cf9a96caf34ea08c81878d6c0cac829261276ad
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:04:15 2024 +0100
Update internal fork of Commons BCEL to 6.9.0
---
MERGE.txt | 2 +-
java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ElementValue.java | 1 +
webapps/docs/changelog.xml| 3 +++
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index c3e81ab842..e823ce862b 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -37,7 +37,7 @@ Unused code is removed
Sub-tree:
src/main/java/org/apache/bcel
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-bcel-6.8.2 (2024-02-25)
+rel/commons-bcel-6.9.0 (2024-04-27)
Codec
-
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
index 48a3644729..69a85b2c72 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
@@ -21,12 +21,12 @@ public class ArrayElementValue extends ElementValue
// For array types, this is the array
private final ElementValue[] elementValues;
-ArrayElementValue(final int type, final ElementValue[] datums, final
ConstantPool cpool) {
+ArrayElementValue(final int type, final ElementValue[] elementValues,
final ConstantPool cpool) {
super(type, cpool);
if (type != ARRAY) {
throw new ClassFormatException("Only element values of type array
can be built with this ctor - type specified: " + type);
}
-this.elementValues = datums;
+this.elementValues = elementValues != null ? elementValues :
ElementValue.EMPTY_ARRAY;
}
public ElementValue[] getElementValuesArray() {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
index 8c68b3f696..3894f60a1a 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
@@ -60,6 +60,7 @@ public abstract class ElementValue {
public static final byte PRIMITIVE_LONG = 'J';
public static final byte PRIMITIVE_SHORT = 'S';
public static final byte PRIMITIVE_BOOLEAN = 'Z';
+static final ElementValue[] EMPTY_ARRAY = {};
/**
* Reads an {@code element_value} as an {@code ElementValue}.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 08801ddc57..4be89f34d1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -217,6 +217,9 @@
Update SpotBugs to 4.8.4. (markt)
+
+Update the internal fork of Apache Commons BCEL to 6.9.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated (7d3ed9890e -> cf27ef1a3d)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 7d3ed9890e Update SpotBugs to 4.8.4 new 3cf9a96caf Update internal fork of Commons BCEL to 6.9.0 new 8f2e9bd56c Update Commons DBCP to 2.12.0 new cf27ef1a3d Align with Commons DBCP 2.12.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: MERGE.txt | 4 +- .../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 2 +- .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 151 +- .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 33 ++-- .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 2 +- .../dbcp/dbcp2/ConnectionFactoryFactory.java | 3 +- .../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 13 ++ .../tomcat/dbcp/dbcp2/DelegatingConnection.java| 4 +- .../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 6 +- .../dbcp/dbcp2/DelegatingPreparedStatement.java| 42 ++--- .../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 2 +- .../tomcat/dbcp/dbcp2/DelegatingStatement.java | 12 +- .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 +- .../dbcp/dbcp2/PoolableCallableStatement.java | 2 +- .../tomcat/dbcp/dbcp2/PoolableConnection.java | 177 - .../dbcp/dbcp2/PoolableConnectionFactory.java | 2 +- .../dbcp/dbcp2/PoolablePreparedStatement.java | 13 +- .../tomcat/dbcp/dbcp2/PoolingConnection.java | 36 - .../tomcat/dbcp/dbcp2/PoolingDataSource.java | 8 +- .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 2 +- java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 3 +- .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 23 ++- .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 137 +--- .../dbcp2/cpdsadapter/PooledConnectionImpl.java| 20 ++- .../dbcp/dbcp2/cpdsadapter/package-info.java | 18 +-- .../dbcp2/datasources/CPDSConnectionFactory.java | 34 ++-- .../datasources/KeyedCPDSConnectionFactory.java| 2 +- .../dbcp2/datasources/PerUserPoolDataSource.java | 6 +- .../dbcp2/datasources/SharedPoolDataSource.java| 2 +- .../dbcp/dbcp2/datasources/package-info.java | 58 +++ .../dbcp/dbcp2/managed/BasicManagedDataSource.java | 15 +- .../managed/DataSourceXAConnectionFactory.java | 7 +- .../dbcp2/managed/LocalXAConnectionFactory.java| 8 +- .../dbcp/dbcp2/managed/ManagedConnection.java | 8 +- .../dbcp/dbcp2/managed/TransactionRegistry.java| 2 +- .../dbcp/dbcp2/managed/XAConnectionFactory.java| 4 +- .../org/apache/tomcat/dbcp/dbcp2/package-info.java | 12 +- .../util/bcel/classfile/ArrayElementValue.java | 4 +- .../tomcat/util/bcel/classfile/ElementValue.java | 1 + webapps/docs/changelog.xml | 6 + 40 files changed, 478 insertions(+), 410 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Update Commons DBCP to 2.12.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 50ae70a293faae7b9a43aea77df3247e4d0525d1
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:43:36 2024 +0100
Update Commons DBCP to 2.12.0
---
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 2 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 148 +
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 33 ++--
.../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 2 +-
.../dbcp/dbcp2/ConnectionFactoryFactory.java | 3 +-
.../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 13 ++
.../tomcat/dbcp/dbcp2/DelegatingConnection.java| 4 +-
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 6 +-
.../dbcp/dbcp2/DelegatingPreparedStatement.java| 42 ++---
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 2 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 12 +-
.../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 +-
.../dbcp/dbcp2/PoolableCallableStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 177 -
.../dbcp/dbcp2/PoolableConnectionFactory.java | 2 +-
.../dbcp/dbcp2/PoolablePreparedStatement.java | 13 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 36 -
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 8 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 2 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 3 +-
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 23 ++-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 127 +--
.../dbcp2/cpdsadapter/PooledConnectionImpl.java| 20 ++-
.../dbcp/dbcp2/cpdsadapter/package-info.java | 18 +--
.../dbcp2/datasources/CPDSConnectionFactory.java | 34 ++--
.../datasources/KeyedCPDSConnectionFactory.java| 2 +-
.../dbcp2/datasources/PerUserPoolDataSource.java | 6 +-
.../dbcp2/datasources/SharedPoolDataSource.java| 2 +-
.../dbcp/dbcp2/datasources/package-info.java | 58 +++
.../dbcp/dbcp2/managed/BasicManagedDataSource.java | 15 +-
.../managed/DataSourceXAConnectionFactory.java | 7 +-
.../dbcp2/managed/LocalXAConnectionFactory.java| 8 +-
.../dbcp/dbcp2/managed/ManagedConnection.java | 8 +-
.../dbcp/dbcp2/managed/TransactionRegistry.java| 2 +-
.../dbcp/dbcp2/managed/XAConnectionFactory.java| 4 +-
.../org/apache/tomcat/dbcp/dbcp2/package-info.java | 12 +-
webapps/docs/changelog.xml | 3 +
38 files changed, 463 insertions(+), 402 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index e823ce862b..0dd73a4718 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -75,4 +75,4 @@ Sub-tree
src/main/java/org/apache/commons/dbcp2
src/main/resources/org/apache/commons/dbcp2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-b1e0c86d101aa43029625eb191aaee4306911702 (2023-03-08)
+rel/commons-dbcp-2.12.0 (2024-03-04)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
index e57b4108a1..bff2021fd7 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
@@ -37,7 +37,7 @@ import org.apache.tomcat.dbcp.pool2.TrackedUse;
*/
public class AbandonedTrace implements TrackedUse, AutoCloseable {
-static void add(AbandonedTrace receiver, AbandonedTrace trace) {
+static void add(final AbandonedTrace receiver, final AbandonedTrace trace)
{
if (receiver != null) {
receiver.addTrace(trace);
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index fcd65d5f0d..20b3c0c6ed 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -465,7 +465,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
return ConnectionFactoryFactory.createConnectionFactory(this,
DriverFactory.createDriver(this));
}
-
/**
* Creates a connection pool for this datasource. This method only exists
so subclasses can replace the
* implementation class.
@@ -483,6 +482,10 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
updateJmxName(config);
// Disable JMX on the underlying pool if the DS is not registered:
config.setJmxEnabled(registeredJmxObjectName != null);
+// Set up usage tracking if enabled
+if (getAbandonedUsageTracking() && abandonedConfig != null) {
+abandonedConfig.setUseUsageTracking(true);
+}
final GenericObjectPool gop =
createObjectPool(factory, config,
(tomcat) 03/03: Align with Commons DBCP 2.12.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 27a703266f17b9fc4c9f68bdcd0f190f7dd0ba60
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:59:25 2024 +0100
Align with Commons DBCP 2.12.0
Based on review of diff
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 3 ++-
.../tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 10 ++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 20b3c0c6ed..6506b3fcbe 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -766,8 +766,9 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the underlying connection pool.
*
* @return the underlying connection pool.
+ * @since DBCP 2.10.0
*/
-protected GenericObjectPool getConnectionPool() {
+public GenericObjectPool getConnectionPool() {
return connectionPool;
}
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
index ae2dc3be23..3007a6cdcb 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -573,11 +573,13 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
assertInitializationAllowed();
connectionProperties = props;
if (connectionProperties != null) {
-if (connectionProperties.containsKey(Constants.KEY_USER)) {
-setUser(connectionProperties.getProperty(Constants.KEY_USER));
+final String user =
connectionProperties.getProperty(Constants.KEY_USER);
+if (user != null) {
+setUser(user);
}
-if (connectionProperties.containsKey(Constants.KEY_PASSWORD)) {
-
setPassword(connectionProperties.getProperty(Constants.KEY_PASSWORD));
+final String password =
connectionProperties.getProperty(Constants.KEY_PASSWORD);
+if (password != null) {
+setPassword(password);
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Update internal fork of Commons BCEL to 6.9.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cbf4fb90da4a4dfd51e384c51c98480f6ccb4cd7
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:04:15 2024 +0100
Update internal fork of Commons BCEL to 6.9.0
---
MERGE.txt | 2 +-
java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ElementValue.java | 1 +
webapps/docs/changelog.xml| 3 +++
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index c3e81ab842..e823ce862b 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -37,7 +37,7 @@ Unused code is removed
Sub-tree:
src/main/java/org/apache/bcel
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-bcel-6.8.2 (2024-02-25)
+rel/commons-bcel-6.9.0 (2024-04-27)
Codec
-
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
index 48a3644729..69a85b2c72 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
@@ -21,12 +21,12 @@ public class ArrayElementValue extends ElementValue
// For array types, this is the array
private final ElementValue[] elementValues;
-ArrayElementValue(final int type, final ElementValue[] datums, final
ConstantPool cpool) {
+ArrayElementValue(final int type, final ElementValue[] elementValues,
final ConstantPool cpool) {
super(type, cpool);
if (type != ARRAY) {
throw new ClassFormatException("Only element values of type array
can be built with this ctor - type specified: " + type);
}
-this.elementValues = datums;
+this.elementValues = elementValues != null ? elementValues :
ElementValue.EMPTY_ARRAY;
}
public ElementValue[] getElementValuesArray() {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
index 8c68b3f696..3894f60a1a 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
@@ -60,6 +60,7 @@ public abstract class ElementValue {
public static final byte PRIMITIVE_LONG = 'J';
public static final byte PRIMITIVE_SHORT = 'S';
public static final byte PRIMITIVE_BOOLEAN = 'Z';
+static final ElementValue[] EMPTY_ARRAY = {};
/**
* Reads an {@code element_value} as an {@code ElementValue}.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 47c4b174b5..f86a63668c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -208,6 +208,9 @@
Update SpotBugs to 4.8.4. (markt)
+
+Update the internal fork of Apache Commons BCEL to 6.9.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated (fed5e0e1b6 -> 27a703266f)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from fed5e0e1b6 Update SpotBugs to 4.8.4 new cbf4fb90da Update internal fork of Commons BCEL to 6.9.0 new 50ae70a293 Update Commons DBCP to 2.12.0 new 27a703266f Align with Commons DBCP 2.12.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: MERGE.txt | 4 +- .../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 2 +- .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 151 +- .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 33 ++-- .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 2 +- .../dbcp/dbcp2/ConnectionFactoryFactory.java | 3 +- .../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 13 ++ .../tomcat/dbcp/dbcp2/DelegatingConnection.java| 4 +- .../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 6 +- .../dbcp/dbcp2/DelegatingPreparedStatement.java| 42 ++--- .../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 2 +- .../tomcat/dbcp/dbcp2/DelegatingStatement.java | 12 +- .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 +- .../dbcp/dbcp2/PoolableCallableStatement.java | 2 +- .../tomcat/dbcp/dbcp2/PoolableConnection.java | 177 - .../dbcp/dbcp2/PoolableConnectionFactory.java | 2 +- .../dbcp/dbcp2/PoolablePreparedStatement.java | 13 +- .../tomcat/dbcp/dbcp2/PoolingConnection.java | 36 - .../tomcat/dbcp/dbcp2/PoolingDataSource.java | 8 +- .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 2 +- java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 3 +- .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 23 ++- .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 137 +--- .../dbcp2/cpdsadapter/PooledConnectionImpl.java| 20 ++- .../dbcp/dbcp2/cpdsadapter/package-info.java | 18 +-- .../dbcp2/datasources/CPDSConnectionFactory.java | 34 ++-- .../datasources/KeyedCPDSConnectionFactory.java| 2 +- .../dbcp2/datasources/PerUserPoolDataSource.java | 6 +- .../dbcp2/datasources/SharedPoolDataSource.java| 2 +- .../dbcp/dbcp2/datasources/package-info.java | 58 +++ .../dbcp/dbcp2/managed/BasicManagedDataSource.java | 15 +- .../managed/DataSourceXAConnectionFactory.java | 7 +- .../dbcp2/managed/LocalXAConnectionFactory.java| 8 +- .../dbcp/dbcp2/managed/ManagedConnection.java | 8 +- .../dbcp/dbcp2/managed/TransactionRegistry.java| 2 +- .../dbcp/dbcp2/managed/XAConnectionFactory.java| 4 +- .../org/apache/tomcat/dbcp/dbcp2/package-info.java | 12 +- .../util/bcel/classfile/ArrayElementValue.java | 4 +- .../tomcat/util/bcel/classfile/ElementValue.java | 1 + webapps/docs/changelog.xml | 6 + 40 files changed, 478 insertions(+), 410 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Update Commons DBCP to 2.12.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b0ee756871e6a6dad743f6a6390719bfab0552dc
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:43:36 2024 +0100
Update Commons DBCP to 2.12.0
---
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 2 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 148 +
.../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 33 ++--
.../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 2 +-
.../dbcp/dbcp2/ConnectionFactoryFactory.java | 3 +-
.../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 13 ++
.../tomcat/dbcp/dbcp2/DelegatingConnection.java| 4 +-
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 6 +-
.../dbcp/dbcp2/DelegatingPreparedStatement.java| 42 ++---
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 2 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 12 +-
.../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 +-
.../dbcp/dbcp2/PoolableCallableStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 177 -
.../dbcp/dbcp2/PoolableConnectionFactory.java | 2 +-
.../dbcp/dbcp2/PoolablePreparedStatement.java | 13 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 36 -
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 8 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 2 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 3 +-
.../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 23 ++-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 127 +--
.../dbcp2/cpdsadapter/PooledConnectionImpl.java| 20 ++-
.../dbcp/dbcp2/cpdsadapter/package-info.java | 18 +--
.../dbcp2/datasources/CPDSConnectionFactory.java | 34 ++--
.../datasources/KeyedCPDSConnectionFactory.java| 2 +-
.../dbcp2/datasources/PerUserPoolDataSource.java | 6 +-
.../dbcp2/datasources/SharedPoolDataSource.java| 2 +-
.../dbcp/dbcp2/datasources/package-info.java | 58 +++
.../dbcp/dbcp2/managed/BasicManagedDataSource.java | 15 +-
.../managed/DataSourceXAConnectionFactory.java | 7 +-
.../dbcp2/managed/LocalXAConnectionFactory.java| 8 +-
.../dbcp/dbcp2/managed/ManagedConnection.java | 8 +-
.../dbcp/dbcp2/managed/TransactionRegistry.java| 2 +-
.../dbcp/dbcp2/managed/XAConnectionFactory.java| 4 +-
.../org/apache/tomcat/dbcp/dbcp2/package-info.java | 12 +-
webapps/docs/changelog.xml | 3 +
38 files changed, 463 insertions(+), 402 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index e64865b4cd..679450e6ad 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -66,4 +66,4 @@ Sub-tree
src/main/java/org/apache/commons/dbcp2
src/main/resources/org/apache/commons/dbcp2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-b1e0c86d101aa43029625eb191aaee4306911702 (2023-03-08)
+rel/commons-dbcp-2.12.0 (2024-03-04)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
index e57b4108a1..bff2021fd7 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
@@ -37,7 +37,7 @@ import org.apache.tomcat.dbcp.pool2.TrackedUse;
*/
public class AbandonedTrace implements TrackedUse, AutoCloseable {
-static void add(AbandonedTrace receiver, AbandonedTrace trace) {
+static void add(final AbandonedTrace receiver, final AbandonedTrace trace)
{
if (receiver != null) {
receiver.addTrace(trace);
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 17de613be4..0e4aaa06bd 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -438,7 +438,6 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
return ConnectionFactoryFactory.createConnectionFactory(this,
DriverFactory.createDriver(this));
}
-
/**
* Creates a connection pool for this datasource. This method only exists
so subclasses can replace the
* implementation class.
@@ -456,6 +455,10 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
updateJmxName(config);
// Disable JMX on the underlying pool if the DS is not registered:
config.setJmxEnabled(registeredJmxObjectName != null);
+// Set up usage tracking if enabled
+if (getAbandonedUsageTracking() && abandonedConfig != null) {
+abandonedConfig.setUseUsageTracking(true);
+}
final GenericObjectPool gop =
createObjectPool(factory, config, abandonedConfig);
(tomcat) branch main updated (7706bdc80f -> 287f97c53a)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 7706bdc80f Update SpotBugs to 4.8.4 new c611488dc9 Update internal fork of Commons BCEL to 6.9.0 new b0ee756871 Update Commons DBCP to 2.12.0 new 287f97c53a Align with Commons DBCP 2.12.0 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: MERGE.txt | 4 +- .../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 2 +- .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 151 +- .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 33 ++-- .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 2 +- .../dbcp/dbcp2/ConnectionFactoryFactory.java | 3 +- .../apache/tomcat/dbcp/dbcp2/DataSourceMXBean.java | 13 ++ .../tomcat/dbcp/dbcp2/DelegatingConnection.java| 4 +- .../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 6 +- .../dbcp/dbcp2/DelegatingPreparedStatement.java| 42 ++--- .../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 2 +- .../tomcat/dbcp/dbcp2/DelegatingStatement.java | 12 +- .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 4 +- .../dbcp/dbcp2/PoolableCallableStatement.java | 2 +- .../tomcat/dbcp/dbcp2/PoolableConnection.java | 177 - .../dbcp/dbcp2/PoolableConnectionFactory.java | 2 +- .../dbcp/dbcp2/PoolablePreparedStatement.java | 13 +- .../tomcat/dbcp/dbcp2/PoolingConnection.java | 36 - .../tomcat/dbcp/dbcp2/PoolingDataSource.java | 8 +- .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 2 +- java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 3 +- .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 23 ++- .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 137 +--- .../dbcp2/cpdsadapter/PooledConnectionImpl.java| 20 ++- .../dbcp/dbcp2/cpdsadapter/package-info.java | 18 +-- .../dbcp2/datasources/CPDSConnectionFactory.java | 34 ++-- .../datasources/KeyedCPDSConnectionFactory.java| 2 +- .../dbcp2/datasources/PerUserPoolDataSource.java | 6 +- .../dbcp2/datasources/SharedPoolDataSource.java| 2 +- .../dbcp/dbcp2/datasources/package-info.java | 58 +++ .../dbcp/dbcp2/managed/BasicManagedDataSource.java | 15 +- .../managed/DataSourceXAConnectionFactory.java | 7 +- .../dbcp2/managed/LocalXAConnectionFactory.java| 8 +- .../dbcp/dbcp2/managed/ManagedConnection.java | 8 +- .../dbcp/dbcp2/managed/TransactionRegistry.java| 2 +- .../dbcp/dbcp2/managed/XAConnectionFactory.java| 4 +- .../org/apache/tomcat/dbcp/dbcp2/package-info.java | 12 +- .../util/bcel/classfile/ArrayElementValue.java | 4 +- .../tomcat/util/bcel/classfile/ElementValue.java | 1 + webapps/docs/changelog.xml | 6 + 40 files changed, 478 insertions(+), 410 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Update internal fork of Commons BCEL to 6.9.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c611488dc94a063e19ef8f4aed9e999ebb2f48fe
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:04:15 2024 +0100
Update internal fork of Commons BCEL to 6.9.0
---
MERGE.txt | 2 +-
java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java | 4 ++--
java/org/apache/tomcat/util/bcel/classfile/ElementValue.java | 1 +
webapps/docs/changelog.xml| 3 +++
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index a4c15506df..e64865b4cd 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -37,7 +37,7 @@ Unused code is removed
Sub-tree:
src/main/java/org/apache/bcel
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-bcel-6.8.2 (2024-02-25)
+rel/commons-bcel-6.9.0 (2024-04-27)
FileUpload
--
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
index 48a3644729..69a85b2c72 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
@@ -21,12 +21,12 @@ public class ArrayElementValue extends ElementValue
// For array types, this is the array
private final ElementValue[] elementValues;
-ArrayElementValue(final int type, final ElementValue[] datums, final
ConstantPool cpool) {
+ArrayElementValue(final int type, final ElementValue[] elementValues,
final ConstantPool cpool) {
super(type, cpool);
if (type != ARRAY) {
throw new ClassFormatException("Only element values of type array
can be built with this ctor - type specified: " + type);
}
-this.elementValues = datums;
+this.elementValues = elementValues != null ? elementValues :
ElementValue.EMPTY_ARRAY;
}
public ElementValue[] getElementValuesArray() {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
index 8c68b3f696..3894f60a1a 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
@@ -60,6 +60,7 @@ public abstract class ElementValue {
public static final byte PRIMITIVE_LONG = 'J';
public static final byte PRIMITIVE_SHORT = 'S';
public static final byte PRIMITIVE_BOOLEAN = 'Z';
+static final ElementValue[] EMPTY_ARRAY = {};
/**
* Reads an {@code element_value} as an {@code ElementValue}.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5e3a82cd9f..e53f099bcc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -232,6 +232,9 @@
Update SpotBugs to 4.8.4. (markt)
+
+Update the internal fork of Apache Commons BCEL to 6.9.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Align with Commons DBCP 2.12.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 287f97c53a36416d3f2964e160c8b65b6e61e8da
Author: Mark Thomas
AuthorDate: Mon Apr 29 12:59:25 2024 +0100
Align with Commons DBCP 2.12.0
Based on review of diff
---
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 3 ++-
.../tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 10 ++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 0e4aaa06bd..790141e622 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -727,8 +727,9 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the underlying connection pool.
*
* @return the underlying connection pool.
+ * @since DBCP 2.10.0
*/
-protected GenericObjectPool getConnectionPool() {
+public GenericObjectPool getConnectionPool() {
return connectionPool;
}
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
index ae2dc3be23..3007a6cdcb 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java
@@ -573,11 +573,13 @@ public class DriverAdapterCPDS implements
ConnectionPoolDataSource, Referenceabl
assertInitializationAllowed();
connectionProperties = props;
if (connectionProperties != null) {
-if (connectionProperties.containsKey(Constants.KEY_USER)) {
-setUser(connectionProperties.getProperty(Constants.KEY_USER));
+final String user =
connectionProperties.getProperty(Constants.KEY_USER);
+if (user != null) {
+setUser(user);
}
-if (connectionProperties.containsKey(Constants.KEY_PASSWORD)) {
-
setPassword(connectionProperties.getProperty(Constants.KEY_PASSWORD));
+final String password =
connectionProperties.getProperty(Constants.KEY_PASSWORD);
+if (password != null) {
+setPassword(password);
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch main updated: Refactor storage of trailer fields to use MimeHeaders
Mark,
On 4/24/24 14:47, ma...@apache.org wrote:
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new f087decbc9 Refactor storage of trailer fields to use MimeHeaders
f087decbc9 is described below
commit f087decbc938eff084b7be92298457736fe783c2
Author: Mark Thomas
AuthorDate: Wed Apr 24 19:47:33 2024 +0100
Refactor storage of trailer fields to use MimeHeaders
---
java/org/apache/catalina/connector/Request.java | 4 ++--
java/org/apache/coyote/Request.java | 15 +--
.../coyote/http11/filters/ChunkedInputFilter.java | 6 +++---
java/org/apache/coyote/http2/Stream.java | 2 +-
java/org/apache/tomcat/util/buf/StringUtils.java | 5 +
java/org/apache/tomcat/util/http/MimeHeaders.java | 19 +++
webapps/docs/changelog.xml| 8
7 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 390ca9daa1..6bf0f0a940 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1763,8 +1763,8 @@ public class Request implements HttpServletRequest {
if (!isTrailerFieldsReady()) {
throw new
IllegalStateException(sm.getString("coyoteRequest.trailersNotReady"));
}
-Map result = new
HashMap<>(coyoteRequest.getTrailerFields());
-return result;
+// No need for a defensive copy since a new Map is returned for every
call.
+return coyoteRequest.getTrailerFields();
}
diff --git a/java/org/apache/coyote/Request.java b/java/org/apache/coyote/Request.java
index 680aec6a7b..bf948b09a6 100644
--- a/java/org/apache/coyote/Request.java
+++ b/java/org/apache/coyote/Request.java
@@ -110,7 +110,7 @@ public final class Request {
private final MessageBytes localAddrMB = MessageBytes.newInstance();
private final MimeHeaders headers = new MimeHeaders();
-private final Map trailerFields = new HashMap<>();
+private final MimeHeaders trailerFields = new MimeHeaders();
/**
* Path parameters
@@ -293,6 +293,11 @@ public final class Request {
public Map getTrailerFields() {
+return trailerFields.toMap();
+}
Should getTrailerFields call getMimeTrailerFields instead of using
this.trailerFields directly? I'm not sure how much we really care about
subclasses...
-chris
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update SpotBugs to 4.8.4
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7d3ed9890e Update SpotBugs to 4.8.4
7d3ed9890e is described below
commit 7d3ed9890e059616d8fdf2a9439421bac520b02f
Author: Mark Thomas
AuthorDate: Mon Apr 29 10:22:08 2024 +0100
Update SpotBugs to 4.8.4
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index daa0782b31..8349f05d66 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -294,10 +294,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.3
+spotbugs.version=4.8.4
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=cf12a31f67d07e4da7d0e8ec7b3e9abcc891aae62af5e95a91c27f1f29470042d9b5d57e2cb2ec2aa07349313661e41b51de8442b17ec972b1f066bb36e77603
+spotbugs.checksum.value=3bdd417e4cd8e451ccc7d6fa41940d22038cb4558af9d1919f7c1eb6e442158fa11c53620ee471ed5550c7ea33930cab283c66513a28bc8d744919bac9510f8f
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2e2b5f2a79..08801ddc57 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -214,6 +214,9 @@
Update JaCoCo to 0.8.12. (markt)
+
+Update SpotBugs to 4.8.4. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update SpotBugs to 4.8.4
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new fed5e0e1b6 Update SpotBugs to 4.8.4
fed5e0e1b6 is described below
commit fed5e0e1b6e85f5e75f9df88e86585f9207a6a14
Author: Mark Thomas
AuthorDate: Mon Apr 29 10:22:08 2024 +0100
Update SpotBugs to 4.8.4
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 7258f7d22f..48f2b60e88 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -292,10 +292,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.3
+spotbugs.version=4.8.4
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=cf12a31f67d07e4da7d0e8ec7b3e9abcc891aae62af5e95a91c27f1f29470042d9b5d57e2cb2ec2aa07349313661e41b51de8442b17ec972b1f066bb36e77603
+spotbugs.checksum.value=3bdd417e4cd8e451ccc7d6fa41940d22038cb4558af9d1919f7c1eb6e442158fa11c53620ee471ed5550c7ea33930cab283c66513a28bc8d744919bac9510f8f
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d37056e4f8..47c4b174b5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -205,6 +205,9 @@
Update JaCoCo to 0.8.12. (markt)
+
+Update SpotBugs to 4.8.4. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update SpotBugs to 4.8.4
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 7706bdc80f Update SpotBugs to 4.8.4
7706bdc80f is described below
commit 7706bdc80f2f1b6f41d8db3070d1a82cba081fcb
Author: Mark Thomas
AuthorDate: Mon Apr 29 10:22:08 2024 +0100
Update SpotBugs to 4.8.4
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 5179a79860..c06d3849dc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -271,10 +271,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.3
+spotbugs.version=4.8.4
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=cf12a31f67d07e4da7d0e8ec7b3e9abcc891aae62af5e95a91c27f1f29470042d9b5d57e2cb2ec2aa07349313661e41b51de8442b17ec972b1f066bb36e77603
+spotbugs.checksum.value=3bdd417e4cd8e451ccc7d6fa41940d22038cb4558af9d1919f7c1eb6e442158fa11c53620ee471ed5550c7ea33930cab283c66513a28bc8d744919bac9510f8f
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e191919ef3..5e3a82cd9f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -229,6 +229,9 @@
Update JaCoCo to 0.8.12. (markt)
+
+Update SpotBugs to 4.8.4. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update JacoCo to 0.8.12
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3c9d4338b4 Update JacoCo to 0.8.12
3c9d4338b4 is described below
commit 3c9d4338b4ef04b5edb045435e6535d9675c32ae
Author: Mark Thomas
AuthorDate: Mon Apr 29 10:11:07 2024 +0100
Update JacoCo to 0.8.12
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 2bbd2cc46d..daa0782b31 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -285,10 +285,10 @@
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.11
+jacoco.version=0.8.12
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=2e4992dc1d63a86cdcb5084f9a5b8ebc|027b1d840385543736a3a2c3652fa67ba39025d2
+jacoco.checksum.value=a85698213c36c6c964b1d4011a5f8770|c77282468d7e311b7e3e4b03dc9a8c7837902b4b
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a9b962f839..2e2b5f2a79 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -211,6 +211,9 @@
Update Checkstyle to 10.16.0. (markt)
+
+Update JaCoCo to 0.8.12. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update JacoCo to 0.8.12
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new f7fb972247 Update JacoCo to 0.8.12
f7fb972247 is described below
commit f7fb972247248ba8dc6e1f7b658fec6c3ae5de8c
Author: Mark Thomas
AuthorDate: Mon Apr 29 10:11:07 2024 +0100
Update JacoCo to 0.8.12
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 23140edf83..7258f7d22f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -283,10 +283,10 @@
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.11
+jacoco.version=0.8.12
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=2e4992dc1d63a86cdcb5084f9a5b8ebc|027b1d840385543736a3a2c3652fa67ba39025d2
+jacoco.checksum.value=a85698213c36c6c964b1d4011a5f8770|c77282468d7e311b7e3e4b03dc9a8c7837902b4b
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d5eda808c3..d37056e4f8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -202,6 +202,9 @@
Update Checkstyle to 10.16.0. (markt)
+
+Update JaCoCo to 0.8.12. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update JacoCo to 0.8.12
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new fb40bc5514 Update JacoCo to 0.8.12
fb40bc5514 is described below
commit fb40bc5514c636dfd10fb76d5c3c3efe218a6797
Author: Mark Thomas
AuthorDate: Mon Apr 29 10:11:07 2024 +0100
Update JacoCo to 0.8.12
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 06fcfcc6e3..5179a79860 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -262,10 +262,10 @@
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.11
+jacoco.version=0.8.12
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=2e4992dc1d63a86cdcb5084f9a5b8ebc|027b1d840385543736a3a2c3652fa67ba39025d2
+jacoco.checksum.value=a85698213c36c6c964b1d4011a5f8770|c77282468d7e311b7e3e4b03dc9a8c7837902b4b
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cb4964209d..e191919ef3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -226,6 +226,9 @@
Update Checkstyle to 10.16.0. (markt)
+
+Update JaCoCo to 0.8.12. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update Checkstyle to 10.16.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e5c2ab5ac9 Update Checkstyle to 10.16.0
e5c2ab5ac9 is described below
commit e5c2ab5ac9e06da804bf9b4cf11abe2b21386199
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:43:29 2024 +0100
Update Checkstyle to 10.16.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 57d88220ec..2bbd2cc46d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -276,10 +276,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.14.1
+checkstyle.version=10.16.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=59c734883c7770429ef5f977f4139724da86caa932fb365a186e1bf47b5a6e04c718c1dba8ed383c0979a594586c608af1aa30bbec6f4c444c08c3009473e245
+checkstyle.checksum.value=a5bc5d725ddb3125c602385221f15c085d6f5244e36d5dc8b661f7adfa864c7bfcf0c68444632e75669a94d79fdf54173d38908b9f4612eb748619cb3d256142
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 87c809e603..a9b962f839 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -208,6 +208,9 @@
Update UnboundID to 7.0.0. (markt)
+
+Update Checkstyle to 10.16.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update Checkstyle to 10.16.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 094e2ef8cb Update Checkstyle to 10.16.0
094e2ef8cb is described below
commit 094e2ef8cb9a72def4f176b25f5c3eacbb5e29c9
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:43:29 2024 +0100
Update Checkstyle to 10.16.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4d437ed6de..06fcfcc6e3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -253,10 +253,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.14.1
+checkstyle.version=10.16.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=59c734883c7770429ef5f977f4139724da86caa932fb365a186e1bf47b5a6e04c718c1dba8ed383c0979a594586c608af1aa30bbec6f4c444c08c3009473e245
+checkstyle.checksum.value=a5bc5d725ddb3125c602385221f15c085d6f5244e36d5dc8b661f7adfa864c7bfcf0c68444632e75669a94d79fdf54173d38908b9f4612eb748619cb3d256142
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 64136599c8..cb4964209d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -223,6 +223,9 @@
Update UnboundID to 7.0.0. (markt)
+
+Update Checkstyle to 10.16.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update Checkstyle to 10.16.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new e27b6f7eca Update Checkstyle to 10.16.0
e27b6f7eca is described below
commit e27b6f7ecaee669daddb79fa3d961184d654db8f
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:43:29 2024 +0100
Update Checkstyle to 10.16.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 3be83fc3b9..23140edf83 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -274,10 +274,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.14.1
+checkstyle.version=10.16.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=59c734883c7770429ef5f977f4139724da86caa932fb365a186e1bf47b5a6e04c718c1dba8ed383c0979a594586c608af1aa30bbec6f4c444c08c3009473e245
+checkstyle.checksum.value=a5bc5d725ddb3125c602385221f15c085d6f5244e36d5dc8b661f7adfa864c7bfcf0c68444632e75669a94d79fdf54173d38908b9f4612eb748619cb3d256142
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 89b7b4aa52..d5eda808c3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -199,6 +199,9 @@
Update UnboundID to 7.0.0. (markt)
+
+Update Checkstyle to 10.16.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update UnboundID to 7.0.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 6fb4a5483e Update UnboundID to 7.0.0
6fb4a5483e is described below
commit 6fb4a5483e9df45a9c34e8298803f0aa304d6de5
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:38:00 2024 +0100
Update UnboundID to 7.0.0
Note: Minimum Java version is now Java 8
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e2b755477c..57d88220ec 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -267,10 +267,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.11
+unboundid.version=7.0.0
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=4bb1dc4adef77fd124d1b184556c44b44945fc69f62662c62f46cff9a6792c24ed385c6a01854797ec069df42286ba51b3d1e3c7a6ee9ee4a3e69908850ffa36
+unboundid.checksum.value=e9f9d1f5b954ab6939d5bf799f399a26896271547cc1fd061bb2710dc83d8ff6ae0d2fadf3062eccd8717ff0891c92fc871acfcefdf09c0fe8fa36018d609e5e
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e647e0b1d7..87c809e603 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -203,7 +203,10 @@
(markt)
-Update NSIS to 3.10. (markt)
+Update NSIS to 3.10. (mark0t)
+
+
+Update UnboundID to 7.0.0. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update UnboundID to 7.0.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 4cf3c2c5aa Update UnboundID to 7.0.0
4cf3c2c5aa is described below
commit 4cf3c2c5aa4abe0670c5e28fb9d9e77599b00517
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:38:00 2024 +0100
Update UnboundID to 7.0.0
Note: Minimum Java version is now Java 8
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 60e7779b1c..3be83fc3b9 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -265,10 +265,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.11
+unboundid.version=7.0.0
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=4bb1dc4adef77fd124d1b184556c44b44945fc69f62662c62f46cff9a6792c24ed385c6a01854797ec069df42286ba51b3d1e3c7a6ee9ee4a3e69908850ffa36
+unboundid.checksum.value=e9f9d1f5b954ab6939d5bf799f399a26896271547cc1fd061bb2710dc83d8ff6ae0d2fadf3062eccd8717ff0891c92fc871acfcefdf09c0fe8fa36018d609e5e
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 01a670555d..89b7b4aa52 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -194,7 +194,10 @@
(markt)
-Update NSIS to 3.10. (markt)
+Update NSIS to 3.10. (mark0t)
+
+
+Update UnboundID to 7.0.0. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update UnboundID to 7.0.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e93ec0dba3 Update UnboundID to 7.0.0
e93ec0dba3 is described below
commit e93ec0dba3098a7b1ec523e4e61298fcc798f6ad
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:38:00 2024 +0100
Update UnboundID to 7.0.0
Note: Minimum Java version is now Java 8
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 8e4a467ca0..4d437ed6de 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -244,10 +244,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.11
+unboundid.version=7.0.0
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=4bb1dc4adef77fd124d1b184556c44b44945fc69f62662c62f46cff9a6792c24ed385c6a01854797ec069df42286ba51b3d1e3c7a6ee9ee4a3e69908850ffa36
+unboundid.checksum.value=e9f9d1f5b954ab6939d5bf799f399a26896271547cc1fd061bb2710dc83d8ff6ae0d2fadf3062eccd8717ff0891c92fc871acfcefdf09c0fe8fa36018d609e5e
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 32cf59621c..64136599c8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -218,7 +218,10 @@
Update to the Eclipse JDT compiler 4.31. (markt)
-Update NSIS to 3.10. (markt)
+Update NSIS to 3.10. (mark0t)
+
+
+Update UnboundID to 7.0.0. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update NSIS to 3.10
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 611613cf62 Update NSIS to 3.10
611613cf62 is described below
commit 611613cf62de17121130c96369e6974c446016ef
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:25:31 2024 +0100
Update NSIS to 3.10
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index b597c46e56..e2b755477c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -178,10 +178,10 @@
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-${tomcat-native-openssl.version}-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.09
+nsis.version=3.10
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=2953f6074bcc4711b439a666eafbb91b|586855a743a6e0ade203d8758af303a48ee0716b
+nsis.checksum.value=e3e2803a13ead75e4471a51069d04c20|22cf776b463c6c845444328341219167abf399dc
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index dbf0c637a8..e647e0b1d7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -202,6 +202,9 @@
Commons Codec has been deprecated and will be removed in Tomcat 11.
(markt)
+
+Update NSIS to 3.10. (markt)
+
@@ -1089,7 +1092,7 @@
Contributed by Michal Sobkiewicz. (schultz)
-Update NSIS to 3.0.9. (markt)
+Update NSIS to 3.09. (markt)
Update Checkstyle to 10.12.2. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update NSIS to 3.10
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 2a396de267 Update NSIS to 3.10
2a396de267 is described below
commit 2a396de2673d7f9d0125909144fb4046af826e79
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:25:31 2024 +0100
Update NSIS to 3.10
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9a6764c453..60e7779b1c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -176,10 +176,10 @@
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-${tomcat-native-openssl.version}-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.09
+nsis.version=3.10
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=2953f6074bcc4711b439a666eafbb91b|586855a743a6e0ade203d8758af303a48ee0716b
+nsis.checksum.value=e3e2803a13ead75e4471a51069d04c20|22cf776b463c6c845444328341219167abf399dc
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f736ed04db..01a670555d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -193,6 +193,9 @@
Commons Codec has been deprecated and will be removed in Tomcat 11.
(markt)
+
+Update NSIS to 3.10. (markt)
+
@@ -1129,7 +1132,7 @@
-Update NSIS to 3.0.9. (markt)
+Update NSIS to 3.09. (markt)
Update Checkstyle to 10.12.2. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update NSIS to 3.10
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 0af751f84d Update NSIS to 3.10
0af751f84d is described below
commit 0af751f84d53745cee83cbc36287cd2000cdb64a
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:25:31 2024 +0100
Update NSIS to 3.10
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index a1fc6e5f17..8e4a467ca0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -155,10 +155,10 @@
tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-nativ
tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-${tomcat-native-openssl.version}-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.09
+nsis.version=3.10
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=2953f6074bcc4711b439a666eafbb91b|586855a743a6e0ade203d8758af303a48ee0716b
+nsis.checksum.value=e3e2803a13ead75e4471a51069d04c20|22cf776b463c6c845444328341219167abf399dc
nsis.home=${base.path}/nsis-${nsis.version}
nsis.exe=${nsis.home}/makensis.exe
nsis.arch.dir=x86-unicode/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 53f60a70d2..32cf59621c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -217,6 +217,9 @@
Update to the Eclipse JDT compiler 4.31. (markt)
+
+Update NSIS to 3.10. (markt)
+
@@ -1254,7 +1257,7 @@
-Update NSIS to 3.0.9. (markt)
+Update NSIS to 3.09. (markt)
Update Checkstyle to 10.12.2. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Add support for Java 23
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 29c214ce03 Add support for Java 23
29c214ce03 is described below
commit 29c214ce03a6184e616090c43df27a7938b64eb8
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:03:32 2024 +0100
Add support for Java 23
---
java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
webapps/docs/changelog.xml | 11 +++
2 files changed, 22 insertions(+)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index c0d2573321..979b552fef 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -341,6 +341,11 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// Java 8.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "22");
+} else if (opt.equals("23")) {
+// Constant not available in latest ECJ version that runs on
+// Java 8.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "23");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
@@ -435,6 +440,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
settings.put(CompilerOptions.OPTION_Compliance, "22");
+} else if (opt.equals("23")) {
+// Constant not available in latest ECJ version that runs on
+// Java 8.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "23");
+settings.put(CompilerOptions.OPTION_Compliance, "23");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_1_8);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a944a64d85..dbf0c637a8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -183,6 +183,17 @@
+
+
+
+Add support for specifying Java 23 (with the value 23) as
+the compiler source and/or compiler target for JSP compilation. If used
+with an Eclipse JDT compiler version that does not support these
values,
+a warning will be logged and the default will used.
+(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix comment
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new abcdaa6a3a Fix comment
abcdaa6a3a is described below
commit abcdaa6a3a6233c0e568a3125c0e702aa73e3ab8
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:08:35 2024 +0100
Fix comment
---
java/org/apache/jasper/compiler/JDTCompiler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index e34a911166..5231a4e1eb 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -423,8 +423,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
settings.put(CompilerOptions.OPTION_Compliance, "22");
} else if (opt.equals("23")) {
-// Constant not available in latest ECJ version shipped with
-// Tomcat. May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 11.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "23");
settings.put(CompilerOptions.OPTION_Compliance, "23");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Add support for Java 23
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new f8ea6383c2 Add support for Java 23
f8ea6383c2 is described below
commit f8ea6383c2e9c93f2e2bd748331a55524ac98374
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:03:32 2024 +0100
Add support for Java 23
---
java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
webapps/docs/changelog.xml | 11 +++
2 files changed, 22 insertions(+)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 2179f3a7e7..e34a911166 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -332,6 +332,11 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// Java 11.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "22");
+} else if (opt.equals("23")) {
+// Constant not available in latest ECJ version that runs on
+// Java 11.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "23");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_11);
@@ -417,6 +422,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
settings.put(CompilerOptions.OPTION_Compliance, "22");
+} else if (opt.equals("23")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "23");
+settings.put(CompilerOptions.OPTION_Compliance, "23");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_11);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b022f03249..f736ed04db 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -174,6 +174,17 @@
+
+
+
+Add support for specifying Java 23 (with the value 23) as
+the compiler source and/or compiler target for JSP compilation. If used
+with an Eclipse JDT compiler version that does not support these
values,
+a warning will be logged and the default will used.
+(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Add support for Java 23
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 096e13459dc74760510d3abe2102810cb7566c1c
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:03:32 2024 +0100
Add support for Java 23
---
java/org/apache/jasper/compiler/JDTCompiler.java | 11 ---
webapps/docs/changelog.xml | 11 +++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 16bf7060f7..e5b5d1a278 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -322,10 +322,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
} else if (opt.equals("21")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_21);
} else if (opt.equals("22")) {
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_22);
+} else if (opt.equals("23")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
-settings.put(CompilerOptions.OPTION_Source, "22");
+settings.put(CompilerOptions.OPTION_Source, "23");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_17);
@@ -400,11 +402,14 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_21);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_21);
} else if (opt.equals("22")) {
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_22);
+settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_22);
+} else if (opt.equals("23")) {
// Constant not available in latest ECJ version shipped with
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
-settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
-settings.put(CompilerOptions.OPTION_Compliance, "22");
+settings.put(CompilerOptions.OPTION_TargetPlatform, "23");
+settings.put(CompilerOptions.OPTION_Compliance, "23");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_17);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6e0838465d..53f60a70d2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -196,6 +196,17 @@
+
+
+
+Add support for specifying Java 23 (with the value 23) as
+the compiler source and/or compiler target for JSP compilation. If used
+with an Eclipse JDT compiler version that does not support these
values,
+a warning will be logged and the default will used.
+(markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (e9046d96a6 -> 096e13459d)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from e9046d96a6 Add support for timescales with time-taken access log token. (#721) new 85cc21837a Update JDT to 4.31 (March 2024) new 096e13459d Add support for Java 23 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 12 ++-- java/org/apache/jasper/compiler/JDTCompiler.java | 11 --- res/maven/tomcat-jasper.pom | 2 +- webapps/docs/changelog.xml | 14 ++ 4 files changed, 29 insertions(+), 10 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Update JDT to 4.31 (March 2024)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 85cc21837a80e55cc508724f27b18fa85b4a1922
Author: Mark Thomas
AuthorDate: Mon Apr 29 09:03:17 2024 +0100
Update JDT to 4.31 (March 2024)
---
build.properties.default| 12 ++--
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 3 +++
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0d6d7cabdc..a1fc6e5f17 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -123,15 +123,15 @@ base-maven.loc=https://repo.maven.apache.org/maven2
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.30" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.30-202312010110/checksum/eclipse-4.30-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.31" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.31-202402290520/checksum/eclipse-4.31-SUMSSHA512
#
-jdt.version=4.30
-jdt.release=R-4.30-202312010110
+jdt.version=4.31
+jdt.release=R-4.31-202402290520
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=f889b0f305cdf6b548e13ef73cd8ec488be3bf43a3d48659a1fcfce01068fb47adb398bb6006a067d61cfefbee7ecc279e4fcea385f27be211817709cdebc54e
+jdt.checksum.value=1f31bea2297013601ba7a3e0a8c65d7b621601c106fe10bf2a11af625d63aa0772941fa029fb392cd9fe2314203e6ef7e04a94dc938e15961108494139fae3e8
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index fd97e2a35f..6976884efa 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
org.eclipse.jdt
ecj
- 3.36.0
+ 3.37.0
org.apache.tomcat
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cc82d7932b..6e0838465d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -203,6 +203,9 @@
rather than the version provided by Commons Codec. This removes the
internal fork of Commons Codec. (markt)
+
+Update to the Eclipse JDT compiler 4.31. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
