svn commit: r1905034 - in /tomcat/site/trunk: docs/getinvolved.html xdocs/getinvolved.xml

2022-11-02 Thread lihan
Author: lihan
Date: Thu Nov  3 03:46:19 2022
New Revision: 1905034

URL: http://svn.apache.org/viewvc?rev=1905034=rev
Log:
Update coding conventions

Modified:
tomcat/site/trunk/docs/getinvolved.html
tomcat/site/trunk/xdocs/getinvolved.xml

Modified: tomcat/site/trunk/docs/getinvolved.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/getinvolved.html?rev=1905034=1905033=1905034=diff
==
--- tomcat/site/trunk/docs/getinvolved.html (original)
+++ tomcat/site/trunk/docs/getinvolved.html Thu Nov  3 03:46:19 2022
@@ -52,7 +52,7 @@ to learn how to create and submit patche
 Apache Tomcat has very loosely defined coding conventions, but the following 
guidelines will be useful:
 
   Use spaces for indenting, not tabs
-  100 char line width for Java source, 80 char line width for
+  120 char line width for Java source, 80 char line width for
   documentation source (.txt, .xml)
   Java source: { at end of line, 4 space indents
   XML source: 2 space indents

Modified: tomcat/site/trunk/xdocs/getinvolved.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/getinvolved.xml?rev=1905034=1905033=1905034=diff
==
--- tomcat/site/trunk/xdocs/getinvolved.xml (original)
+++ tomcat/site/trunk/xdocs/getinvolved.xml Thu Nov  3 03:46:19 2022
@@ -65,7 +65,7 @@ to learn how to create and submit patche
 Apache Tomcat has very loosely defined coding conventions, but the following 
guidelines will be useful:
 
   Use spaces for indenting, not tabs
-  100 char line width for Java source, 80 char line width for
+  120 char line width for Java source, 80 char line width for
   documentation source (.txt, .xml)
   Java source: { at end of line, 4 space indents
   XML source: 2 space indents



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.5

2022-11-02 Thread Han Li



> 2022年11月2日 20:43,Mark Thomas  写道:
> 
> The proposed Apache Tomcat migration tool for Jakarta EE 1.0.5 is now
> available for voting.
> 
> The significant changes since 1.0.4 are:
> 
> - #37 narrow scope of javax.annotation conversion to Java EE. PR by
>  Danny Thomas
> - #36 Improve manifest handling and conversion performance. PR by Danny
>  Thomas.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.5/
> 
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1404/
> 
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.5
> d87e1ec7e67c8d61340111b796e3bb8179a6f0ba
> 
> The proposed 1.0.5 release is:
> 
> [ ] -1: Broken. Do not release because...
> [ X] +1: Acceptable. Go ahead and release.

Test pass with old j2ee sample on tomcat 10.1.x.

Han

> 
> Thanks,
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [VOTE] Release Apache Tomcat Native 2.0.2

2022-11-02 Thread Han Li



> 2022年11月3日 04:57,Mark Thomas  写道:
> 
> The key differences of version 2.0.2 compared to 2.0.1 are:
> 
> - Update the minimum supported version of LibreSSL to 3.5.2.
>  Based on a #13 provided by orbea.
> 
> - The windows binaries in this release have been built with OpenSSL
>  3.0.7
> 
> The 2.0.x branch is primarily intended for use with Tomcat 10.1.x but can be 
> used with earlier versions as long as the APR/native connector is not used.
> 
> The proposed release artefacts can be found at [1],
> and the build was done using tag [2].
> 
> The Apache Tomcat Native 2.0.2 release is
> [ X] Stable, go ahead and release

Han
> [ ] Broken because of ...
> 
> Thanks,
> 
> Mark
> 
> 
> [1]
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/2.0.2
> [2]
> https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=9fea6f69aca11c2a129c557934f9abb40ac4e732
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[VOTE] Release Apache Tomcat Native 2.0.2

2022-11-02 Thread Mark Thomas

The key differences of version 2.0.2 compared to 2.0.1 are:

- Update the minimum supported version of LibreSSL to 3.5.2.
  Based on a #13 provided by orbea.

- The windows binaries in this release have been built with OpenSSL
  3.0.7

The 2.0.x branch is primarily intended for use with Tomcat 10.1.x but 
can be used with earlier versions as long as the APR/native connector is 
not used.


The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 2.0.2 release is
 [ ] Stable, go ahead and release
 [ ] Broken because of ...

Thanks,

Mark


[1]
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/2.0.2
[2]
https://gitbox.apache.org/repos/asf?p=tomcat-native.git;a=commit;h=9fea6f69aca11c2a129c557934f9abb40ac4e732

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-native] branch main updated: Increment version for next development cycle

2022-11-02 Thread markt
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-native.git


The following commit(s) were added to refs/heads/main by this push:
 new b36984e93 Increment version for next development cycle
b36984e93 is described below

commit b36984e93b35563819bc6ef6aa42b321ed712a95
Author: Mark Thomas 
AuthorDate: Wed Nov 2 20:51:52 2022 +

Increment version for next development cycle
---
 build.properties.default  | 2 +-
 native/include/tcn_version.h  | 2 +-
 native/os/win32/libtcnative.rc| 6 +++---
 xdocs/miscellaneous/changelog.xml | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index b647a049c..83251ee0d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
 # - Version Control Flags -
 version.major=2
 version.minor=0
-version.build=2
+version.build=3
 version.patch=0
 version.suffix=-dev
 
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index c11cf2b52..9fcaee1eb 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -63,7 +63,7 @@ extern "C" {
 #define TCN_MINOR_VERSION   0
 
 /** patch level */
-#define TCN_PATCH_VERSION   2
+#define TCN_PATCH_VERSION   3
 
 /**
  *  This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index 8437ffe93..117eda330 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -19,7 +19,7 @@ LANGUAGE 0x9,0x1
  "See the License for the specific language governing " \
  "permissions and limitations under the License."
 
-#define TCN_VERSION "2.0.2"
+#define TCN_VERSION "2.0.3"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
@@ -35,8 +35,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 2,0,2,0
- PRODUCTVERSION 2,0,2,0
+ FILEVERSION 2,0,3,0
+ PRODUCTVERSION 2,0,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index dde5935f3..7fa4f2d6e 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -31,6 +31,8 @@
   branch started from the 1.2.33 tag.
   
 
+
+
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r57728 - in /dev/tomcat/tomcat-connectors/native/2.0.2: ./ binaries/ source/

2022-11-02 Thread markt
Author: markt
Date: Wed Nov  2 20:50:58 2022
New Revision: 57728

Log:
Upload 2.0.2 for voting

Added:
dev/tomcat/tomcat-connectors/native/2.0.2/
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/

dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip.sha512

dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-win32-bin.zip
   (with props)

dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-win32-bin.zip.asc

dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-win32-bin.zip.sha512
dev/tomcat/tomcat-connectors/native/2.0.2/source/

dev/tomcat/tomcat-connectors/native/2.0.2/source/tomcat-native-2.0.2-src.tar.gz 
  (with props)

dev/tomcat/tomcat-connectors/native/2.0.2/source/tomcat-native-2.0.2-src.tar.gz.asc

dev/tomcat/tomcat-connectors/native/2.0.2/source/tomcat-native-2.0.2-src.tar.gz.sha512

dev/tomcat/tomcat-connectors/native/2.0.2/source/tomcat-native-2.0.2-win32-src.zip
   (with props)

dev/tomcat/tomcat-connectors/native/2.0.2/source/tomcat-native-2.0.2-win32-src.zip.asc

dev/tomcat/tomcat-connectors/native/2.0.2/source/tomcat-native-2.0.2-win32-src.zip.sha512

Added: 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip.asc
==
--- 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip.asc
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip.asc
 Wed Nov  2 20:50:58 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmNi14MACgkQEMAcWi9g
+WefUWg/+IZQXblBw8uJ7tnNXCNtrAKdepZvSjMV7M+7/PgVotYKKR8OA9vX3DfXH
+WMQlgUku/+ruC+9mbH+soMOLZVGTkgfUX5EJPtjXlQ+bU9/eD1/kd+vpF/IO6rds
+8hOT1W/EZgLCGoL8sjei05nH3x09l0QF+pXSqDnxGd8FdnHwljBvbIaX46IBaUgF
+JRIwzgm681iun5k4KunF/T8pr/f96BOf5pciBraHhjILeB0pSxjASkkBZUVsspz2
+LAwslDWq6sBIRGnF2W+uWosmH3ZP3m39nuaT+ehc0LqVtiDozvqNMEoVm/8NY8Ch
+IUIWrxslZ1sC6esHiKbtkmADdlVngwIR1WfBgIYmCe2DdgGqkoBn5y/s+7xghyIS
+F+L7SggbctNDH1opRVjLeWF6FMnryDx6NMHFLD60oecyf7wnj8DxEIIxDk6Rk2rr
+/H8WiIrw2ThPVD2soZPpkvX4Hhb4klzCiLF6fRi71GEwXgXNhKQKI84UpvKZpE/o
+T9Nsz0ZUXuXaRlGzpFG9tB7Bnh10kx/TBdu0CGJaCyVYCl9O44yyVAg+4ioLzWAU
+BDrIyr9qHFqbljn51rzzgeSEKfyHX8YPpC1WwEUiPu/HkTfB/IZMaS6BPjRB1uws
+GZEiK0eAZq1CcVPxz/viT3YGhB9AmOOkxi2DjFT2vp5kz/doGcc=
+=/5n6
+-END PGP SIGNATURE-

Added: 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip.sha512
==
--- 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip.sha512
 (added)
+++ 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip.sha512
 Wed Nov  2 20:50:58 2022
@@ -0,0 +1 @@
+fc67ac687ce00af412ab5c2333d9faf0f1edda376ee150a62318e0c4b7e1d28fa0dde15613ca379cc11ab34da1c914b8e9b82d38b62ecd14caef8fbbf3edc18e
 *tomcat-native-2.0.2-openssl-3.0.7-ocsp-win32-bin.zip
\ No newline at end of file

Added: 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-win32-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-win32-bin.zip
--
svn:executable = *

Propchange: 
dev/tomcat/tomcat-connectors/native/2.0.2/binaries/tomcat-native-2.0.2-openssl-3.0.7-win32-bin.zip
--
svn:mime-type = application/octet-stream

Added: 

[tomcat-native] branch main updated: Should have updated recommended version before tagging

2022-11-02 Thread markt
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-native.git


The following commit(s) were added to refs/heads/main by this push:
 new 6ed0c867b Should have updated recommended version before tagging
6ed0c867b is described below

commit 6ed0c867bf2fc41aa8797de7db6c3820fe8271ab
Author: Mark Thomas 
AuthorDate: Wed Nov 2 20:49:59 2022 +

Should have updated recommended version before tagging
---
 native/srclib/VERSIONS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index 06e346db8..10c33778f 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -5,7 +5,7 @@ The current minimum versions are:
 The following version of the libraries are recommended:
 
 - APR 1.7.0 or later, http://apr.apache.org
-- OpenSSL 3.0.5 or later, http://www.openssl.org
+- OpenSSL 3.0.7 or later, http://www.openssl.org
 
 Older versions should also work but are not as thoroughly tested by the Tomcat
 Native team


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 66330] StandardContext.skipMemoryLeakChecksOnJvmShutdown has no effect

2022-11-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66330

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #3 from Mark Thomas  ---
Fixed in:
- 10.1.x for 10.1.2 onwards
- 9.0.x for 9.0.69 onwards
- 8.5.x for 8.5.84 onwards

-- 
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



Re: Tomcat Micrometer integration

2022-11-02 Thread Mark Thomas
Our general approach with 3rd party integrations is for the 3rd party to 
host it and we'd be happy to link to it.


While this integration is small, I am concerned about the slippery slope 
and just how much stuff we could end up shipping with Tomcat for various 
3rd party integrations.


Mark


On 02/11/2022 15:50, Marcin Grzejszczak wrote:

Hi!

I'm one of the maintainers of the Micrometer [1] 
project (together with Tommy Ludwig and Jonatan Ivanov).

I'd like to ask if there would be an interest to introduce the Micrometer Observation 
API [2] to Tomcat in order to add 
metrics and distributed tracing support using a single API (that has no compile 
dependencies). We will be releasing this API to Maven Central on the 7/11 so it will 
be publicly available then. We are more than happy to contribute the feature to 
Tomcat.

The Observation instrumentation most likely would include creation of a dedicated 
Valve similar to the one present in this sample 
[3].

[1] https://micrometer.io/
[2] https://micrometer.io/docs/observation
[3] 
https://github.com/micrometer-metrics/micrometer-samples/blob/main/mvc/src/main/java/com/example/micrometer/ManualConfiguration.java#L41
[https://opengraph.githubassets.com/5d615eb5e8a5ff2a90dd0151835cbbb30979c4573e1b566aecc22721de567822/micrometer-metrics/micrometer-samples]
micrometer-samples/ManualConfiguration.java at main · 
micrometer-metrics/micrometer-samples
Sample apps to demo Micrometer features. Contribute to 
micrometer-metrics/micrometer-samples development by creating an account on 
GitHub.
github.com



Marcin Grzejszczak
Staff Engineer, Spring Cloud
mgrzejszc...@vmware.com
Inflancka 4b, 00-189 Warsaw, Poland

Office: +48 22 322 53 05

Cell: +48 782 993 312

[VMware]




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: November release round

2022-11-02 Thread Mark Thomas

On 02/11/2022 18:36, Christopher Schultz wrote:

Mark,

On 11/1/22 12:19, Mark Thomas wrote:
I've just read the OpenSSL announcement. The issue has been downgraded 
to critical but we are going to need to new Tomcat Native release. 
There are a couple of stack overflow bugs in certificate verification 
so Tomcat could be accepted via CLIENT-CERT.


s/accepted/affected/


Tx.

I've been following this as well, and I agree that we need a flurry of 
releases. It's too bad we decided to bundle libtcnative.dll with Tomcat 
releases. *NIX users don't have to wait for a release...


Neither do Windows users. They just have to build from source like their 
Unix colleagues.


I think we should have an immediate VOTE on a tcnative release which 
includes an updated statically-linked Windows DLL. Because there are no 
code changes (?) since the last tcnative release... can we simply 
fast-forward to a release-by-acclamation? ASF probably says no to that. :/


The VOTE thread is on the way. I'm currently travelling so things are a 
little tricker / slower than usual but I expect to get the VOTE thread 
out in the next hour or so.


We can end the VOTE whenever we like. If we have at least 3 +1 PMC votes 
and more PMC +1 votes than -1 votes then we can release. The 72 hours is 
a guideline / very strong recommendation but if we have a good reason 
for doing something else that is fine. And security is generally 
accepted as a good reason for a shorter vote. If we had everyone lined 
up ready to VOTE, the whole thing could be over in a couple of minutes.


Mark



-chris


On 25/10/2022 16:55, Rémy Maucherat wrote:

On Tue, Oct 25, 2022 at 5:52 PM Mark Thomas  wrote:


Hi all,

I've just seen the heads up from the OpenSSL project that there will be
a 3.0.7 release on 2022-12-01 that will address a critical
vulnerability. We won't know the details of the vulnerability until the
release announcement. Given that it may trigger a Tomcat Native release
my current thinking is:

- prep for November releases as normal
- review the OpenSSL issue once public
- roll a Tomcat Native release if necessary
- update to the new Tomcat Native release of there is one
- roll the Tomcat releases

Do we want to pick up an updated migration tool as well?


Maybe, we're in the process of integrating a PR for the tool. The
submitter says it makes it run faster.

Rémy


Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 56026] RemoteEndpoint.Async#sendText(String, SendHandler) not thread safe

2022-11-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026

--- Comment #19 from Mark Thomas  ---
(In reply to Jonathan Leech from comment #18)
> I'll try again here. The current Tomcat implementation of this API throws
> IllegalStateException / TEXT_FULL_WRITING even if the client synchronizes
> access to the methods and / or ensures that the last message was delivered
> (as far as the async API is concerned) before sending the next message.

To clarify, do you mean the call to Async.sendText() has returned or do you
mean that the Future / completion handler has indicated that the sending of the
message is complete?

> Repeatedly saying for 8 years you're following the spec and to take it up
> with the expert group is not helpful. This is a bug. The sync calls
> shouldn't return and the async calls shouldn't represent that the message
> was completed if a subsequent call would result in TEXT_FULL_WRITING.

There are simple ways forward here but which one depends on the answer to the
above question.

-- 
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



Re: Javadoc beyond 17

2022-11-02 Thread Mark Thomas

On 02/11/2022 15:52, Rémy Maucherat wrote:

Hi,

It seems javadoc has become a lot stricter moving forward (starting
with Java 18 it seems), where basically everything now needs a
javadoc. So will we be keeping a zero warning policy, or are we going
to decide to relax it ?
If not, this will keep up busy for some time ;)

I noticed the problem while looking at the github actions failures
with Java 18+ and seeing the javadoc output after fixing.


It depends what the minimum Java version for Jakarta EE 11 is ;)

More seriously, I have been slowly working through these over time with 
the plan / hope to have fixed them by the time we absolutely have to. It 
does seem to be a bit of a moving target depending on JVM vendor and 
Java version.


We should parameterise failonerror and failonwarning so users can 
compile more easily on later versions. And we can change default if we 
reach a point we need to.


Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 66331] Incorrect exception is being caught in SystemLogHandler

2022-11-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66331

--- Comment #3 from Mark Thomas  ---
There are no plans to fix this in 10.0.x since no further 10.0.x releases are
planned.

What is stopping you moving to 10.1.x?

-- 
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



Re: November release round

2022-11-02 Thread Christopher Schultz

Mark,

On 11/1/22 12:19, Mark Thomas wrote:
I've just read the OpenSSL announcement. The issue has been downgraded 
to critical but we are going to need to new Tomcat Native release. There 
are a couple of stack overflow bugs in certificate verification so 
Tomcat could be accepted via CLIENT-CERT.


s/accepted/affected/

I've been following this as well, and I agree that we need a flurry of 
releases. It's too bad we decided to bundle libtcnative.dll with Tomcat 
releases. *NIX users don't have to wait for a release...


I think we should have an immediate VOTE on a tcnative release which 
includes an updated statically-linked Windows DLL. Because there are no 
code changes (?) since the last tcnative release... can we simply 
fast-forward to a release-by-acclamation? ASF probably says no to that. :/


-chris


On 25/10/2022 16:55, Rémy Maucherat wrote:

On Tue, Oct 25, 2022 at 5:52 PM Mark Thomas  wrote:


Hi all,

I've just seen the heads up from the OpenSSL project that there will be
a 3.0.7 release on 2022-12-01 that will address a critical
vulnerability. We won't know the details of the vulnerability until the
release announcement. Given that it may trigger a Tomcat Native release
my current thinking is:

- prep for November releases as normal
- review the OpenSSL issue once public
- roll a Tomcat Native release if necessary
- update to the new Tomcat Native release of there is one
- roll the Tomcat releases

Do we want to pick up an updated migration tool as well?


Maybe, we're in the process of integrating a PR for the tool. The
submitter says it makes it run faster.

Rémy


Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 56026] RemoteEndpoint.Async#sendText(String, SendHandler) not thread safe

2022-11-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=56026

--- Comment #18 from Jonathan Leech  ---
I'll try again here. The current Tomcat implementation of this API throws
IllegalStateException / TEXT_FULL_WRITING even if the client synchronizes
access to the methods and / or ensures that the last message was delivered (as
far as the async API is concerned) before sending the next message. Repeatedly
saying for 8 years you're following the spec and to take it up with the expert
group is not helpful. This is a bug. The sync calls shouldn't return and the
async calls shouldn't represent that the message was completed if a subsequent
call would result in TEXT_FULL_WRITING.

-- 
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



Re: [SECURITY][UPDATE] CVE-2022-42252 Apache Tomcat - Request Smuggling

2022-11-02 Thread Christopher Schultz

All,

There is a typo in this announcement.

The affected versions of Tomcat8.5 are 8.5.0 to 8.0.82, not 8.5.52.

Thanks,
-chris

On 10/31/22 12:46, Mark Thomas wrote:

CVE-2022-42252 Apache Tomcat - Request Smuggling

Severity: Low

Vendor: The Apache Software Foundation

Versions Affected:
Apache Tomcat 10.1.0-M1 to 10.1.0
Apache Tomcat 10.0.0-M1 to 10.0.26
Apache Tomcat 9.0.0-M1 to 9.0.67
Apache Tomcat 8.5.0 to 8.5.52

Description:
If Tomcat was configured to ignore invalid HTTP headers via setting
rejectIllegalHeader to false (the default for 8.5.x only), Tomcat did 
not reject a request containing an invalid Content-Length header making 
a request smuggling attack  possible if Tomcat was located behind a 
reverse proxy that also failed to reject the request with the invalid 
header.



Mitigation:
Users of the affected versions should apply one of the following
mitigations:
- Ensure rejectIllegalHeader is set to true
- Upgrade to Apache Tomcat 10.1.1 or later
- Upgrade to Apache Tomcat 10.0.27 or later
- Upgrade to Apache Tomcat 9.0.68 or later
- Upgrade to Apache Tomcat 8.5.83 or later

Credit:
Thanks to Sam Shahsavar who discovered this issue and reported it to the 
Apache Tomcat security team.


History:
2022-10-31 Original advisory

References:
[1] https://tomcat.apache.org/security-10.html
[2] https://tomcat.apache.org/security-9.html
[3] https://tomcat.apache.org/security-8.html


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-native] tag 2.0.2 created (now 9fea6f69a)

2022-11-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 2.0.2
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


  at 9fea6f69a (commit)
This tag includes the following new commits:

 new 9fea6f69a Tag 2.0.2

The 1 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.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-native] 01/01: Tag 2.0.2

2022-11-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 2.0.2
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit 9fea6f69aca11c2a129c557934f9abb40ac4e732
Author: Mark Thomas 
AuthorDate: Wed Nov 2 16:12:43 2022 +

Tag 2.0.2
---
 build.properties.default | 2 +-
 native/include/tcn_version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index b647a049c..550a69d08 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=2
 version.minor=0
 version.build=2
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Default Base Path for Dependent Packages -
 # Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index c11cf2b52..ba63f7ef5 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
  *  This symbol is defined for internal, "development" copies of TCN. This
  *  symbol will be #undef'd for releases.
  */
-#define TCN_IS_DEV_VERSION  1
+#define TCN_IS_DEV_VERSION  0
 
 
 /** The formatted string of APU's version */


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Javadoc beyond 17

2022-11-02 Thread Rémy Maucherat
Hi,

It seems javadoc has become a lot stricter moving forward (starting
with Java 18 it seems), where basically everything now needs a
javadoc. So will we be keeping a zero warning policy, or are we going
to decide to relax it ?
If not, this will keep up busy for some time ;)

I noticed the problem while looking at the github actions failures
with Java 18+ and seeing the javadoc output after fixing.

Rémy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Tomcat Micrometer integration

2022-11-02 Thread Marcin Grzejszczak
Hi!

I'm one of the maintainers of the Micrometer [1] 
project (together with Tommy Ludwig and Jonatan Ivanov).

I'd like to ask if there would be an interest to introduce the Micrometer 
Observation API [2] to Tomcat in order 
to add metrics and distributed tracing support using a single API (that has no 
compile dependencies). We will be releasing this API to Maven Central on the 
7/11 so it will be publicly available then. We are more than happy to 
contribute the feature to Tomcat.

The Observation instrumentation most likely would include creation of a 
dedicated Valve similar to the one present in this sample 
[3].

[1] https://micrometer.io/
[2] https://micrometer.io/docs/observation
[3] 
https://github.com/micrometer-metrics/micrometer-samples/blob/main/mvc/src/main/java/com/example/micrometer/ManualConfiguration.java#L41
[https://opengraph.githubassets.com/5d615eb5e8a5ff2a90dd0151835cbbb30979c4573e1b566aecc22721de567822/micrometer-metrics/micrometer-samples]
micrometer-samples/ManualConfiguration.java at main · 
micrometer-metrics/micrometer-samples
Sample apps to demo Micrometer features. Contribute to 
micrometer-metrics/micrometer-samples development by creating an account on 
GitHub.
github.com



Marcin Grzejszczak
Staff Engineer, Spring Cloud
mgrzejszc...@vmware.com
Inflancka 4b, 00-189 Warsaw, Poland

Office: +48 22 322 53 05

Cell: +48 782 993 312

[VMware]



[Bug 66331] Incorrect exception is being caught in SystemLogHandler

2022-11-02 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66331

--- Comment #2 from John Carr  ---
Can this be fixed in 10.0.28?  We currently cannot move to 10.1.x.

-- 
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



[VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.5

2022-11-02 Thread Mark Thomas

The proposed Apache Tomcat migration tool for Jakarta EE 1.0.5 is now
available for voting.

The significant changes since 1.0.4 are:

- #37 narrow scope of javax.annotation conversion to Java EE. PR by
  Danny Thomas
- #36 Improve manifest handling and conversion performance. PR by Danny
  Thomas.

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.5/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1404/

The tag is:
https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.5
d87e1ec7e67c8d61340111b796e3bb8179a6f0ba

The proposed 1.0.5 release is:

[ ] -1: Broken. Do not release because...
[ ] +1: Acceptable. Go ahead and release.

Thanks,

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-jakartaee-migration] branch main updated: Prepare for next development iteration

2022-11-02 Thread markt
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-jakartaee-migration.git


The following commit(s) were added to refs/heads/main by this push:
 new 52ed05b  Prepare for next development iteration
52ed05b is described below

commit 52ed05b0458ddd977b348b8eb8b890e851d3fea8
Author: Mark Thomas 
AuthorDate: Wed Nov 2 12:40:24 2022 +

Prepare for next development iteration
---
 CHANGES.md | 4 
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 228ce68..08ecc7c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,9 @@
 # Tomcat Migration Tool for Jakarta EE - Changelog
 
+## 1.0.6
+
+- TBD
+
 ## 1.0.5
 
 - Improve manifest handling to remain the key ordering when unchanged 
manifests. PR 
[#36](https://github.com/apache/tomcat-jakartaee-migration/pull/36) provided by 
Danny Thomas (lihan)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r57725 - in /dev/tomcat/jakartaee-migration/v1.0.5: ./ binaries/ source/

2022-11-02 Thread markt
Author: markt
Date: Wed Nov  2 12:08:47 2022
New Revision: 57725

Log:
Upload Tomcat migration tool for Jakarta EE v1.0.5 for voting

Added:
dev/tomcat/jakartaee-migration/v1.0.5/
dev/tomcat/jakartaee-migration/v1.0.5/binaries/

dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz
   (with props)

dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz.asc

dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz.sha512

dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.zip
   (with props)

dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.zip.asc

dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.zip.sha512

dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-shaded.jar
   (with props)

dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-shaded.jar.asc

dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-shaded.jar.sha512
dev/tomcat/jakartaee-migration/v1.0.5/source/

dev/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz
   (with props)

dev/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz.asc

dev/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz.sha512

dev/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.zip  
 (with props)

dev/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.zip.asc

dev/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.zip.sha512

Added: 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz.asc
==
--- 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz.asc
 (added)
+++ 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz.asc
 Wed Nov  2 12:08:47 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmNiWncACgkQEMAcWi9g
+WeeAOg//U554jMjW/NCaRPB0kVfLtaFq5DjcgoolY9YxMcr7b2qhcNswOlywrD8s
+4uVYArIk3ve0Tdew7IfULyQjBGptuJOa1wwk13u8uLBaD3fL9yJbb1B41DE+u8sU
+46m9vdjhbpHi6fmFxnMCMNhrXh0/krFLoCeZfEyQto7lP77SddrcFv4G8iwpekte
+1kL3KuyZi5XAE82maa1GQ4BRikauG7A/M4XrLy4mc6aCkdq9QRi5dRD+mqnX9Eip
+r25rXYIACHRoa1z9+uGOyNjSgdrwdQ4ve2eyPHGFPiS2JrDnbnDJ5JSweYJtO8xK
+1/hFchZ+14vCE6oZJWcCRGprnjSW1KVKB9pc+u2GPtOobvFeVCur0lAQGxl/2q09
+8wOWFGwmHW4YXEvtvwsgyMqnL+wnw0YCnR4LTfSTevAw4hFYLNVAhNigsqb6UWnc
+u2FUvowLWKljdrOROjV8ZafcJwL7mswUFd+Kr1N+SNl+mTi+idVrXsOdh2nnIp3J
+5cFlQbTIHZFbMlYorKkSLMJAYubYslBQnrXBGCpPdtZMvv5flQhtECWf8VAQyQKU
+2/C9u8e7Fw7e5s65o01rzoqj4zP+MDmOxltlng7z9+BYVk6wNvHFe/sVXk1IdGzs
++RKBHf9jSuSKqI/J/Y//VcODd8UrBCIOjQubFKbMSL4LYXmTiVo=
+=2FFZ
+-END PGP SIGNATURE-

Added: 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz.sha512
==
--- 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz.sha512
 (added)
+++ 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.tar.gz.sha512
 Wed Nov  2 12:08:47 2022
@@ -0,0 +1 @@
+be5b7d4af0f59da0a88a5955d2ba74cbf40f96d71d72c05286975b511b800939f30a347a15399472815dbcb23cee2310cf1639d41b636fbcb0cd25a461cd8953
 *jakartaee-migration-1.0.5-bin.tar.gz

Added: 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.zip.asc
==
--- 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.zip.asc
 (added)
+++ 
dev/tomcat/jakartaee-migration/v1.0.5/binaries/jakartaee-migration-1.0.5-bin.zip.asc
 Wed Nov  2 12:08:47 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmNiWncACgkQEMAcWi9g
+WedMgRAA9tuw4eA5qVOl8THQeOK2AKqfVoEh6h5Aa7Yi593WuOSh6EAEBsWulm98

[tomcat-jakartaee-migration] branch main updated: [maven-release-plugin] prepare for next development iteration

2022-11-02 Thread markt
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-jakartaee-migration.git


The following commit(s) were added to refs/heads/main by this push:
 new 7a9da75  [maven-release-plugin] prepare for next development iteration
7a9da75 is described below

commit 7a9da75d5ced43e56695c412b3f066948a34bcd1
Author: Mark Thomas 
AuthorDate: Wed Nov 2 10:27:39 2022 +

[maven-release-plugin] prepare for next development iteration
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ceb43f8..b882ab9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  1.0.5
+  1.0.6-SNAPSHOT
   Apache Tomcat Migration Tool for Jakarta EE
 
   The aim of the tool is to take a web application written for 
Java EE 8 that
@@ -62,7 +62,7 @@
   
 
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
 
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
-1.0.5
+main
 
https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-jakartaee-migration] annotated tag 1.0.5 created (now 8d97da7)

2022-11-02 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to annotated tag 1.0.5
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


  at 8d97da7  (tag)
 tagging d87e1ec7e67c8d61340111b796e3bb8179a6f0ba (commit)
 replaces 1.0.4
  by Mark Thomas
  on Wed Nov 2 10:27:35 2022 +

- Log -
[maven-release-plugin] copy for tag 1.0.5
---

No new revisions were added by this update.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-jakartaee-migration] branch main updated: [maven-release-plugin] prepare release 1.0.5

2022-11-02 Thread markt
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-jakartaee-migration.git


The following commit(s) were added to refs/heads/main by this push:
 new d87e1ec  [maven-release-plugin] prepare release 1.0.5
d87e1ec is described below

commit d87e1ec7e67c8d61340111b796e3bb8179a6f0ba
Author: Mark Thomas 
AuthorDate: Wed Nov 2 10:27:12 2022 +

[maven-release-plugin] prepare release 1.0.5
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3699420..ceb43f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.tomcat
   jakartaee-migration
-  1.0.5-SNAPSHOT
+  1.0.5
   Apache Tomcat Migration Tool for Jakarta EE
 
   The aim of the tool is to take a web application written for 
Java EE 8 that
@@ -62,7 +62,7 @@
   
 
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
 
scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
-main
+1.0.5
 
https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-jakartaee-migration] branch main updated: Update to Commons Compress to 1.22

