[Bug 65776] "Duplicate accept detected" error from a subsequent request with the same local port
https://bz.apache.org/bugzilla/show_bug.cgi?id=65776 --- Comment #4 from Mark Thomas --- The simplest thing to do is to run the pure C test case provided in the Java bug report: https://bugs.openjdk.java.net/browse/JDK-8263243?focusedCommentId=14410275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-14410275 If you see the error then raise a bug with CentOS. I'd recommend including a link to at least the Java bug report for background. -- 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] branch main updated: Additional locking to improve protection for concurrent modifications
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 5140760 Additional locking to improve protection for concurrent
modifications
5140760 is described below
commit 5140760a3853ef0ced5d2a1c51349a98a2f62905
Author: Mark Thomas
AuthorDate: Sun Jan 2 13:16:16 2022 +
Additional locking to improve protection for concurrent modifications
---
.../catalina/users/DataSourceUserDatabase.java | 481 -
res/spotbugs/filter-false-positives.xml| 10 +
webapps/docs/changelog.xml | 4 +
3 files changed, 298 insertions(+), 197 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index a010498..cd3c319 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -220,14 +220,26 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*/
protected boolean readonly = true;
-
+// The write lock on the database is assumed to include the write locks
+// for groups, users and roles.
private final ReentrantReadWriteLock dbLock = new ReentrantReadWriteLock();
-private final Lock readLock = dbLock.readLock();
-private final Lock writeLock = dbLock.writeLock();
+private final Lock dbReadLock = dbLock.readLock();
+private final Lock dbWriteLock = dbLock.writeLock();
+private final ReentrantReadWriteLock groupsLock = new
ReentrantReadWriteLock();
+private final Lock groupsReadLock = groupsLock.readLock();
+private final Lock groupsWriteLock = groupsLock.writeLock();
+
+private final ReentrantReadWriteLock usersLock = new
ReentrantReadWriteLock();
+private final Lock usersReadLock = usersLock.readLock();
+private final Lock usersWriteLock = usersLock.writeLock();
+
+private final ReentrantReadWriteLock rolesLock = new
ReentrantReadWriteLock();
+private final Lock rolesReadLock = rolesLock.readLock();
+private final Lock rolesWriteLock = rolesLock.writeLock();
-// - Properties
+// - Properties
/**
* @return the name of the JNDI JDBC DataSource.
@@ -445,109 +457,124 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
@Override
public Iterator getGroups() {
-readLock.lock();
+dbReadLock.lock();
try {
-HashMap groups = new HashMap<>();
-groups.putAll(createdGroups);
-groups.putAll(modifiedGroups);
-
-Connection dbConnection = openConnection();
-if (dbConnection != null && preparedAllGroups != null) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
-try (ResultSet rs = stmt.executeQuery()) {
-while (rs.next()) {
-String groupName = rs.getString(1);
-if (groupName != null) {
-if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
-Group group =
findGroupInternal(dbConnection, groupName);
-if (group != null) {
-groups.put(groupName, group);
+groupsReadLock.lock();
+try {
+HashMap groups = new HashMap<>();
+groups.putAll(createdGroups);
+groups.putAll(modifiedGroups);
+
+Connection dbConnection = openConnection();
+if (dbConnection != null && preparedAllGroups != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
+try (ResultSet rs = stmt.executeQuery()) {
+while (rs.next()) {
+String groupName = rs.getString(1);
+if (groupName != null) {
+if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
+Group group =
findGroupInternal(dbConnection, groupName);
+if (group != null) {
+groups.put(groupName, group);
+}
}
}
}
}
+} catch (SQLException e) {
+
log.error(sm.getString("dataSourceUserData
[tomcat] branch main updated: Update false positives to clear remaining issues when running plugin
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 b8bbf30 Update false positives to clear remaining issues when running plugin b8bbf30 is described below commit b8bbf309f98a1a86703a55f161549013a94a7d6b Author: Mark Thomas AuthorDate: Sun Jan 2 13:33:06 2022 + Update false positives to clear remaining issues when running plugin --- res/spotbugs/filter-false-positives.xml | 61 + 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 589e42c..f924615 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -1248,6 +1248,12 @@ + + + + + + @@ -1813,6 +1819,18 @@ + + + + + + + + + + + + @@ -1822,6 +1840,18 @@ + + + + + + + + + + + + @@ -2400,35 +2430,26 @@ - - - - - - - + + + + - - - - - - - + @@ -2437,6 +2458,18 @@ + + + + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated (16c2c3f -> a36065d)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 16c2c3f Improve escaping for code in call method
new b6eddfc FindBugs -> SpotBugs (rename)
new f33d518 Exclude the SpotBug ranks we (currently) aren't looking at
new 2e306b7 Update SpotBugs to 4.5.2
new b3445f8 Back-port changes to address plugin reported false positives
new 965eed8 Address false positives reported when running via Ant
new a36065d Additional locking to improve protection for concurrent
modifications
The 6 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:
BUILDING.txt | 16 +-
build.properties.default | 18 +-
build.xml | 50 +--
.../catalina/users/DataSourceUserDatabase.java | 481 -
.../filter-false-positives.xml | 169 +++-
webapps/docs/changelog.xml | 11 +
6 files changed, 501 insertions(+), 244 deletions(-)
rename res/{findbugs => spotbugs}/filter-false-positives.xml (93%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/06: Exclude the SpotBug ranks we (currently) aren't looking at
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit f33d51873741f476a3308b5f68900416f134ea0c Author: Mark Thomas AuthorDate: Sat Jan 1 18:59:54 2022 + Exclude the SpotBug ranks we (currently) aren't looking at --- res/spotbugs/filter-false-positives.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 5d600a1..888137a 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -15,6 +15,15 @@ limitations under the License. --> + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/06: Update SpotBugs to 4.5.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2e306b7e1d189f309140708241c72a492cf9adb5
Author: Mark Thomas
AuthorDate: Sat Jan 1 19:30:48 2022 +
Update SpotBugs to 4.5.2
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index a196cfa..3d55063 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -284,10 +284,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.2.3
+spotbugs.version=4.5.2
spotbugs.checksum.enabled=true
-spotbugs.checksum.algorithm=MD5|SHA-1
-spotbugs.checksum.value=6eb4a01355a5770f02e136c80182baa6|37daf40c76f11f7ae31894ab8d8fefd7fcb9d07b
+spotbugs.checksum.algorithm=SHA-512
+spotbugs.checksum.value=6e6d4aab1a935f47f9cf4983c30c5c338a257339bd2a6ae4fea2204683d973a67bb95a9204e387ebf9c31070a998367afa12a3b1f812b01f2e27715b704bf194
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 189af27..5fb320b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -161,6 +161,9 @@
Improvements to Korean translations. (woonsan)
+
+Update SpotBugs to 4.5.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Back-port changes to address plugin reported false positives
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b3445f85df84316a38b85cd1ef60bc46e572f50a Author: Mark Thomas AuthorDate: Sun Jan 2 14:51:12 2022 + Back-port changes to address plugin reported false positives --- res/spotbugs/filter-false-positives.xml | 120 +++- 1 file changed, 119 insertions(+), 1 deletion(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 888137a..f2d2e37 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -377,6 +377,14 @@ + + + + + + @@ -394,6 +402,15 @@ + + + + + + + + + @@ -723,6 +740,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1040,6 +1081,12 @@ + + + + + + @@ -1145,6 +1192,15 @@ + + + + + + + + + @@ -1191,6 +1247,12 @@ + + + + + + @@ -1539,6 +1601,12 @@ + + + + + + @@ -1596,6 +1664,12 @@ + + + + + + @@ -1608,6 +1682,17 @@ + + + + + + + + + + @@ -1788,6 +1873,18 @@ + + + + + + + + + + + + @@ -1797,6 +1894,18 @@ + + + + + + + + + + + + @@ -2049,6 +2158,15 @@ + + + + + + + + + @@ -2377,7 +2495,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: FindBugs -> SpotBugs (rename)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b6eddfce7637e598521bb347be0dbee5861e5cdd
Author: Mark Thomas
AuthorDate: Sat Jan 1 18:59:30 2022 +
FindBugs -> SpotBugs (rename)
---
BUILDING.txt | 16 +++
build.properties.default | 18
build.xml | 50 +++---
.../filter-false-positives.xml | 4 +-
4 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index 4945f96..fc4af6f 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -519,26 +519,26 @@ target. The command is:
ant -Dexecute.validate=true validate
-(8.2) FindBugs
+(8.2) SpotBugs
-NOTE: FindBugs is licensed under LGPL. Using Findbugs during Tomcat build is
+NOTE: SpotBugs is licensed under LGPL. Using SpotBugs during Tomcat build is
optional and is off by default.
See https://spotbugs.github.io/ for more information.
-To enable FindBugs, add the following property to build.properties file:
+To enable SpotBugs, add the following property to build.properties file:
-execute.findbugs=true
+execute.spotbugs=true
-To compile Tomcat classes and generate a FindBugs report, call the
-"findbugs" target. For example:
+To compile Tomcat classes and generate a SpotBugs report, call the
+"spotbugs" target. For example:
cd ${tomcat.source}
-ant -Dexecute.findbugs=true findbugs
+ant -Dexecute.spotbugs=true spotbugs
The report file by default is written to
-output/findbugs
+output/spotbugs
(8.3) End-of-line conventions check
diff --git a/build.properties.default b/build.properties.default
index fe3f71c..a196cfa 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -68,8 +68,8 @@ test.threads=1
# Enabling code coverage extends the time taken to run the tests by ~50%
test.coverage=false
-# Note the FindBugs is LGPL licensed
-execute.findbugs=false
+# Note the SpotBugs is LGPL licensed
+execute.spotbugs=false
# Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
# multicast tests to work
@@ -284,13 +284,13 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-findbugs.version=4.2.3
-findbugs.checksum.enabled=true
-findbugs.checksum.algorithm=MD5|SHA-1
-findbugs.checksum.value=6eb4a01355a5770f02e136c80182baa6|37daf40c76f11f7ae31894ab8d8fefd7fcb9d07b
-findbugs.home=${base.path}/spotbugs-${findbugs.version}
-findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar
-findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz
+spotbugs.version=4.2.3
+spotbugs.checksum.enabled=true
+spotbugs.checksum.algorithm=MD5|SHA-1
+spotbugs.checksum.value=6eb4a01355a5770f02e136c80182baa6|37daf40c76f11f7ae31894ab8d8fefd7fcb9d07b
+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
# - bnd, version 5.3.0 or later -
# - provides OSGI metadata for JARs -
diff --git a/build.xml b/build.xml
index 707515f..9597d3b 100644
--- a/build.xml
+++ b/build.xml
@@ -188,10 +188,10 @@
-
-
-
-
+
+
+
+
@@ -2056,23 +2056,23 @@
-
+
-
-
+
+
-
+
-
+
-
+
@@ -2080,7 +2080,7 @@
-
+
@@ -3247,16 +3247,16 @@ skip.installer property in build.properties" />
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/res/findbugs/filter-false-positives.xml
b/res/spotbugs/filter-false-positives.xml
similarity index 99%
rename from res/findbugs/filter-false-positives.xml
rename to res/spotbugs/filter-false-positives.xml
index 84a054a..5d600a1 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-
+
@@ -1631,7 +1631,7 @@
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/06: Address false positives reported when running via Ant
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 965eed8500d093d46b775869a53549f715ab06f2 Author: Mark Thomas AuthorDate: Sun Jan 2 15:12:34 2022 + Address false positives reported when running via Ant --- res/spotbugs/filter-false-positives.xml | 36 +++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index f2d2e37..00189b0 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -546,6 +546,12 @@ + + + + + + @@ -840,6 +846,12 @@ + + + + + + @@ -1116,7 +1128,12 @@ - + + + + + @@ -1300,7 +1317,10 @@ - + + + + @@ -1705,6 +1725,18 @@ + + + + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/06: Additional locking to improve protection for concurrent modifications
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a36065dcb4139f50db82b637d1addf4001260a45
Author: Mark Thomas
AuthorDate: Sun Jan 2 13:16:16 2022 +
Additional locking to improve protection for concurrent modifications
---
.../catalina/users/DataSourceUserDatabase.java | 481 -
webapps/docs/changelog.xml | 8 +
2 files changed, 292 insertions(+), 197 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index a010498..cd3c319 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -220,14 +220,26 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*/
protected boolean readonly = true;
-
+// The write lock on the database is assumed to include the write locks
+// for groups, users and roles.
private final ReentrantReadWriteLock dbLock = new ReentrantReadWriteLock();
-private final Lock readLock = dbLock.readLock();
-private final Lock writeLock = dbLock.writeLock();
+private final Lock dbReadLock = dbLock.readLock();
+private final Lock dbWriteLock = dbLock.writeLock();
+private final ReentrantReadWriteLock groupsLock = new
ReentrantReadWriteLock();
+private final Lock groupsReadLock = groupsLock.readLock();
+private final Lock groupsWriteLock = groupsLock.writeLock();
+
+private final ReentrantReadWriteLock usersLock = new
ReentrantReadWriteLock();
+private final Lock usersReadLock = usersLock.readLock();
+private final Lock usersWriteLock = usersLock.writeLock();
+
+private final ReentrantReadWriteLock rolesLock = new
ReentrantReadWriteLock();
+private final Lock rolesReadLock = rolesLock.readLock();
+private final Lock rolesWriteLock = rolesLock.writeLock();
-// - Properties
+// - Properties
/**
* @return the name of the JNDI JDBC DataSource.
@@ -445,109 +457,124 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
@Override
public Iterator getGroups() {
-readLock.lock();
+dbReadLock.lock();
try {
-HashMap groups = new HashMap<>();
-groups.putAll(createdGroups);
-groups.putAll(modifiedGroups);
-
-Connection dbConnection = openConnection();
-if (dbConnection != null && preparedAllGroups != null) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
-try (ResultSet rs = stmt.executeQuery()) {
-while (rs.next()) {
-String groupName = rs.getString(1);
-if (groupName != null) {
-if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
-Group group =
findGroupInternal(dbConnection, groupName);
-if (group != null) {
-groups.put(groupName, group);
+groupsReadLock.lock();
+try {
+HashMap groups = new HashMap<>();
+groups.putAll(createdGroups);
+groups.putAll(modifiedGroups);
+
+Connection dbConnection = openConnection();
+if (dbConnection != null && preparedAllGroups != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
+try (ResultSet rs = stmt.executeQuery()) {
+while (rs.next()) {
+String groupName = rs.getString(1);
+if (groupName != null) {
+if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
+Group group =
findGroupInternal(dbConnection, groupName);
+if (group != null) {
+groups.put(groupName, group);
+}
}
}
}
}
+} catch (SQLException e) {
+
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
+} finally {
+closeConnection(dbConnection);
}
-} catch (SQLException e) {
-
log.error(sm.getString("dataSourceUserDataba
[tomcat] branch 9.0.x updated (3fc8342b -> 3eb4a0a)
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 3fc8342b Improve escaping for code in call method
new 74e1329 FindBugs -> SpotBugs (rename)
new 8c13846 Exclude the SpotBug ranks we (currently) aren't looking at
new cd85bf6 Update SpotBugs to 4.5.2
new bb6f8d3 Additional locking to improve protection for concurrent
modifications
new 16a7757 Back-port fixes for false positives from IDE plugin
new 3eb4a0a Back-port fixes for false positives when running via Ant
The 6 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:
BUILDING.txt | 16 +-
build.properties.default | 18 +-
build.xml | 50 +--
.../catalina/users/DataSourceUserDatabase.java | 481 -
.../filter-false-positives.xml | 169 +++-
webapps/docs/changelog.xml | 11 +
6 files changed, 501 insertions(+), 244 deletions(-)
rename res/{findbugs => spotbugs}/filter-false-positives.xml (93%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/06: Back-port fixes for false positives from IDE plugin
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 16a7757320a691c6d784a1ac46f95bcd30beb630 Author: Mark Thomas AuthorDate: Sun Jan 2 15:28:13 2022 + Back-port fixes for false positives from IDE plugin --- res/spotbugs/filter-false-positives.xml | 120 +++- 1 file changed, 119 insertions(+), 1 deletion(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 7373850..7245c93 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -377,6 +377,14 @@ + + + + + + @@ -417,6 +425,15 @@ + + + + + + + + + @@ -751,6 +768,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1068,6 +1109,12 @@ + + + + + + @@ -1173,6 +1220,15 @@ + + + + + + + + + @@ -1219,6 +1275,12 @@ + + + + + + @@ -1561,6 +1623,12 @@ + + + + + + @@ -1618,6 +1686,12 @@ + + + + + + @@ -1630,6 +1704,17 @@ + + + + + + + + + + @@ -1810,6 +1895,18 @@ + + + + + + + + + + + + @@ -1819,6 +1916,18 @@ + + + + + + + + + + + + @@ -2071,6 +2180,15 @@ + + + + + + + + + @@ -2405,7 +2523,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/06: Exclude the SpotBug ranks we (currently) aren't looking at
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 8c138465d5d9afff99e90bce141b637b2a5ad9ac Author: Mark Thomas AuthorDate: Sat Jan 1 18:59:54 2022 + Exclude the SpotBug ranks we (currently) aren't looking at --- res/spotbugs/filter-false-positives.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 337283c..7373850 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -15,6 +15,15 @@ limitations under the License. --> + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: FindBugs -> SpotBugs (rename)
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 74e1329de832ef6b69d98f671045b396f2df83b4
Author: Mark Thomas
AuthorDate: Sat Jan 1 18:59:30 2022 +
FindBugs -> SpotBugs (rename)
---
BUILDING.txt | 16 +++
build.properties.default | 18
build.xml | 50 +++---
.../filter-false-positives.xml | 4 +-
4 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index f765f2e..8ee2637 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -518,26 +518,26 @@ target. The command is:
ant -Dexecute.validate=true validate
-(8.2) FindBugs
+(8.2) SpotBugs
-NOTE: FindBugs is licensed under LGPL. Using Findbugs during Tomcat build is
+NOTE: SpotBugs is licensed under LGPL. Using SpotBugs during Tomcat build is
optional and is off by default.
See https://spotbugs.github.io/ for more information.
-To enable FindBugs, add the following property to build.properties file:
+To enable SpotBugs, add the following property to build.properties file:
-execute.findbugs=true
+execute.spotbugs=true
-To compile Tomcat classes and generate a FindBugs report, call the
-"findbugs" target. For example:
+To compile Tomcat classes and generate a SpotBugs report, call the
+"spotbugs" target. For example:
cd ${tomcat.source}
-ant -Dexecute.findbugs=true findbugs
+ant -Dexecute.spotbugs=true spotbugs
The report file by default is written to
-output/findbugs
+output/spotbugs
(8.3) End-of-line conventions check
diff --git a/build.properties.default b/build.properties.default
index 0f30684..993f6be 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -68,8 +68,8 @@ test.threads=1
# Enabling code coverage extends the time taken to run the tests by ~50%
test.coverage=false
-# Note the FindBugs is LGPL licensed
-execute.findbugs=false
+# Note the SpotBugs is LGPL licensed
+execute.spotbugs=false
# Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
# multicast tests to work
@@ -284,13 +284,13 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-findbugs.version=4.2.3
-findbugs.checksum.enabled=true
-findbugs.checksum.algorithm=MD5|SHA-1
-findbugs.checksum.value=6eb4a01355a5770f02e136c80182baa6|37daf40c76f11f7ae31894ab8d8fefd7fcb9d07b
-findbugs.home=${base.path}/spotbugs-${findbugs.version}
-findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar
-findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz
+spotbugs.version=4.2.3
+spotbugs.checksum.enabled=true
+spotbugs.checksum.algorithm=MD5|SHA-1
+spotbugs.checksum.value=6eb4a01355a5770f02e136c80182baa6|37daf40c76f11f7ae31894ab8d8fefd7fcb9d07b
+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
# - bnd, version 5.3.0 or later -
# - provides OSGI metadata for JARs -
diff --git a/build.xml b/build.xml
index 5ce4b1b..a51cbfb 100644
--- a/build.xml
+++ b/build.xml
@@ -188,10 +188,10 @@
-
-
-
-
+
+
+
+
@@ -2038,23 +2038,23 @@
-
+
-
-
+
+
-
+
-
+
-
+
@@ -2062,7 +2062,7 @@
-
+
@@ -3219,16 +3219,16 @@ skip.installer property in build.properties" />
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/res/findbugs/filter-false-positives.xml
b/res/spotbugs/filter-false-positives.xml
similarity index 99%
rename from res/findbugs/filter-false-positives.xml
rename to res/spotbugs/filter-false-positives.xml
index fac80f0..337283c 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-
+
@@ -1653,7 +1653,7 @@
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/06: Update SpotBugs to 4.5.2
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 cd85bf6919af5a64027ab3aed3b7181d358e5461
Author: Mark Thomas
AuthorDate: Sat Jan 1 19:30:48 2022 +
Update SpotBugs to 4.5.2
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 993f6be..9e75fef 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -284,10 +284,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.2.3
+spotbugs.version=4.5.2
spotbugs.checksum.enabled=true
-spotbugs.checksum.algorithm=MD5|SHA-1
-spotbugs.checksum.value=6eb4a01355a5770f02e136c80182baa6|37daf40c76f11f7ae31894ab8d8fefd7fcb9d07b
+spotbugs.checksum.algorithm=SHA-512
+spotbugs.checksum.value=6e6d4aab1a935f47f9cf4983c30c5c338a257339bd2a6ae4fea2204683d973a67bb95a9204e387ebf9c31070a998367afa12a3b1f812b01f2e27715b704bf194
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 205ee23..e5043ef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -161,6 +161,9 @@
Improvements to Korean translations. (woonsan)
+
+Update SpotBugs to 4.5.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Additional locking to improve protection for concurrent modifications
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 bb6f8d311dbd9780b13efd3fbf053573e297d095
Author: Mark Thomas
AuthorDate: Sun Jan 2 13:16:16 2022 +
Additional locking to improve protection for concurrent modifications
---
.../catalina/users/DataSourceUserDatabase.java | 481 -
webapps/docs/changelog.xml | 8 +
2 files changed, 292 insertions(+), 197 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index a010498..cd3c319 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -220,14 +220,26 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*/
protected boolean readonly = true;
-
+// The write lock on the database is assumed to include the write locks
+// for groups, users and roles.
private final ReentrantReadWriteLock dbLock = new ReentrantReadWriteLock();
-private final Lock readLock = dbLock.readLock();
-private final Lock writeLock = dbLock.writeLock();
+private final Lock dbReadLock = dbLock.readLock();
+private final Lock dbWriteLock = dbLock.writeLock();
+private final ReentrantReadWriteLock groupsLock = new
ReentrantReadWriteLock();
+private final Lock groupsReadLock = groupsLock.readLock();
+private final Lock groupsWriteLock = groupsLock.writeLock();
+
+private final ReentrantReadWriteLock usersLock = new
ReentrantReadWriteLock();
+private final Lock usersReadLock = usersLock.readLock();
+private final Lock usersWriteLock = usersLock.writeLock();
+
+private final ReentrantReadWriteLock rolesLock = new
ReentrantReadWriteLock();
+private final Lock rolesReadLock = rolesLock.readLock();
+private final Lock rolesWriteLock = rolesLock.writeLock();
-// - Properties
+// - Properties
/**
* @return the name of the JNDI JDBC DataSource.
@@ -445,109 +457,124 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
@Override
public Iterator getGroups() {
-readLock.lock();
+dbReadLock.lock();
try {
-HashMap groups = new HashMap<>();
-groups.putAll(createdGroups);
-groups.putAll(modifiedGroups);
-
-Connection dbConnection = openConnection();
-if (dbConnection != null && preparedAllGroups != null) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
-try (ResultSet rs = stmt.executeQuery()) {
-while (rs.next()) {
-String groupName = rs.getString(1);
-if (groupName != null) {
-if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
-Group group =
findGroupInternal(dbConnection, groupName);
-if (group != null) {
-groups.put(groupName, group);
+groupsReadLock.lock();
+try {
+HashMap groups = new HashMap<>();
+groups.putAll(createdGroups);
+groups.putAll(modifiedGroups);
+
+Connection dbConnection = openConnection();
+if (dbConnection != null && preparedAllGroups != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedAllGroups)) {
+try (ResultSet rs = stmt.executeQuery()) {
+while (rs.next()) {
+String groupName = rs.getString(1);
+if (groupName != null) {
+if (!groups.containsKey(groupName) &&
!removedGroups.containsKey(groupName)) {
+Group group =
findGroupInternal(dbConnection, groupName);
+if (group != null) {
+groups.put(groupName, group);
+}
}
}
}
}
+} catch (SQLException e) {
+
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
+} finally {
+closeConnection(dbConnection);
}
-} catch (SQLException e) {
-
log.error(sm.getString("dataSourceUserDatabas
[tomcat] 06/06: Back-port fixes for false positives when running via Ant
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 3eb4a0a4c544453a543a35d8eb2632bf300b4943 Author: Mark Thomas AuthorDate: Sun Jan 2 15:33:56 2022 + Back-port fixes for false positives when running via Ant --- res/spotbugs/filter-false-positives.xml | 36 +++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 7245c93..2307c6e 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -580,6 +580,12 @@ + + + + + + @@ -868,6 +874,12 @@ + + + + + + @@ -1144,7 +1156,12 @@ - + + + + + @@ -1328,7 +1345,10 @@ - + + + + @@ -1727,6 +1747,18 @@ + + + + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/04: FindBugs -> SpotBugs (rename)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 01a96b9fad9a9dd00999885dbe7c2803212eb99c
Author: Mark Thomas
AuthorDate: Sat Jan 1 18:59:30 2022 +
FindBugs -> SpotBugs (rename)
---
BUILDING.txt | 16 +++
build.properties.default | 18
build.xml | 50 +++---
.../filter-false-positives.xml | 4 +-
4 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index 5bb6184..97a0474 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -527,26 +527,26 @@ target. The command is:
ant -Dexecute.validate=true validate
-(8.2) FindBugs
+(8.2) SpotBugs
-NOTE: FindBugs is licensed under LGPL. Using Findbugs during Tomcat build is
+NOTE: SpotBugs is licensed under LGPL. Using SpotBugs during Tomcat build is
optional and is off by default.
See https://spotbugs.github.io/ for more information.
-To enable FindBugs, add the following property to build.properties file:
+To enable SpotBugs, add the following property to build.properties file:
-execute.findbugs=true
+execute.spotbugs=true
-To compile Tomcat classes and generate a FindBugs report, call the
-"findbugs" target. For example:
+To compile Tomcat classes and generate a SpotBugs report, call the
+"spotbugs" target. For example:
cd ${tomcat.source}
-ant -Dexecute.findbugs=true findbugs
+ant -Dexecute.spotbugs=true spotbugs
The report file by default is written to
-output/findbugs
+output/spotbugs
(8.3) End-of-line conventions check
diff --git a/build.properties.default b/build.properties.default
index a9e6c88..883143b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -67,8 +67,8 @@ test.threads=1
# Enabling code coverage extends the time taken to run the tests by ~50%
test.coverage=false
-# Note the FindBugs is LGPL licensed
-execute.findbugs=false
+# Note the SpotBugs is LGPL licensed
+execute.spotbugs=false
# Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
# multicast tests to work
@@ -297,13 +297,13 @@
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco
# - SpotBugs (originally FindBugs) -
# 3.1.12 is the last version that runs on Java 7
-findbugs.version=3.1.12
-findbugs.checksum.enabled=true
-findbugs.checksum.algorithm=MD5|SHA-1
-findbugs.checksum.value=8c54502a8e1b78ea6b173a186ce6f379|95114d9aaeeba7bd4ea5a3d6a2167cd6c87bb943
-findbugs.home=${base.path}/spotbugs-${findbugs.version}
-findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar
-findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz
+spotbugs.version=3.1.12
+spotbugs.checksum.enabled=true
+spotbugs.checksum.algorithm=MD5|SHA-1
+spotbugs.checksum.value=8c54502a8e1b78ea6b173a186ce6f379|95114d9aaeeba7bd4ea5a3d6a2167cd6c87bb943
+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
# - JSign, version 4.0 -
# JSign 3.0 onwards requires Java 8 by default
diff --git a/build.xml b/build.xml
index d006d2e..4747fb0 100644
--- a/build.xml
+++ b/build.xml
@@ -182,10 +182,10 @@
-
-
-
-
+
+
+
+
@@ -1650,23 +1650,23 @@
-
+
-
-
+
+
-
+
-
+
-
+
@@ -1674,7 +1674,7 @@
-
+
@@ -2883,16 +2883,16 @@ skip.installer property in build.properties" />
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/res/findbugs/filter-false-positives.xml
b/res/spotbugs/filter-false-positives.xml
similarity index 99%
rename from res/findbugs/filter-false-positives.xml
rename to res/spotbugs/filter-false-positives.xml
index c34cbe0..a74a575 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-
+
@@ -1627,7 +1627,7 @@
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated (6e87bba -> 261a939)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 6e87bba Back-port improvements to translations
new 01a96b9 FindBugs -> SpotBugs (rename)
new 7bedc1e Exclude the SpotBug ranks we (currently) aren't looking at
new 6141391 Back-port fixes fro false positives when running via IDE
plugin
new 261a939 Fix false positives running via Ant
The 4 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:
BUILDING.txt | 16 +--
build.properties.default | 18 ++--
build.xml | 50 -
.../filter-false-positives.xml | 119 -
4 files changed, 156 insertions(+), 47 deletions(-)
rename res/{findbugs => spotbugs}/filter-false-positives.xml (95%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/04: Fix false positives running via Ant
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 261a939025b2241fcc03e001771649528561c914 Author: Mark Thomas AuthorDate: Sun Jan 2 15:55:30 2022 + Fix false positives running via Ant --- res/spotbugs/filter-false-positives.xml | 18 ++ 1 file changed, 18 insertions(+) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index ef5b601..6527fd8 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -837,6 +837,12 @@ + + + + + + @@ -1674,6 +1680,18 @@ + + + + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/04: Back-port fixes fro false positives when running via IDE plugin
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 61413913c57954562697b795c60d09540d0fcbfc Author: Mark Thomas AuthorDate: Sun Jan 2 15:48:46 2022 + Back-port fixes fro false positives when running via IDE plugin --- res/spotbugs/filter-false-positives.xml | 88 +++-- 1 file changed, 85 insertions(+), 3 deletions(-) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index 96dcc6e..ef5b601 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -371,6 +371,14 @@ + + + + + + @@ -411,6 +419,15 @@ + + + + + + + + + @@ -1060,6 +1077,12 @@ + + + + + + @@ -1206,6 +1229,12 @@ + + + + + + @@ -1441,7 +1470,7 @@ - + @@ -1469,7 +1498,7 @@ - + @@ -1541,6 +1570,18 @@ + + + + + + + + + + + + @@ -1598,12 +1639,29 @@ + + + + + + + + + + + + + + + + @@ -1772,6 +1830,18 @@ + + + + + + + + + + + + @@ -1781,6 +1851,18 @@ + + + + + + + + + + + + @@ -2343,7 +2425,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Exclude the SpotBug ranks we (currently) aren't looking at
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 7bedc1e9a79938d130b307231dc9f194a87f0cd2 Author: Mark Thomas AuthorDate: Sat Jan 1 18:59:54 2022 + Exclude the SpotBug ranks we (currently) aren't looking at --- res/spotbugs/filter-false-positives.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml index a74a575..96dcc6e 100644 --- a/res/spotbugs/filter-false-positives.xml +++ b/res/spotbugs/filter-false-positives.xml @@ -15,6 +15,15 @@ limitations under the License. --> + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update Eclipse JDT from 4.20 to 4.22
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 278ea5e Update Eclipse JDT from 4.20 to 4.22
278ea5e is described below
commit 278ea5ef38707ccb07b7ad274a3fe6a2ea407791
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:02:32 2022 +
Update Eclipse JDT from 4.20 to 4.22
---
build.properties.default| 12 ++--
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 2 +-
webapps/docs/changelog.xml | 3 +++
6 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 96d09f3..6fad8f7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -135,15 +135,15 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - 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.20" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/checksum/eclipse-4.20-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.22" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/checksum/eclipse-4.22-SUMSSHA512
#
-jdt.version=4.20
-jdt.release=R-4.20-202106111600
+jdt.version=4.22
+jdt.release=R-4.22-202111241800
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158
+jdt.checksum.value=a014bbedd96b31576bb2b28ad16ac23edc15b59833ac810409fd42834ac6081b695167903bec0fa98d614031aeb863b3de28697d4636f23b2c47ffd93f443aae
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/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index cc24716..b081ec5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index a77a639..6e6a29a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
-
+
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 65b5205..c1c5039 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 81429d0..19d4262 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${base.path}/bnd-5.3.0/biz.aQute.bnd-5.3.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6
[tomcat] branch main updated: Update ECJ. The Maven artifact uses a different version number
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 3e93b3e Update ECJ. The Maven artifact uses a different version number 3e93b3e is described below commit 3e93b3ec27e9752a7a7930bcbc97319ef8bf3924 Author: Mark Thomas AuthorDate: Sun Jan 2 16:07:23 2022 + Update ECJ. The Maven artifact uses a different version number --- res/maven/tomcat-jasper.pom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom index cbd5193..36b2349 100644 --- a/res/maven/tomcat-jasper.pom +++ b/res/maven/tomcat-jasper.pom @@ -60,7 +60,7 @@ org.eclipse.jdt ecj - 3.26.0 + 3.28.0 org.apache.tomcat - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update Eclipse JDT from 4.20 to 4.22
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new d08f3d9 Update Eclipse JDT from 4.20 to 4.22
d08f3d9 is described below
commit d08f3d9a3126867cfc787626a2dc0295261016d3
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:02:32 2022 +
Update Eclipse JDT from 4.20 to 4.22
---
build.properties.default| 12 ++--
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 3 +++
7 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 3d55063..60d1598 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -137,15 +137,15 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - 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.20" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/checksum/eclipse-4.20-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.22" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/checksum/eclipse-4.22-SUMSSHA512
#
-jdt.version=4.20
-jdt.release=R-4.20-202106111600
+jdt.version=4.22
+jdt.release=R-4.22-202111241800
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158
+jdt.checksum.value=a014bbedd96b31576bb2b28ad16ac23edc15b59833ac810409fd42834ac6081b695167903bec0fa98d614031aeb863b3de28697d4636f23b2c47ffd93f443aae
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/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index cc24716..b081ec5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index a77a639..6e6a29a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
-
+
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 65b5205..c1c5039 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 81429d0..19d4262 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${base.path}/bnd-5.3.0/biz.aQute.bnd-5.3.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
+${base.path}/jaxrpc
[tomcat] branch 9.0.x updated: Update Eclipse JDT from 4.20 to 4.22
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 d15f31e Update Eclipse JDT from 4.20 to 4.22
d15f31e is described below
commit d15f31eb5f71da7b4ddf5b0f2fa3455ee853c31d
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:02:32 2022 +
Update Eclipse JDT from 4.20 to 4.22
---
build.properties.default| 12 ++--
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml| 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 3 +++
7 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9e75fef..a6bfa7d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -137,15 +137,15 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - 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.20" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/checksum/eclipse-4.20-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.22" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/checksum/eclipse-4.22-SUMSSHA512
#
-jdt.version=4.20
-jdt.release=R-4.20-202106111600
+jdt.version=4.22
+jdt.release=R-4.22-202111241800
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158
+jdt.checksum.value=a014bbedd96b31576bb2b28ad16ac23edc15b59833ac810409fd42834ac6081b695167903bec0fa98d614031aeb863b3de28697d4636f23b2c47ffd93f443aae
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/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index cdaafa4..ff016eb 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 6c06084..bb99ad9 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
-
+
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 65b5205..c1c5039 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index cdf2125..be85a56 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${base.path}/bnd-5.3.0/biz.aQute.bnd-5.3.0.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/
[tomcat] branch main updated: Add support for compiling JSPs for Java 18
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 0f6657c Add support for compiling JSPs for Java 18
0f6657c is described below
commit 0f6657c9a5dd030b5cab07567ac06469553a7aba
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:14:23 2022 +
Add support for compiling JSPs for Java 18
---
java/org/apache/jasper/compiler/JDTCompiler.java | 11 ---
webapps/docs/changelog.xml | 7 +++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 10d80e0..69c6e05 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -312,10 +312,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
} else if(opt.equals("16")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_16);
} else if(opt.equals("17")) {
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_17);
+} else if (opt.equals("18")) {
// 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, "17");
+settings.put(CompilerOptions.OPTION_Source, "18");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
@@ -375,11 +377,14 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_16);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_16);
} else if(opt.equals("17")) {
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_17);
+settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_17);
+} else if (opt.equals("18")) {
// 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, "17");
-settings.put(CompilerOptions.OPTION_Compliance, "17");
+settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
+settings.put(CompilerOptions.OPTION_Compliance, "18");
} 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 37062c1..53a1f3b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -146,6 +146,13 @@
PropertyNotWritableExceptions caused by a typo in the name
used for a resource string. (markt)
+
+Add support for specifying Java 18 (with the value 18) 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.0.x updated: Add support for compiling JSPs for Java 18
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new d5f80be Add support for compiling JSPs for Java 18
d5f80be is described below
commit d5f80be24f9d67b5730d8dcf5fce0f8fd05f6c53
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:14:23 2022 +
Add support for compiling JSPs for Java 18
---
java/org/apache/jasper/compiler/JDTCompiler.java | 11 ---
webapps/docs/changelog.xml | 7 +++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 10d80e0..69c6e05 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -312,10 +312,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
} else if(opt.equals("16")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_16);
} else if(opt.equals("17")) {
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_17);
+} else if (opt.equals("18")) {
// 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, "17");
+settings.put(CompilerOptions.OPTION_Source, "18");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
@@ -375,11 +377,14 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_16);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_16);
} else if(opt.equals("17")) {
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_17);
+settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_17);
+} else if (opt.equals("18")) {
// 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, "17");
-settings.put(CompilerOptions.OPTION_Compliance, "17");
+settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
+settings.put(CompilerOptions.OPTION_Compliance, "18");
} 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 b25615b..8be1ab2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,13 @@
PropertyNotWritableExceptions caused by a typo in the name
used for a resource string. (markt)
+
+Add support for specifying Java 18 (with the value 18) 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 9.0.x updated: Add support for compiling JSPs for Java 18
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 bb1a7f7 Add support for compiling JSPs for Java 18
bb1a7f7 is described below
commit bb1a7f7da9efe67a4046af389e4a5365f394c17a
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:14:23 2022 +
Add support for compiling JSPs for Java 18
---
java/org/apache/jasper/compiler/JDTCompiler.java | 11 ---
webapps/docs/changelog.xml | 7 +++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 10d80e0..69c6e05 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -312,10 +312,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
} else if(opt.equals("16")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_16);
} else if(opt.equals("17")) {
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_17);
+} else if (opt.equals("18")) {
// 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, "17");
+settings.put(CompilerOptions.OPTION_Source, "18");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
@@ -375,11 +377,14 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_16);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_16);
} else if(opt.equals("17")) {
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_17);
+settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_17);
+} else if (opt.equals("18")) {
// 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, "17");
-settings.put(CompilerOptions.OPTION_Compliance, "17");
+settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
+settings.put(CompilerOptions.OPTION_Compliance, "18");
} 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 70f454d..8a895d7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -137,6 +137,13 @@
PropertyNotWritableExceptions caused by a typo in the name
used for a resource string. (markt)
+
+Add support for specifying Java 18 (with the value 18) 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 8.5.x updated: Add support for compiling JSPs for Java 18
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 8053cd3 Add support for compiling JSPs for Java 18
8053cd3 is described below
commit 8053cd3a30d4236b86fa6241c5ebd36726d58c9f
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:14:23 2022 +
Add support for compiling JSPs for Java 18
---
java/org/apache/jasper/compiler/JDTCompiler.java | 13 +
webapps/docs/changelog.xml | 7 +++
2 files changed, 20 insertions(+)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 304aafd..1afc4dc 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -364,6 +364,13 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// Java 7.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "17");
+} else if (opt.equals("18")) {
+// Constant not available in latest ECJ version that runs on
+// Java 7.
+// Constant not available in latest stable ECJ version.
+// May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "18");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_7);
@@ -449,6 +456,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "17");
settings.put(CompilerOptions.OPTION_Compliance, "17");
+} else if (opt.equals("18")) {
+// Constant not available in latest stable ECJ version.
+// May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "18");
+settings.put(CompilerOptions.OPTION_Compliance, "18");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_1_7);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3b780da..2676b73 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -194,6 +194,13 @@
PropertyNotWritableExceptions caused by a typo in the name
used for a resource string. (markt)
+
+Add support for specifying Java 18 (with the value 18) 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: Make Java 11 the default source and target for JSPs
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 45f641f Make Java 11 the default source and target for JSPs
45f641f is described below
commit 45f641f50a4866a0218e0052808273c626707182
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:28:11 2022 +
Make Java 11 the default source and target for JSPs
---
conf/web.xml | 4 ++--
java/org/apache/jasper/EmbeddedServletOptions.java | 4 ++--
java/org/apache/jasper/JspC.java | 4 ++--
java/org/apache/jasper/compiler/JDTCompiler.java | 14 +++---
webapps/docs/changelog.xml | 5 +
webapps/docs/jasper-howto.xml | 4 ++--
6 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/conf/web.xml b/conf/web.xml
index cbdd6fe..cc53db7 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -153,9 +153,9 @@
-
+
-
+
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index 7a4c8db..23a59aa 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -131,12 +131,12 @@ public final class EmbeddedServletOptions implements
Options {
/**
* Compiler target VM.
*/
-private String compilerTargetVM = "1.8";
+private String compilerTargetVM = "11";
/**
* The compiler source VM.
*/
-private String compilerSourceVM = "1.8";
+private String compilerSourceVM = "11";
/**
* The compiler class name.
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index ca6f8fb..3bf6f80 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -201,8 +201,8 @@ public class JspC extends Task implements Options {
protected String compiler = null;
-protected String compilerTargetVM = "1.8";
-protected String compilerSourceVM = "1.8";
+protected String compilerTargetVM = "11";
+protected String compilerSourceVM = "11";
protected boolean classDebugInfo = true;
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 69c6e05..0a3528d 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -320,11 +320,11 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Source, "18");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
-settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_11);
}
} else {
-// Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
+// Default to 11
+settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_11);
}
// Target JVM
@@ -387,12 +387,12 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_Compliance, "18");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
-settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_11);
}
} else {
-// Default to 1.8
-settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_1_8);
-settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_1_8);
+// Default to 11
+settings.put(CompilerOptions.OPTION_TargetPlatform,
CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_11);
}
final IProblemFactory problemFactory = new
DefaultProblemFactory(Locale.getDefault());
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 53a1f3b..d3a0347 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -153,6 +153,11 @@
a warning will be logged and the default will used.
(markt)
+
+To align with the JSP 3.1 specification that requires Java 11 as a
+minimum, make the default JSP source version and target version Java
11.
+(markt)
+
diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml
index 782a30a..255b69a 100644
--- a/webapps/docs
[tomcat] branch main updated: Remove trailing space
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 9a3ae9d Remove trailing space 9a3ae9d is described below commit 9a3ae9da65513077a96442d51f68eeb93fac9a6f Author: Mark Thomas AuthorDate: Sun Jan 2 16:42:45 2022 + Remove trailing space --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d3a0347..1b9bf85 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -156,7 +156,7 @@ To align with the JSP 3.1 specification that requires Java 11 as a minimum, make the default JSP source version and target version Java 11. -(markt) +(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 installer to 3.08
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 bbdd679 Update NSIS installer to 3.08
bbdd679 is described below
commit bbdd6795210ec996feec9fd978c5606d69ffe2cc
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:43:08 2022 +
Update NSIS installer to 3.08
---
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 6fad8f7..76cd5dc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -166,10 +166,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-1.1.1l-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.06.1
+nsis.version=3.08
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=15a0bb6e74be90ef4f11fa7befd0399a|f188416fe435cad991adbdc2e3eedc482a68fa75
+nsis.checksum.value=1cf3cd8e14e31e02c2168770c0eaeacb|057e83c7d82462ec394af76c87d06733605543d4
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 1b9bf85..e9559f7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -215,6 +215,9 @@
Update to the Eclipse JDT compiler 4.22. (markt)
+
+Update the NSIS installer to 3.08. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update NSIS installer to 3.08
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new fab6ea1 Update NSIS installer to 3.08
fab6ea1 is described below
commit fab6ea1743dd5f654d0db60dbd1f85d40c41b9ab
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:43:08 2022 +
Update NSIS installer to 3.08
---
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 60d1598..666d86e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -168,10 +168,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-1.1.1l-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.06.1
+nsis.version=3.08
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=15a0bb6e74be90ef4f11fa7befd0399a|f188416fe435cad991adbdc2e3eedc482a68fa75
+nsis.checksum.value=1cf3cd8e14e31e02c2168770c0eaeacb|057e83c7d82462ec394af76c87d06733605543d4
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 8be1ab2..cbb5f4f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -182,6 +182,9 @@
Update to the Eclipse JDT compiler 4.22. (markt)
+
+Update the NSIS installer to 3.08. (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 installer to 3.08
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 7df1d10 Update NSIS installer to 3.08
7df1d10 is described below
commit 7df1d10ff87f4999e1f16bef3a964cadf6ba1ca7
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:43:08 2022 +
Update NSIS installer to 3.08
---
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 a6bfa7d..6f2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -168,10 +168,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-1.1.1l-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.06.1
+nsis.version=3.08
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=15a0bb6e74be90ef4f11fa7befd0399a|f188416fe435cad991adbdc2e3eedc482a68fa75
+nsis.checksum.value=1cf3cd8e14e31e02c2168770c0eaeacb|057e83c7d82462ec394af76c87d06733605543d4
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 8a895d7..b8cad57 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -182,6 +182,9 @@
Update to the Eclipse JDT compiler 4.22. (markt)
+
+Update the NSIS installer to 3.08. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update NSIS installer to 3.08
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new bdb594c Update NSIS installer to 3.08
bdb594c is described below
commit bdb594c8defc96d0f3955ed141cbbebcca747764
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:43:08 2022 +
Update NSIS installer to 3.08
---
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 883143b..59ddc4c 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-1.1.1l-win32-bin.zip
# - NSIS, version 3.0 or later -
-nsis.version=3.06.1
+nsis.version=3.08
nsis.checksum.enabled=true
nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=15a0bb6e74be90ef4f11fa7befd0399a|f188416fe435cad991adbdc2e3eedc482a68fa75
+nsis.checksum.value=1cf3cd8e14e31e02c2168770c0eaeacb|057e83c7d82462ec394af76c87d06733605543d4
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 2676b73..2c5b96e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -232,6 +232,9 @@
Improvements to Korean translations. (woonsan)
+
+Update the NSIS installer to 3.08. (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 6.0.3
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 0bf4b32 Update UnboundID to 6.0.3
0bf4b32 is described below
commit 0bf4b32b3c2c600146fd91e554227ea55351e90c
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:53:27 2022 +
Update UnboundID to 6.0.3
---
build.properties.default | 6 +++---
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
webapps/docs/changelog.xml| 3 +++
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 76cd5dc..fea58d2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -255,10 +255,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.0
+unboundid.version=6.0.3
unboundid.checksum.enabled=true
-unboundid.checksum.algorithm=MD5|SHA-1
-unboundid.checksum.value=98eba1bb435221d20c6766774cde97cb|c17a6ca8b9923ff3fc3461ebbcd9a598df4955be
+unboundid.checksum.algorithm=SHA-512
+unboundid.checksum.value=29c87814b7cdbbbc00ee8c29818b82f148001e3a64dabda8d1300c7366ba149f204b0355322a5287a6b7ccb5a2456f5f0e8c719f1a7eb637cb27646fe40191fb
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/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index b081ec5..e2d80b6 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -31,6 +31,6 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 6e6a29a..a84c1de 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -131,7 +131,7 @@
-
+
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e9559f7..6ef53af 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -218,6 +218,9 @@
Update the NSIS installer to 3.08. (markt)
+
+Update UnboundID to 6.0.3. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update UnboundID to 6.0.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new c066a84 Update UnboundID to 6.0.3
c066a84 is described below
commit c066a847cdf93c82f55fc94f62d9731f7f89455c
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:53:27 2022 +
Update UnboundID to 6.0.3
---
build.properties.default | 6 +++---
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
webapps/docs/changelog.xml| 3 +++
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 666d86e..6eba414 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -257,10 +257,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.0
+unboundid.version=6.0.3
unboundid.checksum.enabled=true
-unboundid.checksum.algorithm=MD5|SHA-1
-unboundid.checksum.value=98eba1bb435221d20c6766774cde97cb|c17a6ca8b9923ff3fc3461ebbcd9a598df4955be
+unboundid.checksum.algorithm=SHA-512
+unboundid.checksum.value=29c87814b7cdbbbc00ee8c29818b82f148001e3a64dabda8d1300c7366ba149f204b0355322a5287a6b7ccb5a2456f5f0e8c719f1a7eb637cb27646fe40191fb
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/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index b081ec5..e2d80b6 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -31,6 +31,6 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 6e6a29a..a84c1de 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -131,7 +131,7 @@
-
+
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cbb5f4f..0dc0058 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,6 +185,9 @@
Update the NSIS installer to 3.08. (markt)
+
+Update UnboundID to 6.0.3. (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 6.0.3
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 8ad5c77 Update UnboundID to 6.0.3
8ad5c77 is described below
commit 8ad5c77e1706063a9daba9b7ee458c5e44f1189e
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:53:27 2022 +
Update UnboundID to 6.0.3
---
build.properties.default | 6 +++---
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
webapps/docs/changelog.xml| 3 +++
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 6f2..b9bf106 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -257,10 +257,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.0
+unboundid.version=6.0.3
unboundid.checksum.enabled=true
-unboundid.checksum.algorithm=MD5|SHA-1
-unboundid.checksum.value=98eba1bb435221d20c6766774cde97cb|c17a6ca8b9923ff3fc3461ebbcd9a598df4955be
+unboundid.checksum.algorithm=SHA-512
+unboundid.checksum.value=29c87814b7cdbbbc00ee8c29818b82f148001e3a64dabda8d1300c7366ba149f204b0355322a5287a6b7ccb5a2456f5f0e8c719f1a7eb637cb27646fe40191fb
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/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index ff016eb..026d677 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -30,6 +30,6 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index bb99ad9..97517b2 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -122,7 +122,7 @@
-
+
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b8cad57..98f19fc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,6 +185,9 @@
Update the NSIS installer to 3.08. (markt)
+
+Update UnboundID to 6.0.3. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update UnboundID to 6.0.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c07a209 Update UnboundID to 6.0.3
c07a209 is described below
commit c07a20907b6ab50fe6c3003a598ea9f4e5fa6943
Author: Mark Thomas
AuthorDate: Sun Jan 2 16:53:27 2022 +
Update UnboundID to 6.0.3
---
build.properties.default | 6 +++---
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
webapps/docs/changelog.xml| 3 +++
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 59ddc4c..490483d 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.0
+unboundid.version=6.0.3
unboundid.checksum.enabled=true
-unboundid.checksum.algorithm=MD5|SHA-1
-unboundid.checksum.value=98eba1bb435221d20c6766774cde97cb|c17a6ca8b9923ff3fc3461ebbcd9a598df4955be
+unboundid.checksum.algorithm=SHA-512
+unboundid.checksum.value=29c87814b7cdbbbc00ee8c29818b82f148001e3a64dabda8d1300c7366ba149f204b0355322a5287a6b7ccb5a2456f5f0e8c719f1a7eb637cb27646fe40191fb
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/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index ad84eab..7187042 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,6 +29,6 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 0eb3257..2b30b18 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -113,7 +113,7 @@
-
+
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2c5b96e..911fd24 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -235,6 +235,9 @@
Update the NSIS installer to 3.08. (markt)
+
+Update UnboundID to 6.0.3. (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 9.2.1
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 6574bbe Update checkstyle to 9.2.1
6574bbe is described below
commit 6574bbe5eff6a7712e8ce80e223bcdc6b8fb2ca9
Author: Mark Thomas
AuthorDate: Sun Jan 2 17:02:05 2022 +
Update checkstyle to 9.2.1
---
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 fea58d2..ebae38c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -264,10 +264,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=8.43
+checkstyle.version=9.2.1
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=339614235601ce88ca4e2aab5f52599b3e8bc242f7384ee17629190f498c6f9ac48aa4eed06be914b1db9ebd2eea821ae6ac254f96865070f266be5bfb65e3dd
+checkstyle.checksum.value=01f6576d988ee7ef5d7a6a528439263205c956a020c6479430992aebbe49186bb962015941161959c019daea567818b35f8cfb5157ae3b1ce1625f3699226611
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 6ef53af..746783f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -221,6 +221,9 @@
Update UnboundID to 6.0.3. (markt)
+
+Update CheckStyle to 9.2.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update checkstyle to 9.2.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 708d991 Update checkstyle to 9.2.1
708d991 is described below
commit 708d991a34a1364b6d0a61203aa4532f1bee5d95
Author: Mark Thomas
AuthorDate: Sun Jan 2 17:02:05 2022 +
Update checkstyle to 9.2.1
---
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 6eba414..ea7a048 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -266,10 +266,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=8.43
+checkstyle.version=9.2.1
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=339614235601ce88ca4e2aab5f52599b3e8bc242f7384ee17629190f498c6f9ac48aa4eed06be914b1db9ebd2eea821ae6ac254f96865070f266be5bfb65e3dd
+checkstyle.checksum.value=01f6576d988ee7ef5d7a6a528439263205c956a020c6479430992aebbe49186bb962015941161959c019daea567818b35f8cfb5157ae3b1ce1625f3699226611
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 0dc0058..ef706fc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,9 @@
Update UnboundID to 6.0.3. (markt)
+
+Update CheckStyle to 9.2.1. (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 9.2.1
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 49d0e75 Update checkstyle to 9.2.1
49d0e75 is described below
commit 49d0e75e58476dcfa791091495c1493fff98e8de
Author: Mark Thomas
AuthorDate: Sun Jan 2 17:02:05 2022 +
Update checkstyle to 9.2.1
---
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 b9bf106..2e31469 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -266,10 +266,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=8.43
+checkstyle.version=9.2.1
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=339614235601ce88ca4e2aab5f52599b3e8bc242f7384ee17629190f498c6f9ac48aa4eed06be914b1db9ebd2eea821ae6ac254f96865070f266be5bfb65e3dd
+checkstyle.checksum.value=01f6576d988ee7ef5d7a6a528439263205c956a020c6479430992aebbe49186bb962015941161959c019daea567818b35f8cfb5157ae3b1ce1625f3699226611
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 98f19fc..a6668c1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,9 @@
Update UnboundID to 6.0.3. (markt)
+
+Update CheckStyle to 9.2.1. (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 BND to 6.1.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 cf251fc Update BND to 6.1.0
cf251fc is described below
commit cf251fcb8bc699a2629d4b84547ee59896ee94a2
Author: Mark Thomas
AuthorDate: Sun Jan 2 17:15:24 2022 +
Update BND to 6.1.0
---
build.properties.default | 8
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
webapps/docs/changelog.xml| 3 +++
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ebae38c..38b6458 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -290,14 +290,14 @@ 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
-# - bnd, version 5.3.0 or later -
+# - bnd, version 6.0.0 or later -
# - provides OSGI metadata for JARs -
-bnd.version=5.3.0
+bnd.version=6.1.0
-# checksums for biz.aQute.bnd-5.3.0.jar
+# checksums for biz.aQute.bnd-6.1.0.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=7cba73481ee6e72b182ba5c13801aafe|10ec0974db02f810e9345b218f4de4abe898ab04
+bnd.checksum.value=3f4bcd3e67f31a563d49370364b62915|d54eba8fb11eb43bb40eac7e3cb92e906b9fa567
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index e2d80b6..074a01d 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,7 +29,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index a84c1de..5be2060 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -113,7 +113,7 @@
-
+
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 19d4262..1d3c25b 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${base.path}/bnd-5.3.0/biz.aQute.bnd-5.3.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
1.7
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 746783f..3b6bb78 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -224,6 +224,9 @@
Update CheckStyle to 9.2.1. (markt)
+
+Update BND to 6.1.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update BND to 6.1.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 8ab750f Update BND to 6.1.0
8ab750f is described below
commit 8ab750f4acf60fb3039c911d27ce57e9ac41f4f9
Author: Mark Thomas
AuthorDate: Sun Jan 2 17:15:24 2022 +
Update BND to 6.1.0
---
build.properties.default | 8
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
webapps/docs/changelog.xml| 3 +++
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ea7a048..411efcb 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -292,14 +292,14 @@ 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
-# - bnd, version 5.3.0 or later -
+# - bnd, version 6.0.0 or later -
# - provides OSGI metadata for JARs -
-bnd.version=5.3.0
+bnd.version=6.1.0
-# checksums for biz.aQute.bnd-5.3.0.jar
+# checksums for biz.aQute.bnd-6.1.0.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=7cba73481ee6e72b182ba5c13801aafe|10ec0974db02f810e9345b218f4de4abe898ab04
+bnd.checksum.value=3f4bcd3e67f31a563d49370364b62915|d54eba8fb11eb43bb40eac7e3cb92e906b9fa567
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index e2d80b6..074a01d 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,7 +29,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index a84c1de..5be2060 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -113,7 +113,7 @@
-
+
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index 19d4262..1d3c25b 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${base.path}/bnd-5.3.0/biz.aQute.bnd-5.3.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${base.path}/migration-1.0.0/jakartaee-migration-1.0.0-shaded.jar:${ant.includes}/
1.7
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ef706fc..ed31742 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,9 @@
Update CheckStyle to 9.2.1. (markt)
+
+Update BND to 6.1.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 BND to 6.1.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 05f5933 Update BND to 6.1.0
05f5933 is described below
commit 05f5933cc9b6fabb094642ddaa36f1dffd67ad1f
Author: Mark Thomas
AuthorDate: Sun Jan 2 17:15:24 2022 +
Update BND to 6.1.0
---
build.properties.default | 8
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
webapps/docs/changelog.xml| 3 +++
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 2e31469..597a8fe 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -292,14 +292,14 @@ 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
-# - bnd, version 5.3.0 or later -
+# - bnd, version 6.0.0 or later -
# - provides OSGI metadata for JARs -
-bnd.version=5.3.0
+bnd.version=6.1.0
-# checksums for biz.aQute.bnd-5.3.0.jar
+# checksums for biz.aQute.bnd-6.1.0.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=7cba73481ee6e72b182ba5c13801aafe|10ec0974db02f810e9345b218f4de4abe898ab04
+bnd.checksum.value=3f4bcd3e67f31a563d49370364b62915|d54eba8fb11eb43bb40eac7e3cb92e906b9fa567
bnd.home=${base.path}/bnd-${bnd.version}
bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/res/ide-support/eclipse/eclipse.classpath
b/res/ide-support/eclipse/eclipse.classpath
index 026d677..c9557cc 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -29,7 +29,7 @@
-
+
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 97517b2..5910f1d 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -113,7 +113,7 @@
-
+
diff --git a/res/ide-support/netbeans/project.xml
b/res/ide-support/netbeans/project.xml
index be85a56..d4737f8 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${base.path}/bnd-5.3.0/biz.aQute.bnd-5.3.0.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${base.path}/bnd-6.1.0/biz.aQute.bnd-6.1.0.jar:${ant.includes}/
1.7
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a6668c1..be84c79 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,9 @@
Update CheckStyle to 9.2.1. (markt)
+
+Update BND to 6.1.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 OSGI annotations to 1.1.1
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 cad3456 Update OSGI annotations to 1.1.1
cad3456 is described below
commit cad3456ae193521b28f1b17a409f8cd7cb908e81
Author: Mark Thomas
AuthorDate: Sun Jan 2 17:23:49 2022 +
Update OSGI annotations to 1.1.1
---
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 38b6458..33890c7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -305,10 +305,10 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - OSGi annotations bundle, version 1.0.0 or later-
# - required to avoid Javadoc error when using bnd annotations -
-osgi-annotations.version=1.1.0
+osgi-annotations.version=1.1.1
osgi-annotations.checksum.enabled=true
osgi-annotations.checksum.algorithm=MD5|SHA-1
-osgi-annotations.checksum.value=4777cc8253100d514365205d59bbef60|534cecc7af8d22a3f0919a6a8e42fe5822f6e6e1
+osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d
osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3b6bb78..7795f68 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -227,6 +227,9 @@
Update BND to 6.1.0. (markt)
+
+Update OSGI annotations to 1.1.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Update OSGI annotations to 1.1.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 9ae0871 Update OSGI annotations to 1.1.1
9ae0871 is described below
commit 9ae0871e1c433213cb4fa0fe5fd1775df6525d3d
Author: Mark Thomas
AuthorDate: Sun Jan 2 17:23:49 2022 +
Update OSGI annotations to 1.1.1
---
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 411efcb..fbdb325 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -307,10 +307,10 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - OSGi annotations bundle, version 1.0.0 or later-
# - required to avoid Javadoc error when using bnd annotations -
-osgi-annotations.version=1.1.0
+osgi-annotations.version=1.1.1
osgi-annotations.checksum.enabled=true
osgi-annotations.checksum.algorithm=MD5|SHA-1
-osgi-annotations.checksum.value=4777cc8253100d514365205d59bbef60|534cecc7af8d22a3f0919a6a8e42fe5822f6e6e1
+osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d
osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ed31742..cc94acf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -194,6 +194,9 @@
Update BND to 6.1.0. (markt)
+
+Update OSGI annotations to 1.1.1. (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 OSGI annotations to 1.1.1
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 255f7b1 Update OSGI annotations to 1.1.1
255f7b1 is described below
commit 255f7b17c82c34f0c4100e2b26a4b7d22efbd35d
Author: Mark Thomas
AuthorDate: Sun Jan 2 17:23:49 2022 +
Update OSGI annotations to 1.1.1
---
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 597a8fe..150ebbc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -307,10 +307,10 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - OSGi annotations bundle, version 1.0.0 or later-
# - required to avoid Javadoc error when using bnd annotations -
-osgi-annotations.version=1.1.0
+osgi-annotations.version=1.1.1
osgi-annotations.checksum.enabled=true
osgi-annotations.checksum.algorithm=MD5|SHA-1
-osgi-annotations.checksum.value=4777cc8253100d514365205d59bbef60|534cecc7af8d22a3f0919a6a8e42fe5822f6e6e1
+osgi-annotations.checksum.value=04e5db48a469cb53dd0e4e954deab2e0|a1644f3dbbb614f2a44671d27dd13c4d9142007d
osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version}
osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index be84c79..c255e6b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -194,6 +194,9 @@
Update BND to 6.1.0. (markt)
+
+Update OSGI annotations to 1.1.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Version updates
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 18b4c0f Version updates 18b4c0f is described below commit 18b4c0f505e5d7b40f28defea36732146cd67159 Author: Mark Thomas AuthorDate: Sun Jan 2 17:43:35 2022 + Version updates --- modules/jdbc-pool/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index ff3adf9..327b037 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -64,25 +64,25 @@ org.apache.tomcat - juli - 6.0.32 + tomcat-juli + 10.1.0-M8 junit junit - 4.13 + 4.13.2 test org.apache.tomcat tomcat-dbcp - 8.0.14 + 10.1.0-M8 test com.h2database h2 - 1.4.200 + 2.0.204 test - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Version updates
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new d039b4c Version updates d039b4c is described below commit d039b4c18bd8b4821b0e9e641d832bfdc0a68eb6 Author: Mark Thomas AuthorDate: Sun Jan 2 17:43:45 2022 + Version updates --- modules/jdbc-pool/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index ff3adf9..1d49083 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -64,25 +64,25 @@ org.apache.tomcat - juli - 6.0.32 + tomcat-juli + 10.0.14 junit junit - 4.13 + 4.13.2 test org.apache.tomcat tomcat-dbcp - 8.0.14 + 10.0.14 test com.h2database h2 - 1.4.200 + 2.0.204 test - 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: Version updates
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 4da1ceb Version updates 4da1ceb is described below commit 4da1ceb3d7181817b66c94231486dac0d7002e36 Author: Mark Thomas AuthorDate: Sun Jan 2 17:43:52 2022 + Version updates --- modules/jdbc-pool/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index ff3adf9..ad0cb18 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -64,25 +64,25 @@ org.apache.tomcat - juli - 6.0.32 + tomcat-juli + 9.0.56 junit junit - 4.13 + 4.13.2 test org.apache.tomcat tomcat-dbcp - 8.0.14 + 9.0.56 test com.h2database h2 - 1.4.200 + 2.0.204 test - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Version updates
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new d9cfc93 Version updates d9cfc93 is described below commit d9cfc93e66f25a0cee13dc49e8694b50d4fa7b77 Author: Mark Thomas AuthorDate: Sun Jan 2 17:43:59 2022 + Version updates --- modules/jdbc-pool/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml index 76670b4..bb05975 100644 --- a/modules/jdbc-pool/pom.xml +++ b/modules/jdbc-pool/pom.xml @@ -62,25 +62,25 @@ org.apache.tomcat - juli - 6.0.32 + tomcat-juli + 8.5.73 junit junit - 4.13 + 4.13.2 test org.apache.tomcat tomcat-dbcp - 8.0.14 + 8.5.73 test com.h2database h2 - 1.4.200 + 2.0.204 test - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Deadlock in unit tests for TC 8.5.73 on Solaris using zulu 1.8.0_312-b07
I can reproduce with 8.5.x head and the following JVMs: Zulu 1.8.0_312-b07: OpenJDK Runtime Environment (Zulu 8.58.0.13-CA-solaris) (build 1.8.0_312-b07) OpenJDK 64-Bit Server VM (Zulu 8.58.0.13-CA-solaris) (build 25.312-b07, mixed mode) Adopt: 1.8.0_282-b08 openjdk version "1.8.0_282" OpenJDK Runtime Environment (AdoptOpenJDK)(build 1.8.0_282-b08) OpenJDK 64-Bit Server VM (AdoptOpenJDK)(build 25.282-b08, mixed mode) OpenJDK: 1.8.0_212-b10 java version "1.8.0_212" Java(TM) SE Runtime Environment (build 1.8.0_212-b10) Java HotSpot(TM) 64-Bit Server VM (build 25.212-b10, mixed mode) I only needed to run the test test.name=org/apache/coyote/http2/TestCancelledUpload.java in a loop. Sometimes it needs 10 retries, sometimes only 3, so not strictly reproducible, but one doesn't need to wait long. I tried to reproduce on RHEL 7 Linux but couldn't (stopped after 150 attempts). The Solaris system is much slower though, so race conditions are more likely there. I can add more debug logging if that helps. I am attaching a debug test output for the OK and the deadlock case and the jstack output for the deadlock. Thanks and regards, Rainer Am 01.01.2022 um 20:07 schrieb Rainer Jung: Hi hi, I am running the unit tests for TC 8.5.73 plus few post-release patches on Solaris 10 Sparc with various Java 8 JVMs. I noticed one deadlock when running on Zulu 8.58.0.13-CA-solaris (build 1.8.0_312-b07). Maybe it is a sporadic deadlock and could also happen on the 1.8.0 variations, but I could not yet check that. I did not notice such a deadlock on 5 Linux distributions on which I also ran all unit tests with a variety of JVMs, including the Zulu one. Due to the logs the deadlock happens in org.apache.coyote.http2.TestCancelledUpload, but org.apache.coyote.http2.TestFlowControl runs concurrently at the same time (zwo test threads). Test methods are testCancelledRequest rwsp. testNotFound. The stacks are: Found one Java-level deadlock: = "http-nio-127.0.0.1-auto-1-exec-7": waiting to lock monitor 0x000100f99508 (object 0x41a99b40, a org.apache.coyote.http2.StreamStateMachine), which is held by "http-nio-127.0.0.1-auto-1-exec-5" "http-nio-127.0.0.1-auto-1-exec-5": waiting to lock monitor 0x0001002da838 (object 0x42015548, a org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper), which is held by "http-nio-127.0.0.1-auto-1-exec-7" Java stack information for the threads listed above: === "http-nio-127.0.0.1-auto-1-exec-7": at org.apache.coyote.http2.StreamStateMachine.checkFrameType(StreamStateMachine.java:125) - waiting to lock <0x41a99b40> (a org.apache.coyote.http2.StreamStateMachine) at org.apache.coyote.http2.AbstractNonZeroStream.checkState(AbstractNonZeroStream.java:144) at org.apache.coyote.http2.Http2UpgradeHandler.startRequestBodyFrame(Http2UpgradeHandler.java:1641) at org.apache.coyote.http2.Http2Parser.readDataFrame(Http2Parser.java:168) at org.apache.coyote.http2.Http2Parser.readFrame(Http2Parser.java:95) at org.apache.coyote.http2.Http2Parser.readFrame(Http2Parser.java:69) at org.apache.coyote.http2.Http2UpgradeHandler.upgradeDispatch(Http2UpgradeHandler.java:340) at org.apache.coyote.http11.upgrade.UpgradeProcessorInternal.dispatch(UpgradeProcessorInternal.java:60) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:59) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:849) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1677) at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) - locked <0x42015548> (a org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper) at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:748) "http-nio-127.0.0.1-auto-1-exec-5": at org.apache.coyote.http2.Http2UpgradeHandler.sendStreamReset(Http2UpgradeHandler.java:558) - waiting to lock <0x42015548> (a org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper) at org.apache.coyote.http2.Stream.close(Stream.java:623) - locked <0x41a99b40> (a org.apache.coyote.http2.StreamStateMachine) at org.apache.coyote.http2.StreamProcessor.process(StreamProcessor.java:85) - locked <0x41ac4888> (a org.apache.coyote.http2.StreamProcessor) at org.apache.coyote.http2.StreamRunnable.run(StreamRunnable.java:35) at
[Bug 65780] New: CoyoteOutputStream should never throw NullPointerException after AsyncContext.complete() is called
https://bz.apache.org/bugzilla/show_bug.cgi?id=65780 Bug ID: 65780 Summary: CoyoteOutputStream should never throw NullPointerException after AsyncContext.complete() is called Product: Tomcat 10 Version: 10.0.14 Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: zdap...@google.com Target Milestone: -- CoyoteOutputStream extends ServletOutputStream, so according to the Servlet/OutputStream API Javadoc, 1. The write() method should throw IOException "if the output stream has been closed", rather than NullPointerException. 2. The isReady() method should return false if "a write to this ServletOutputStream will" not succeed. However, CoyoteOutputStream sometimes does throw NullPointerException after AsyncContext.complete(). In Async Servlet applications, NullPointerException thrown from write() method might not be propagated to the application's main thread if the write is invoked asynchronously. In Async Servlet application, checking isReady() in a while loop is a normal practice. Although there shouldn't be any operation after AsyncContext.complete(), sometimes it's hard/tedious to check whether AsyncContext.complete() is already called concurrently in another thread due to race condition, before calling isReady() each time. The issue is found in Embedded Tomcat 10. The issue should also apply to Tomcat 9, but I have not observed it in that version though. -- 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