2022-11-02 Thread markt
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-jakartaee-migration.git


The following commit(s) were added to refs/heads/main by this push:
 new c5d0074  Update to Commons Compress to 1.22
c5d0074 is described below

commit c5d0074494a9db20c62a2d435db645ada60a36b4
Author: Mark Thomas 
AuthorDate: Wed Nov 2 10:15:56 2022 +

Update to Commons Compress to 1.22
---
 CHANGES.md | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4508ddb..228ce68 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@
 - Improve composability of the migration tool when using from other tools. PR 
[#36](https://github.com/apache/tomcat-jakartaee-migration/pull/36) provided by 
Danny Thomas (lihan)
 - Avoid converting many classes from javax.annotation. PR 
[#37](https://github.com/apache/tomcat-jakartaee-migration/pull/37) provided by 
Danny Thomas (remm)
 - Update Apache BCEL to 6.6.0. (markt)
+- Update Apache Commons Compress 1.22. (markt)
 
 ## 1.0.4
 
diff --git a/pom.xml b/pom.xml
index 0b0cc9b..3699420 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
 
   org.apache.commons
   commons-compress
-  1.21
+  1.22
 
 
   commons-io


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-jakartaee-migration] branch main updated: Update BCEL to 6.6.0

2022-11-02 Thread markt
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-jakartaee-migration.git


The following commit(s) were added to refs/heads/main by this push:
 new cb6cd44  Update BCEL to 6.6.0
cb6cd44 is described below

commit cb6cd448f6ac3098cc1ce3f24456b409cf12fa33
Author: Mark Thomas 
AuthorDate: Wed Nov 2 10:12:15 2022 +

Update BCEL to 6.6.0
---
 CHANGES.md | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index af8fc36..4508ddb 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@
 - Improve the performance of conversion by avoiding `JavaClass.dump` when 
there are no changes. PR 
[#36](https://github.com/apache/tomcat-jakartaee-migration/pull/36) provided by 
Danny Thomas (lihan)
 - Improve composability of the migration tool when using from other tools. PR 
[#36](https://github.com/apache/tomcat-jakartaee-migration/pull/36) provided by 
Danny Thomas (lihan)
 - Avoid converting many classes from javax.annotation. PR 
[#37](https://github.com/apache/tomcat-jakartaee-migration/pull/37) provided by 
Danny Thomas (remm)
+- Update Apache BCEL to 6.6.0. (markt)
 
 ## 1.0.4
 
diff --git a/pom.xml b/pom.xml
index 0561907..0b0cc9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
 
   org.apache.bcel
   bcel
-  6.5.0
+  6.6.0
 
 
   org.apache.commons


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-jakartaee-migration] branch main updated: Skip two tests when security manager is disabled

2022-11-02 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git


The following commit(s) were added to refs/heads/main by this push:
 new f6c8ba9  Skip two tests when security manager is disabled
f6c8ba9 is described below

commit f6c8ba92a1d6442cff7a6eeceb837cc959096b02
Author: remm 
AuthorDate: Wed Nov 2 11:05:51 2022 +0100

Skip two tests when security manager is disabled
---
 .../org/apache/tomcat/jakartaee/MigrationTest.java | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java 
b/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
index 812e6a3..9987c2e 100644
--- a/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
+++ b/src/test/java/org/apache/tomcat/jakartaee/MigrationTest.java
@@ -25,6 +25,7 @@ import java.util.jar.JarFile;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -32,14 +33,25 @@ import static org.junit.Assert.*;
 
 public class MigrationTest {
 
+private boolean securityManagerAvailable = true;
+
 @Before
 public void setUp() {
-System.setSecurityManager(new NoExitSecurityManager());
+try {
+System.setSecurityManager(new NoExitSecurityManager());
+} catch (Throwable t) {
+// Throws exception by default on newer Java versions
+securityManagerAvailable = false;
+}
 }
 
 @After
 public void tearDown() {
-System.setSecurityManager(null);
+try {
+System.setSecurityManager(null);
+} catch (Throwable t) {
+// Throws exception by default on newer Java versions
+}
 }
 
 @Test
@@ -83,6 +95,7 @@ public class MigrationTest {
 
 @Test
 public void testInvalidOption() throws Exception {
+Assume.assumeTrue(securityManagerAvailable);
 File sourceFile = new File("target/test-classes/HelloServlet.java");
 File migratedFile = new 
File("target/test-classes/HelloServlet.migrated.java");
 
@@ -96,6 +109,7 @@ public class MigrationTest {
 
 @Test
 public void testInvalidProfile() throws Exception {
+Assume.assumeTrue(securityManagerAvailable);
 File sourceFile = new File("target/test-classes/HelloServlet.java");
 File migratedFile = new 
File("target/test-classes/HelloServlet.migrated.java");
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] [tomcat-jakartaee-migration] markt-asf closed issue #35: Does this project work in a spring 5 project?

2022-11-02 Thread GitBox


markt-asf closed issue #35: Does this project work in a spring 5 project?
URL: https://github.com/apache/tomcat-jakartaee-migration/issues/35


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] [tomcat-jakartaee-migration] markt-asf commented on issue #35: Does this project work in a spring 5 project?

2022-11-02 Thread GitBox


markt-asf commented on issue #35:
URL: 
https://github.com/apache/tomcat-jakartaee-migration/issues/35#issuecomment-1299935540

   No. Those JARs are excluded because they are known not to contain any 
classes that require conversion. The exclusion is a performance optimisation.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1904997 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml

2022-11-02 Thread remm
Author: remm
Date: Wed Nov  2 09:22:27 2022
New Revision: 1904997

URL: http://svn.apache.org/viewvc?rev=1904997=rev
Log:
Add slides link

Modified:
tomcat/site/trunk/docs/presentations.html
tomcat/site/trunk/xdocs/presentations.xml

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1904997=1904996=1904997=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Wed Nov  2 09:22:27 2022
@@ -1,5 +1,5 @@
 
-Apache Tomcat - 
Presentationshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" 
class="pull-left">https://www.google.com/search; method="get">GOApache 
TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/down
 load-migration.cgi">Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.1 (beta)Tomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.
 org/tomcat/">BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentPresentations
+Apache Tomcat - 
Presentationshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" 
class="pull-left">https://www.google.com/search; method="get">GOApache 
TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/download-80.cgi;>Tomcat 8https://tomcat.apache.org/down
 load-migration.cgi">Tomcat Migration Tool for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.1Tomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat ConnectorsTomcat Native 2Tomcat Native 1.2https://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubehttps://blogs.apache.org/tom
 cat/">BlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://privacy.apache.org/policies/privacy-policy-public.html;>Privacyhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentPresentations
 
 Apache Tomcat features regularly at ApacheCon and other conferences. Copies
 of many of these presentations are freely available online. This page provides
@@ -37,14 +37,16 @@ li.targeted {
 
 
   
-New and Upcoming - Rmy Maucherat
+New and Upcoming - Rmy Maucherat,
+https://apachecon.com/acna2022/slides/03_MAUCHERAT_NEW.pdf;>slides
   
   
 HTTP/2, HTTP/3 and TLS State of the 

[tomcat] branch 8.5.x updated: Improve TaskQueue.

2022-11-02 Thread lihan
This is an automated email from the ASF dual-hosted git repository.

lihan 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 a7cfc66de7 Improve TaskQueue.
a7cfc66de7 is described below

commit a7cfc66de7f45fc905248fc7261b24a6793e5fd5
Author: lihan 
AuthorDate: Wed Nov 2 17:01:29 2022 +0800

Improve TaskQueue.

Reduce the performance overhead of
unnecessary locks by customizing a
lock-free method for obtaining pool size
---
 java/org/apache/tomcat/util/threads/TaskQueue.java  |  6 +++---
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java | 12 
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index b799e3664c..755658a7de 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -101,15 +101,15 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 return super.offer(o);
 }
 //we are maxed out on threads, simply queue the object
-if (parent.getPoolSize() == parent.getMaximumPoolSize()) {
+if (parent.getPoolSizeNoLock() == parent.getMaximumPoolSize()) {
 return super.offer(o);
 }
 //we have idle threads, just add it to the queue
-if (parent.getSubmittedCount()<=(parent.getPoolSize())) {
+if (parent.getSubmittedCount() <= parent.getPoolSizeNoLock()) {
 return super.offer(o);
 }
 //if we have less threads than maximum force creation of a new thread
-if (parent.getPoolSize()NOTE: this method only used in {@link 
TaskQueue#offer(Runnable)},
+ * where operations are frequent, can greatly reduce unnecessary
+ * performance overhead by a lock-free way.
+ * @return the number of threads
+ */
+protected int getPoolSizeNoLock() {
+return runStateAtLeast(ctl.get(), TIDYING) ? 0
+: workers.size();
+}
+
 /**
  * Returns the approximate number of threads that are actively
  * executing tasks.


-
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: Improve TaskQueue.

2022-11-02 Thread lihan
This is an automated email from the ASF dual-hosted git repository.

lihan 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 a2ffa69a72 Improve TaskQueue.
a2ffa69a72 is described below

commit a2ffa69a72b19e04031895a3ab3e024e853e760d
Author: lihan 
AuthorDate: Wed Nov 2 17:01:29 2022 +0800

Improve TaskQueue.

Reduce the performance overhead of
unnecessary locks by customizing a
lock-free method for obtaining pool size
---
 java/org/apache/tomcat/util/threads/TaskQueue.java  |  6 +++---
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java | 12 
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index b799e3664c..755658a7de 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -101,15 +101,15 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 return super.offer(o);
 }
 //we are maxed out on threads, simply queue the object
-if (parent.getPoolSize() == parent.getMaximumPoolSize()) {
+if (parent.getPoolSizeNoLock() == parent.getMaximumPoolSize()) {
 return super.offer(o);
 }
 //we have idle threads, just add it to the queue
-if (parent.getSubmittedCount()<=(parent.getPoolSize())) {
+if (parent.getSubmittedCount() <= parent.getPoolSizeNoLock()) {
 return super.offer(o);
 }
 //if we have less threads than maximum force creation of a new thread
-if (parent.getPoolSize()NOTE: this method only used in {@link 
TaskQueue#offer(Runnable)},
+ * where operations are frequent, can greatly reduce unnecessary
+ * performance overhead by a lock-free way.
+ * @return the number of threads
+ */
+protected int getPoolSizeNoLock() {
+return runStateAtLeast(ctl.get(), TIDYING) ? 0
+: workers.size();
+}
+
 /**
  * Returns the approximate number of threads that are actively
  * executing tasks.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 10.1.x updated: Improve TaskQueue.

2022-11-02 Thread lihan
This is an automated email from the ASF dual-hosted git repository.

lihan pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 77e025ffaa Improve TaskQueue.
77e025ffaa is described below

commit 77e025ffaa571e58138b0657d143f6084eb996f5
Author: lihan 
AuthorDate: Wed Nov 2 17:01:29 2022 +0800

Improve TaskQueue.

Reduce the performance overhead of
unnecessary locks by customizing a
lock-free method for obtaining pool size
---
 java/org/apache/tomcat/util/threads/TaskQueue.java  |  6 +++---
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java | 12 
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 7104280027..7ff4e3e586 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -77,15 +77,15 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 return super.offer(o);
 }
 //we are maxed out on threads, simply queue the object
-if (parent.getPoolSize() == parent.getMaximumPoolSize()) {
+if (parent.getPoolSizeNoLock() == parent.getMaximumPoolSize()) {
 return super.offer(o);
 }
 //we have idle threads, just add it to the queue
-if (parent.getSubmittedCount()<=(parent.getPoolSize())) {
+if (parent.getSubmittedCount() <= parent.getPoolSizeNoLock()) {
 return super.offer(o);
 }
 //if we have less threads than maximum force creation of a new thread
-if (parent.getPoolSize()NOTE: this method only used in {@link 
TaskQueue#offer(Runnable)},
+ * where operations are frequent, can greatly reduce unnecessary
+ * performance overhead by a lock-free way.
+ * @return the number of threads
+ */
+protected int getPoolSizeNoLock() {
+return runStateAtLeast(ctl.get(), TIDYING) ? 0
+: workers.size();
+}
+
 /**
  * Returns the approximate number of threads that are actively
  * executing tasks.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated: Improve TaskQueue.

2022-11-02 Thread lihan
This is an automated email from the ASF dual-hosted git repository.

lihan 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 c88e4ca0d8 Improve TaskQueue.
c88e4ca0d8 is described below

commit c88e4ca0d85d0dd48659b8d1818ee9f9775193e4
Author: lihan 
AuthorDate: Wed Nov 2 17:01:29 2022 +0800

Improve TaskQueue.

Reduce the performance overhead of
unnecessary locks by customizing a
lock-free method for obtaining pool size
---
 java/org/apache/tomcat/util/threads/TaskQueue.java  |  6 +++---
 java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java | 12 
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java 
b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 7104280027..7ff4e3e586 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -77,15 +77,15 @@ public class TaskQueue extends 
LinkedBlockingQueue {
 return super.offer(o);
 }
 //we are maxed out on threads, simply queue the object
-if (parent.getPoolSize() == parent.getMaximumPoolSize()) {
+if (parent.getPoolSizeNoLock() == parent.getMaximumPoolSize()) {
 return super.offer(o);
 }
 //we have idle threads, just add it to the queue
-if (parent.getSubmittedCount()<=(parent.getPoolSize())) {
+if (parent.getSubmittedCount() <= parent.getPoolSizeNoLock()) {
 return super.offer(o);
 }
 //if we have less threads than maximum force creation of a new thread
-if (parent.getPoolSize()NOTE: this method only used in {@link 
TaskQueue#offer(Runnable)},
+ * where operations are frequent, can greatly reduce unnecessary
+ * performance overhead by a lock-free way.
+ * @return the number of threads
+ */
+protected int getPoolSizeNoLock() {
+return runStateAtLeast(ctl.get(), TIDYING) ? 0
+: workers.size();
+}
+
 /**
  * Returns the approximate number of threads that are actively
  * executing tasks.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: November release round

2022-11-02 Thread Rémy Maucherat
On Wed, Nov 2, 2022 at 2:40 AM Han Li  wrote:
>
>
>
> > 2022年11月2日 00:19,Mark Thomas  写道:
> >
> > I've just read the OpenSSL announcement. The issue has been downgraded to 
> > critical but we are going to need to new Tomcat Native release. There are a 
> > couple of stack overflow bugs in certificate verification so Tomcat could 
> > be accepted via CLIENT-CERT.
> >
> > Where are we on the migration tool. I haven't been following that closely. 
> > Is the repo ready for a release?
> Yes, I think it’s ready. ;)

+1

Remy

> Han
> >
> > Mark
> >
> >
> > On 25/10/2022 16:55, Rémy Maucherat wrote:
> >> On Tue, Oct 25, 2022 at 5:52 PM Mark Thomas  wrote:
> >>>
> >>> Hi all,
> >>>
> >>> I've just seen the heads up from the OpenSSL project that there will be
> >>> a 3.0.7 release on 2022-12-01 that will address a critical
> >>> vulnerability. We won't know the details of the vulnerability until the
> >>> release announcement. Given that it may trigger a Tomcat Native release
> >>> my current thinking is:
> >>>
> >>> - prep for November releases as normal
> >>> - review the OpenSSL issue once public
> >>> - roll a Tomcat Native release if necessary
> >>> - update to the new Tomcat Native release of there is one
> >>> - roll the Tomcat releases
> >>>
> >>> Do we want to pick up an updated migration tool as well?
> >> Maybe, we're in the process of integrating a PR for the tool. The
> >> submitter says it makes it run faster.
> >> Rémy
> >>> Mark
> >>>
> >>> -
> >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> >>> For additional commands, e-mail: dev-h...@tomcat.apache.org
> >>>
> >> -
> >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> >> For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org