[Bug 65106] ConfigFileLoader cannot properly handle file url running with SecurityManager on openjdk 1.8

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65106

--- Comment #2 from Jiri Novak  ---
I understand but the current state is that tomcat won't start.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64395] Windows Installer should offer an option to select a service account

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64395

--- Comment #4 from Bill Stewart  ---
If I may be so bold, I designed an alternative Windows installer package (with
approval from ASF) that is designed to simplify scenarios like this. Upgrade is
simple:

1. Update timestamps of config files you don't want to overwrite, and
2. run installer and everything is upgraded automatically.

There's no need to uninstall/reinstall unless you need to "downgrade," and the
installer supports installing multiple instances (each of which gets its own
entry in the Windows program list).

https://github.com/Bill-Stewart/ApacheTomcatSetup

The alternative installer has a couple of easily worked around minor bugs that
will get fixed in the next version.

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

svn commit: r1885951 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

[kkolinko]

Author: kkolinko
Date: Wed Jan 27 22:21:21 2021
New Revision: 1885951

URL: http://svn.apache.org/viewvc?rev=1885951=rev
Log:
Correct Release announcement of Apache Tomcat Native 1.2.26.

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

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1885951=1885950=1885951=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Jan 27 22:21:21 2021
@@ -34,8 +34,8 @@ The Apache Tomcat Project is proud to an
 Tomcat Native. The notable changes since 1.2.25 include:
 
 
-Windows binaries built using 1.1.1i
-Expose support for Unix domain sockets (bug 64942)
+Windows binaries built using OpenSSL 1.1.1i
+Expose support for Unix domain sockets (bug https://bz.apache.org/bugzilla/show_bug.cgi?id=64942;>64942)
 
 
 https://tomcat.apache.org/download-native.cgi;>Download |

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1885951=1885950=1885951=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Wed Jan 27 22:21:21 2021
@@ -46,8 +46,8 @@ The Apache Tomcat Project is proud to an
 Tomcat Native. The notable changes since 1.2.25 include:
 
 
-Windows binaries built using 1.1.1i
-Expose support for Unix domain sockets (bug 64942)
+Windows binaries built using OpenSSL 1.1.1i
+Expose support for Unix domain sockets (bug 64942)
 
 
 Download |



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

RE: [VOTE] Release Apache Tomcat 10.0.1

[jonmcalexander]

Thank you,

Dream * Excel * Explore * Inspire
Jon McAlexander
Infrastructure Engineer
Asst Vice President

Middleware Product Engineering
Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com

Upcoming PTO: 10/30/2020, 11/6/2020, 11/13/2020, 11/20/2020, 11/27/2020, 
12/2/2020, 12/4/2020, 12/11/2020, 12/18/2020, 12/28/2020, 12/29/2020, 
12/30/2020, 12/31/2020
This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.


> -Original Message-
> From: Mark Thomas 
> Sent: Wednesday, January 27, 2021 1:38 PM
> To: dev@tomcat.apache.org
> Subject: Re: [VOTE] Release Apache Tomcat 10.0.1
> 
> On 27/01/2021 19:28, jonmcalexan...@wellsfargo.com.INVALID wrote:
> > Please forgive my ignorance, but would this then be considered the first
> Official Release of Tomcat 10x, or is it still considered Beta?
> 
> I depends on the result of the vote. Assuming the vote to release passes, if 
> more
> people vote for stable than beta it will be announced as stable.
> 
> Mark
> 
> 
> >
> > Thanks,
> >
> > Dream * Excel * Explore * Inspire
> > Jon McAlexander
> > Infrastructure Engineer
> > Asst Vice President
> >
> > Middleware Product Engineering
> > Enterprise CIO | Platform Services | Middleware | Infrastructure
> > Solutions
> >
> > 8080 Cobblestone Rd | Urbandale, IA 50322
> > MAC: F4469-010
> > Tel 515-988-2508 | Cell 515-988-2508
> >
> > jonmcalexan...@wellsfargo.com
> >
> > Upcoming PTO: 10/30/2020, 11/6/2020, 11/13/2020, 11/20/2020,
> > 11/27/2020, 12/2/2020, 12/4/2020, 12/11/2020, 12/18/2020, 12/28/2020,
> 12/29/2020, 12/30/2020, 12/31/2020 This message may contain confidential
> and/or privileged information. If you are not the addressee or authorized to
> receive this for the addressee, you must not use, copy, disclose, or take any
> action based on this message or any information herein. If you have received
> this message in error, please advise the sender immediately by reply e-mail 
> and
> delete this message. Thank you for your cooperation.
> >
> >> -Original Message-
> >> From: Mark Thomas 
> >> Sent: Wednesday, January 27, 2021 9:09 AM
> >> To: Tomcat Developers List 
> >> Subject: [VOTE] Release Apache Tomcat 10.0.1
> >>
> >> The proposed Apache Tomcat 10.0.1 release is now available for voting.
> >>
> >> Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
> >> package for all the specification APIs has changed from javax.* to
> >> jakarta.* Applications that run on Tomcat 9 will not run on Tomcat 10
> without changes.
> >>
> >> The notable changes compared to 10.0.1 are:
> >>
> >> - Add support for using Unix domain sockets for NIO when running on
> >>   Java 16 or later.
> >>
> >> - Add a new StringInterpreter interface that allows applications to
> >>   provide customised string attribute value to type conversion within
> >>   JSPs. This allows applications to provide a conversion
> >>   implementation that is optimised for the application.
> >>
> >> - Add peerAddress to coyote request, which contains the IP address of
> >>   the direct connection peer. If a reverse proxy sits in front of
> >>   Tomcat and the protocol used is AJP or HTTP in combination with the
> >>   RemoteIp(Valve|Filter), the peer address might differ from the
> >>   remoteAddress. The latter then contains the address of the client in
> >>   front of the reverse proxy, not the address of the proxy itself.
> >>
> >> Along with lots of other bug fixes and improvements.
> >>
> >>
> >> For full details, see the changelog:
> >> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
> >>
> >> It can be obtained from:
> >> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.1/
> >> The Maven staging repo is:
> >> https://repository.apache.org/content/repositories/orgapachetomcat-12
> >> 92/
> >> The tag is:
> >> https://github.com/apache/tomcat/tree/10.0.1
> >> e4344b6bd67359e1690312674d83710a793f1d5b
> >>
> >> The proposed 10.0.1 release is:
> >> [ ] Broken - do not release
> >> [ ] Beta   - go ahead and release as 10.0.1 (beta)
> >> [ ] Stable - go ahead and release as 10.0.1 (stable)
> >>
> >> -
> >> 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][OT] Release Apache Tomcat 8.5.62

[Christopher Schultz]

Mark,

On 1/27/21 14:25, Mark Thomas wrote:

- Add peerAddress to coyote request, which contains the IP address of
   the direct connection peer. If a reverse proxy sits in front of
   Tomcat and the protocol used is AJP or HTTP in combination with the
   RemoteIp(Valve|Filter), the peer address might differ from the
   remoteAddress. The latter then contains the address of the client in
   front of the reverse proxy, not the address of the proxy itself.


I had to read this 3 times to make sense of it. And it does make sense.

We might want to simplify this lagnuage for a wider announcement. How 
about this:


- Add a peerAddress to coyote request, which contains the IP address of
  the direct connection peer. This allows other components in Tomcat
  to make decisions based upon the direct peer's IP address instead of
  the client's IP address. This is especially useful when locking-down
  Tomcat to allow any client, but only if they are connecting through
  a trusted reverse-proxy.

Another comment:

There is some overlap here with RemoteIPValve/Filter which already 
handles understands how to interpret X-Forwarded-* HTTP headers to trust 
a reverse-proxy. But you can't use RemoteIPValve/Filter to e.g. force 
all users through the proxy with this feature.


-chris

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

Re: [VOTE] Release Apache Tomcat 10.0.1

[Mark Thomas]

On 27/01/2021 19:28, jonmcalexan...@wellsfargo.com.INVALID wrote:
> Please forgive my ignorance, but would this then be considered the first 
> Official Release of Tomcat 10x, or is it still considered Beta?

I depends on the result of the vote. Assuming the vote to release
passes, if more people vote for stable than beta it will be announced as
stable.

Mark


> 
> Thanks,
> 
> Dream * Excel * Explore * Inspire
> Jon McAlexander
> Infrastructure Engineer
> Asst Vice President
> 
> Middleware Product Engineering
> Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions
> 
> 8080 Cobblestone Rd | Urbandale, IA 50322
> MAC: F4469-010
> Tel 515-988-2508 | Cell 515-988-2508
> 
> jonmcalexan...@wellsfargo.com
> 
> Upcoming PTO: 10/30/2020, 11/6/2020, 11/13/2020, 11/20/2020, 11/27/2020, 
> 12/2/2020, 12/4/2020, 12/11/2020, 12/18/2020, 12/28/2020, 12/29/2020, 
> 12/30/2020, 12/31/2020
> This message may contain confidential and/or privileged information. If you 
> are not the addressee or authorized to receive this for the addressee, you 
> must not use, copy, disclose, or take any action based on this message or any 
> information herein. If you have received this message in error, please advise 
> the sender immediately by reply e-mail and delete this message. Thank you for 
> your cooperation.
> 
>> -Original Message-
>> From: Mark Thomas 
>> Sent: Wednesday, January 27, 2021 9:09 AM
>> To: Tomcat Developers List 
>> Subject: [VOTE] Release Apache Tomcat 10.0.1
>>
>> The proposed Apache Tomcat 10.0.1 release is now available for voting.
>>
>> Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary package
>> for all the specification APIs has changed from javax.* to jakarta.* 
>> Applications
>> that run on Tomcat 9 will not run on Tomcat 10 without changes.
>>
>> The notable changes compared to 10.0.1 are:
>>
>> - Add support for using Unix domain sockets for NIO when running on
>>   Java 16 or later.
>>
>> - Add a new StringInterpreter interface that allows applications to
>>   provide customised string attribute value to type conversion within
>>   JSPs. This allows applications to provide a conversion
>>   implementation that is optimised for the application.
>>
>> - Add peerAddress to coyote request, which contains the IP address of
>>   the direct connection peer. If a reverse proxy sits in front of
>>   Tomcat and the protocol used is AJP or HTTP in combination with the
>>   RemoteIp(Valve|Filter), the peer address might differ from the
>>   remoteAddress. The latter then contains the address of the client in
>>   front of the reverse proxy, not the address of the proxy itself.
>>
>> Along with lots of other bug fixes and improvements.
>>
>>
>> For full details, see the changelog:
>> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
>>
>> It can be obtained from:
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.1/
>> The Maven staging repo is:
>> https://repository.apache.org/content/repositories/orgapachetomcat-1292/
>> The tag is:
>> https://github.com/apache/tomcat/tree/10.0.1
>> e4344b6bd67359e1690312674d83710a793f1d5b
>>
>> The proposed 10.0.1 release is:
>> [ ] Broken - do not release
>> [ ] Beta   - go ahead and release as 10.0.1 (beta)
>> [ ] Stable - go ahead and release as 10.0.1 (stable)
>>
>> -
>> 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

RE: [VOTE] Release Apache Tomcat 10.0.1

[jonmcalexander]

Please forgive my ignorance, but would this then be considered the first 
Official Release of Tomcat 10x, or is it still considered Beta?

Thanks,

Dream * Excel * Explore * Inspire
Jon McAlexander
Infrastructure Engineer
Asst Vice President

Middleware Product Engineering
Enterprise CIO | Platform Services | Middleware | Infrastructure Solutions

8080 Cobblestone Rd | Urbandale, IA 50322
MAC: F4469-010
Tel 515-988-2508 | Cell 515-988-2508

jonmcalexan...@wellsfargo.com

Upcoming PTO: 10/30/2020, 11/6/2020, 11/13/2020, 11/20/2020, 11/27/2020, 
12/2/2020, 12/4/2020, 12/11/2020, 12/18/2020, 12/28/2020, 12/29/2020, 
12/30/2020, 12/31/2020
This message may contain confidential and/or privileged information. If you are 
not the addressee or authorized to receive this for the addressee, you must not 
use, copy, disclose, or take any action based on this message or any 
information herein. If you have received this message in error, please advise 
the sender immediately by reply e-mail and delete this message. Thank you for 
your cooperation.

> -Original Message-
> From: Mark Thomas 
> Sent: Wednesday, January 27, 2021 9:09 AM
> To: Tomcat Developers List 
> Subject: [VOTE] Release Apache Tomcat 10.0.1
> 
> The proposed Apache Tomcat 10.0.1 release is now available for voting.
> 
> Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary package
> for all the specification APIs has changed from javax.* to jakarta.* 
> Applications
> that run on Tomcat 9 will not run on Tomcat 10 without changes.
> 
> The notable changes compared to 10.0.1 are:
> 
> - Add support for using Unix domain sockets for NIO when running on
>   Java 16 or later.
> 
> - Add a new StringInterpreter interface that allows applications to
>   provide customised string attribute value to type conversion within
>   JSPs. This allows applications to provide a conversion
>   implementation that is optimised for the application.
> 
> - Add peerAddress to coyote request, which contains the IP address of
>   the direct connection peer. If a reverse proxy sits in front of
>   Tomcat and the protocol used is AJP or HTTP in combination with the
>   RemoteIp(Valve|Filter), the peer address might differ from the
>   remoteAddress. The latter then contains the address of the client in
>   front of the reverse proxy, not the address of the proxy itself.
> 
> Along with lots of other bug fixes and improvements.
> 
> 
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.1/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1292/
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.1
> e4344b6bd67359e1690312674d83710a793f1d5b
> 
> The proposed 10.0.1 release is:
> [ ] Broken - do not release
> [ ] Beta   - go ahead and release as 10.0.1 (beta)
> [ ] Stable - go ahead and release as 10.0.1 (stable)
> 
> -
> 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 8.5.62

[Mark Thomas]

On 27/01/2021 19:25, Mark Thomas wrote:

> The proposed 8.5.62 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.62

Mark

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

[VOTE] Release Apache Tomcat 8.5.62

[Mark Thomas]

The proposed Apache Tomcat 8.5.62 release is now available for voting.

The notable changes compared to the 8.5.61 release are:

- Add a new StringInterpreter interface that allows applications to
  provide customised string attribute value to type conversion within
  JSPs. This allows applications to provide a conversion
  implementation that is optimised for the application.

- Add peerAddress to coyote request, which contains the IP address of
  the direct connection peer. If a reverse proxy sits in front of
  Tomcat and the protocol used is AJP or HTTP in combination with the
  RemoteIp(Valve|Filter), the peer address might differ from the
  remoteAddress. The latter then contains the address of the client in
  front of the reverse proxy, not the address of the proxy itself.

- Escape elements in the access log that need to be escaped for the
  access log to be parsed unambiguously.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.62/

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

The tag is:
https://github.com/apache/tomcat/tree/8.5.62
0c41d44e32bc4479f0de02e6eb29bb703549a05c

The proposed 8.5.62 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.62

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

svn commit: r45612 [2/2] - in /dev/tomcat/tomcat-8/v8.5.62: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Added: dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.zip.asc Wed Jan 27 
19:15:08 2021
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmARumcACgkQEMAcWi9g
+Wedmfw/8DzKZuQn3qqD4jccFubBIOJ8lSV+kcNOQUJiWA9nRqKAApA0njFC9FZQU
+tE/nNFuk1Bm2IRrkTbAhqdAxHEt1c/XXmLxkskm7y1t0c6/5JOLVbRPzAJPEdC+H
+xIQxdE1eW8glT9sXaXVZ13NEgb9m8y/K3u7pM0/jzBTUwlNdkds0zx6qPugAzaen
+ynqanh5Tk5PP/9Z8IQJEHVDZX12cn05qMhEfJ8lg1LWJESK++wj//w1YP6W166+L
+vzt7tFmZYkOlyd5bg60yV12ki1s7MRRRH33wvKmxTJ9SGsmA8b+5CawzJwUimusM
+LY/ZZMCjs6HmGdiz7LCv5TZZkFAlwMX6reDYufMsh4Zgxt6u5+xm+rT2CLK9T96h
+dB4Ku0P5HEUlcAIo6xMM0m/G1KV/DRNdQUMn4ZAHUX29XojS3kHtA00U94EsnuXw
+RJnPT6vHcJKGHj5CJOlEUh+FdIjxtu4ZNdbj9tAOvFCtSsnKmhEm8UptHOp9UMN6
+l0/9TTIcbsOI9LYwFWQFauJofp23T0Im5rev4/MeqmYOmWTmtiYOpz5QFMi436ml
+c3caF2Lp0Jvjh6hHh8LqWuQNImAkZERS30vl+9DMn40BfyeUovhaK/zyOPYbI8tb
+Kei3vKzAM/M48YMH7qwN9BCXjUTQaLOntltADJQJKjHb7msNAmI=
+=Xt1L
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.zip.sha512
==
--- dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.zip.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.zip.sha512 Wed Jan 
27 19:15:08 2021
@@ -0,0 +1 @@
+f3336a6f5daaf36985c76043b3a416bac843599a1c7f307202c040d64262b4f98e11e187277d6ccd9d5f5e7ffb75cc007e7d04c3508ca4569272a5ea0796d64d
 *apache-tomcat-8.5.62-src.zip
\ No newline at end of file



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

svn commit: r45612 [1/2] - in /dev/tomcat/tomcat-8/v8.5.62: ./ bin/ bin/embed/ bin/extras/ src/

[markt]

Author: markt
Date: Wed Jan 27 19:15:08 2021
New Revision: 45612

Log:
Upload Apache Tomcat 8.5.62 for voting

Added:
dev/tomcat/tomcat-8/v8.5.62/
dev/tomcat/tomcat-8/v8.5.62/KEYS
dev/tomcat/tomcat-8/v8.5.62/README.html
dev/tomcat/tomcat-8/v8.5.62/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.62/bin/
dev/tomcat/tomcat-8/v8.5.62/bin/README.html
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62.exe   (with props)
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62.exe.asc
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62.exe.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62.zip   (with props)
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62.zip.asc
dev/tomcat/tomcat-8/v8.5.62/bin/apache-tomcat-8.5.62.zip.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/embed/
dev/tomcat/tomcat-8/v8.5.62/bin/embed/apache-tomcat-8.5.62-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.62/bin/embed/apache-tomcat-8.5.62-embed.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.62/bin/embed/apache-tomcat-8.5.62-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/embed/apache-tomcat-8.5.62-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.62/bin/embed/apache-tomcat-8.5.62-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.62/bin/embed/apache-tomcat-8.5.62-embed.zip.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/extras/
dev/tomcat/tomcat-8/v8.5.62/bin/extras/catalina-jmx-remote.jar   (with 
props)
dev/tomcat/tomcat-8/v8.5.62/bin/extras/catalina-jmx-remote.jar.asc
dev/tomcat/tomcat-8/v8.5.62/bin/extras/catalina-jmx-remote.jar.sha512
dev/tomcat/tomcat-8/v8.5.62/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.62/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.62/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-8/v8.5.62/src/
dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.zip.asc
dev/tomcat/tomcat-8/v8.5.62/src/apache-tomcat-8.5.62-src.zip.sha512

Added: dev/tomcat/tomcat-8/v8.5.62/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.62/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.62/KEYS Wed Jan 27 19:15:08 2021
@@ -0,0 +1,676 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz

Re: [VOTE] Release Apache Tomcat 9.0.42

[Filip Hanik]

[X] Stable - go ahead and release as 9.0.42

On Wed, Jan 27, 2021 at 9:40 AM Mark Thomas  wrote:

> The proposed Apache Tomcat 9.0.42 release is now available for voting.
>
> The notable changes compared to the 9.0.41 release are:
>
> - Add support for using Unix domain sockets for NIO when running on
>   Java 16 or later.
>
> - Add a new StringInterpreter interface that allows applications to
>   provide customised string attribute value to type conversion within
>   JSPs. This allows applications to provide a conversion
>   implementation that is optimised for the application.
>
> - Add peerAddress to coyote request, which contains the IP address of
>   the direct connection peer. If a reverse proxy sits in front of
>   Tomcat and the protocol used is AJP or HTTP in combination with the
>   RemoteIp(Valve|Filter), the peer address might differ from the
>   remoteAddress. The latter then contains the address of the client in
>   front of the reverse proxy, not the address of the proxy itself.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.42/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1293/
> The tag is:
> https://github.com/apache/tomcat/tree/9.0.42
> 868b50e7af1dd6c3489ba0fda86dfc1ff1b8c8cb
>
> The proposed 9.0.42 release is:
> [ ] Broken - do not release
> [ ] Stable - go ahead and release as 9.0.42
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] Release Apache Tomcat 10.0.1

[Filip Hanik]

[X] Stable - go ahead and release as 10.0.1 (stable)

On Wed, Jan 27, 2021 at 8:29 AM Mark Thomas  wrote:

> On 27/01/2021 15:08, Mark Thomas wrote:
>
> > The proposed 10.0.1 release is:
> > [ ] Broken - do not release
> > [ ] Beta   - go ahead and release as 10.0.1 (beta)
> > [X] Stable - go ahead and release as 10.0.1 (stable)
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[tomcat] 01/01: Tag 8.5.62

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 0c41d44e32bc4479f0de02e6eb29bb703549a05c
Author: Mark Thomas 
AuthorDate: Wed Jan 27 18:54:58 2021 +

Tag 8.5.62
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 283d43a..d8ac88d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=8
 version.minor=5
 version.build=62
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=8.5.x
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9be25cb..a444233 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

[tomcat] tag 8.5.62 created (now 0c41d44)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


  at 0c41d44  (commit)
This tag includes the following new commits:

 new 0c41d44  Tag 8.5.62

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

[VOTE] Release Apache Tomcat 9.0.42

[Mark Thomas]

The proposed Apache Tomcat 9.0.42 release is now available for voting.

The notable changes compared to the 9.0.41 release are:

- Add support for using Unix domain sockets for NIO when running on
  Java 16 or later.

- Add a new StringInterpreter interface that allows applications to
  provide customised string attribute value to type conversion within
  JSPs. This allows applications to provide a conversion
  implementation that is optimised for the application.

- Add peerAddress to coyote request, which contains the IP address of
  the direct connection peer. If a reverse proxy sits in front of
  Tomcat and the protocol used is AJP or HTTP in combination with the
  RemoteIp(Valve|Filter), the peer address might differ from the
  remoteAddress. The latter then contains the address of the client in
  front of the reverse proxy, not the address of the proxy itself.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.42/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1293/
The tag is:
https://github.com/apache/tomcat/tree/9.0.42
868b50e7af1dd6c3489ba0fda86dfc1ff1b8c8cb

The proposed 9.0.42 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 9.0.42

-
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: Increment version to 9.0.43 for next development cycle

[markt]

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 4f1dc5a  Increment version to 9.0.43 for next development cycle
4f1dc5a is described below

commit 4f1dc5a61420d00c8ecd0bb1d88cac64c50b4d78
Author: Mark Thomas 
AuthorDate: Wed Jan 27 17:36:29 2021 +

Increment version to 9.0.43 for next development cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index f6aa289..aa5b178 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=42
+version.build=43
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 97b2b7a..1157a85 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=9.0.42
+maven.asf.release.deploy.version=9.0.43
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2a55cd4..80c7d51 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

svn commit: r45608 - in /dev/tomcat/tomcat-9/v9.0.42: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Wed Jan 27 17:35:28 2021
New Revision: 45608

Log:
Upload Apache Tomcat 9.0.42 for voting

Added:
dev/tomcat/tomcat-9/v9.0.42/
dev/tomcat/tomcat-9/v9.0.42/KEYS
dev/tomcat/tomcat-9/v9.0.42/README.html
dev/tomcat/tomcat-9/v9.0.42/RELEASE-NOTES
dev/tomcat/tomcat-9/v9.0.42/bin/
dev/tomcat/tomcat-9/v9.0.42/bin/README.html
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-deployer.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-deployer.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-deployer.zip   (with 
props)
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-deployer.zip.asc
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-deployer.zip.sha512
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-fulldocs.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-windows-x64.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-windows-x64.zip.asc
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-windows-x64.zip.sha512
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-windows-x86.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-windows-x86.zip.asc
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42-windows-x86.zip.sha512
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42.exe   (with props)
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42.exe.asc
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42.exe.sha512
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42.tar.gz   (with props)
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42.zip   (with props)
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42.zip.asc
dev/tomcat/tomcat-9/v9.0.42/bin/apache-tomcat-9.0.42.zip.sha512
dev/tomcat/tomcat-9/v9.0.42/bin/embed/
dev/tomcat/tomcat-9/v9.0.42/bin/embed/apache-tomcat-9.0.42-embed.tar.gz   
(with props)
dev/tomcat/tomcat-9/v9.0.42/bin/embed/apache-tomcat-9.0.42-embed.tar.gz.asc

dev/tomcat/tomcat-9/v9.0.42/bin/embed/apache-tomcat-9.0.42-embed.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.42/bin/embed/apache-tomcat-9.0.42-embed.zip   
(with props)
dev/tomcat/tomcat-9/v9.0.42/bin/embed/apache-tomcat-9.0.42-embed.zip.asc
dev/tomcat/tomcat-9/v9.0.42/bin/embed/apache-tomcat-9.0.42-embed.zip.sha512
dev/tomcat/tomcat-9/v9.0.42/src/
dev/tomcat/tomcat-9/v9.0.42/src/apache-tomcat-9.0.42-src.tar.gz   (with 
props)
dev/tomcat/tomcat-9/v9.0.42/src/apache-tomcat-9.0.42-src.tar.gz.asc
dev/tomcat/tomcat-9/v9.0.42/src/apache-tomcat-9.0.42-src.tar.gz.sha512
dev/tomcat/tomcat-9/v9.0.42/src/apache-tomcat-9.0.42-src.zip   (with props)
dev/tomcat/tomcat-9/v9.0.42/src/apache-tomcat-9.0.42-src.zip.asc
dev/tomcat/tomcat-9/v9.0.42/src/apache-tomcat-9.0.42-src.zip.sha512

Added: dev/tomcat/tomcat-9/v9.0.42/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.42/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.42/KEYS Wed Jan 27 17:35:28 2021
@@ -0,0 +1,676 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz
+x+r2ANe8/0e+u5ZcYtSaSry+uQINBDtAWuUQCAD2Qle3CH8IF3KiutapQvMF6PlT

[tomcat] 01/01: Tag 9.0.42

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit 868b50e7af1dd6c3489ba0fda86dfc1ff1b8c8cb
Author: Mark Thomas 
AuthorDate: Wed Jan 27 17:14:56 2021 +

Tag 9.0.42
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index f6aa289..b572ad3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=9
 version.minor=0
 version.build=42
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2a55cd4..349c9f2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

[tomcat] tag 9.0.42 created (now 868b50e)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


  at 868b50e  (commit)
This tag includes the following new commits:

 new 868b50e  Tag 9.0.42

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

Re: [VOTE] Release Apache Tomcat 10.0.1

[Mark Thomas]

On 27/01/2021 15:08, Mark Thomas wrote:


The proposed 10.0.1 release is:
[ ] Broken - do not release
[ ] Beta   - go ahead and release as 10.0.1 (beta)
[X] Stable - go ahead and release as 10.0.1 (stable)


Mark

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

Tag Tomcat 7

[Violeta Georgieva]

Hi,

Tomorrow morning (CET) I'm going to prepare Tomcat 7 for a release/vote.
Please reply here if you need more time for additional fixes.

Thanks,
Violeta

Re: [VOTE] Release Apache Tomcat 10.0.1

[Rémy Maucherat]

On Wed, Jan 27, 2021 at 4:08 PM Mark Thomas  wrote:

> The proposed Apache Tomcat 10.0.1 release is now available for
> voting.
>
> Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
> package for all the specification APIs has changed from javax.* to
> jakarta.*
> Applications that run on Tomcat 9 will not run on Tomcat 10 without
> changes.
>
> The notable changes compared to 10.0.1 are:
>
> - Add support for using Unix domain sockets for NIO when running on
>   Java 16 or later.
>
> - Add a new StringInterpreter interface that allows applications to
>   provide customised string attribute value to type conversion within
>   JSPs. This allows applications to provide a conversion
>   implementation that is optimised for the application.
>
> - Add peerAddress to coyote request, which contains the IP address of
>   the direct connection peer. If a reverse proxy sits in front of
>   Tomcat and the protocol used is AJP or HTTP in combination with the
>   RemoteIp(Valve|Filter), the peer address might differ from the
>   remoteAddress. The latter then contains the address of the client in
>   front of the reverse proxy, not the address of the proxy itself.
>
> Along with lots of other bug fixes and improvements.
>
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.1/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1292/
> The tag is:
> https://github.com/apache/tomcat/tree/10.0.1
> e4344b6bd67359e1690312674d83710a793f1d5b
>
> The proposed 10.0.1 release is:
> [ ] Broken - do not release
> [ ] Beta   - go ahead and release as 10.0.1 (beta)
> [X] Stable - go ahead and release as 10.0.1 (stable)
>
> No reason to not upgrade it to stable since it's looking good.

I am personally interested to know if users would be interested in an
integrated additional deployment step for legacy webapps using the
migration tool. The benefit is intuitive but this could be a great bad
idea: problems can occur, and it is often best to do this offline with a
simple tool instead of on a real server.

Rémy

[tomcat] branch master updated: Increment version to 10.0.2 for next development cycle

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


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

commit 6a5bce065ca9606c75533c29cbccf2762a27b338
Author: Mark Thomas 
AuthorDate: Wed Jan 27 15:11:11 2021 +

Increment version to 10.0.2 for next development cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index ccdfc01..871698c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=0
-version.build=1
+version.build=2
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index e921722..650fcc9 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.0.1
+maven.asf.release.deploy.version=10.0.2
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2153166..26850c2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


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

[VOTE] Release Apache Tomcat 10.0.1

[Mark Thomas]

The proposed Apache Tomcat 10.0.1 release is now available for
voting.

Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
package for all the specification APIs has changed from javax.* to jakarta.*
Applications that run on Tomcat 9 will not run on Tomcat 10 without changes.

The notable changes compared to 10.0.1 are:

- Add support for using Unix domain sockets for NIO when running on
  Java 16 or later.

- Add a new StringInterpreter interface that allows applications to
  provide customised string attribute value to type conversion within
  JSPs. This allows applications to provide a conversion
  implementation that is optimised for the application.

- Add peerAddress to coyote request, which contains the IP address of
  the direct connection peer. If a reverse proxy sits in front of
  Tomcat and the protocol used is AJP or HTTP in combination with the
  RemoteIp(Valve|Filter), the peer address might differ from the
  remoteAddress. The latter then contains the address of the client in
  front of the reverse proxy, not the address of the proxy itself.

Along with lots of other bug fixes and improvements.


For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat10/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.1/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1292/
The tag is:
https://github.com/apache/tomcat/tree/10.0.1
e4344b6bd67359e1690312674d83710a793f1d5b

The proposed 10.0.1 release is:
[ ] Broken - do not release
[ ] Beta   - go ahead and release as 10.0.1 (beta)
[ ] Stable - go ahead and release as 10.0.1 (stable)

-
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: Fix typo

[markt]

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 8ae8626  Fix typo
8ae8626 is described below

commit 8ae8626a77cc756ef421678f483c4a2cc7accbbc
Author: Mark Thomas 
AuthorDate: Wed Jan 27 14:59:42 2021 +

Fix typo
---
 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 0b560dc..9be25cb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,7 +172,7 @@
 some requests could get dropped. (markt)
   
   
-65001: Fix error handling for exceptions throw from calls
+65001: Fix error handling for exceptions thrown from calls
 to ReadListener and WriteListener. (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: Fix typo

[markt]

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 3e28d99  Fix typo
3e28d99 is described below

commit 3e28d99f96bc38fe7dbdef636f2f1c5751850b5d
Author: Mark Thomas 
AuthorDate: Wed Jan 27 14:59:42 2021 +

Fix typo
---
 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 00349f6..2a55cd4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,7 +172,7 @@
 Based on a PR submitted by Graham Leggett. (remm)
   
   
-65001: Fix error handling for exceptions throw from calls
+65001: Fix error handling for exceptions thrown from calls
 to ReadListener and WriteListener. (markt)
   
   


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

[tomcat] branch master updated: Fix typo

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new efb0c9b  Fix typo
efb0c9b is described below

commit efb0c9b665eb67a0c61a24cd619824e687bc1128
Author: Mark Thomas 
AuthorDate: Wed Jan 27 14:59:42 2021 +

Fix typo
---
 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 e4f6181..2153166 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,7 +172,7 @@
 Based on a PR submitted by Graham Leggett. (remm)
   
   
-65001: Fix error handling for exceptions throw from calls
+65001: Fix error handling for exceptions thrown from calls
 to ReadListener and WriteListener. (markt)
   
   


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

svn commit: r1885944 - in /tomcat/site/trunk: docs/ci.html docs/source.html xdocs/ci.xml xdocs/source.xml

[markt]

Author: markt
Date: Wed Jan 27 14:47:20 2021
New Revision: 1885944

URL: http://svn.apache.org/viewvc?rev=1885944=rev
Log:
Update CI info. travis-ci.org -> .com and add migraiton tool for Jakarta EE

Modified:
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/source.html
tomcat/site/trunk/xdocs/ci.xml
tomcat/site/trunk/xdocs/source.xml

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1885944=1885943=1885944=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Wed Jan 27 14:47:20 2021
@@ -285,10 +285,11 @@ prepared and published by ASF Buildbot,
 
 
 TravisCI
-https://travis-ci.org/;>Travis CI is being used to test Tomcat 
builds on ARM64 architecture
+https://travis-ci.com/;>Travis CI is being used to test Tomcat 
builds on ARM64 architecture
 
-  https://travis-ci.org/apache/tomcat;>Tomcat server  
native
-  https://travis-ci.org/apache/tomcat-connectors;>Tomcat 
Connectors (mod_jk)
+  https://travis-ci.com/github/apache/tomcat;>Tomcat server  
native
+  https://travis-ci.com/github/apache/tomcat-connectors;>Tomcat 
Connectors (mod_jk)
+  https://travis-ci.com/github/apache/tomcat-jakrtaee-migration;>Tomcat 
migration tool for Jakarta EE
 
 
 

Modified: tomcat/site/trunk/docs/source.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1885944=1885943=1885944=diff
==
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Wed Jan 27 14:47:20 2021
@@ -16,6 +16,7 @@ Git for version control. The following c
 Apache Tomcat Connectors
 Apache Tomcat Native
 Apache Tomcat Training
+Apache Tomcat migration tool for Jakarta EE
 Taglibs
 
 The following components currently use Subversion as the primary version

Modified: tomcat/site/trunk/xdocs/ci.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1885944=1885943=1885944=diff
==
--- tomcat/site/trunk/xdocs/ci.xml (original)
+++ tomcat/site/trunk/xdocs/ci.xml Wed Jan 27 14:47:20 2021
@@ -297,10 +297,11 @@ prepared and published by ASF Buildbot,
 
 
 
-https://travis-ci.org/;>Travis CI is being used to test Tomcat 
builds on ARM64 architecture
+https://travis-ci.com/;>Travis CI is being used to test Tomcat 
builds on ARM64 architecture
 
-  https://travis-ci.org/apache/tomcat;>Tomcat server  
native
-  https://travis-ci.org/apache/tomcat-connectors;>Tomcat 
Connectors (mod_jk)
+  https://travis-ci.com/github/apache/tomcat;>Tomcat server  
native
+  https://travis-ci.com/github/apache/tomcat-connectors;>Tomcat 
Connectors (mod_jk)
+  https://travis-ci.com/github/apache/tomcat-jakrtaee-migration;>Tomcat 
migration tool for Jakarta EE
 
 
 

Modified: tomcat/site/trunk/xdocs/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/source.xml?rev=1885944=1885943=1885944=diff
==
--- tomcat/site/trunk/xdocs/source.xml (original)
+++ tomcat/site/trunk/xdocs/source.xml Wed Jan 27 14:47:20 2021
@@ -24,6 +24,7 @@ Git for version control. The following c
 Apache Tomcat Connectors
 Apache Tomcat Native
 Apache Tomcat Training
+Apache Tomcat migration tool for Jakarta EE
 Taglibs
 
 The following components currently use Subversion as the primary version



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

svn commit: r45606 - in /dev/tomcat/tomcat-10/v10.0.1: ./ bin/ bin/embed/ src/

[markt]

Author: markt
Date: Wed Jan 27 14:44:46 2021
New Revision: 45606

Log:
Upload Apache Tomcat 10.0.1 for voting

Added:
dev/tomcat/tomcat-10/v10.0.1/
dev/tomcat/tomcat-10/v10.0.1/KEYS
dev/tomcat/tomcat-10/v10.0.1/README.html
dev/tomcat/tomcat-10/v10.0.1/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.1/bin/
dev/tomcat/tomcat-10/v10.0.1/bin/README.html
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-deployer.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-deployer.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-deployer.zip.asc
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-fulldocs.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-windows-x64.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-windows-x64.zip.asc
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-windows-x86.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-windows-x86.zip.asc
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1.exe   (with props)
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1.exe.asc
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1.exe.sha512
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1.tar.gz   (with props)
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1.zip   (with props)
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1.zip.asc
dev/tomcat/tomcat-10/v10.0.1/bin/apache-tomcat-10.0.1.zip.sha512
dev/tomcat/tomcat-10/v10.0.1/bin/embed/
dev/tomcat/tomcat-10/v10.0.1/bin/embed/apache-tomcat-10.0.1-embed.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.1/bin/embed/apache-tomcat-10.0.1-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.1/bin/embed/apache-tomcat-10.0.1-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.1/bin/embed/apache-tomcat-10.0.1-embed.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.1/bin/embed/apache-tomcat-10.0.1-embed.zip.asc
dev/tomcat/tomcat-10/v10.0.1/bin/embed/apache-tomcat-10.0.1-embed.zip.sha512
dev/tomcat/tomcat-10/v10.0.1/src/
dev/tomcat/tomcat-10/v10.0.1/src/apache-tomcat-10.0.1-src.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.0.1/src/apache-tomcat-10.0.1-src.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.1/src/apache-tomcat-10.0.1-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.1/src/apache-tomcat-10.0.1-src.zip   (with props)
dev/tomcat/tomcat-10/v10.0.1/src/apache-tomcat-10.0.1-src.zip.asc
dev/tomcat/tomcat-10/v10.0.1/src/apache-tomcat-10.0.1-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.0.1/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.1/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.1/KEYS Wed Jan 27 14:44:46 2021
@@ -0,0 +1,676 @@
+This file contains the PGP keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz

Migrating from travis-ci.org to travis-ci.com

[Mark Thomas]

Hi all,

This is a required migration [1]. Looks like the Tomcat projects didn't
migrate automatically. I'm manually triggering the migration now.

Mark


[1]
https://lists.apache.org/thread.html/reebf0edb6d9fc618fec3eb64ecae0a883582ef7258794c352d8203b0%40%3Cbuilds.apache.org%3E

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

[tomcat] 01/01: Tag 10.0.1

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit e4344b6bd67359e1690312674d83710a793f1d5b
Author: Mark Thomas 
AuthorDate: Wed Jan 27 14:06:19 2021 +

Tag 10.0.1
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index ccdfc01..74e4702 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=1
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Source control flags -
 git.branch=master
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e4f6181..cd439bc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,7 +103,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   


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

[tomcat] tag 10.0.1 created (now e4344b6)

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


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

 new e4344b6  Tag 10.0.1

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

buildbot success in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1846

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] 3b4bdf8f9a9353044e1b9f6919527d627d9a5255
Blamelist: Konstantin Kolinko ,Mark Thomas 


Build succeeded!

Sincerely,
 -The Buildbot




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

buildbot success in on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/5654

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] fe90fba5a6f09ba2730682294de398eec3662291
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: [tomcat] branch master updated: Move storage location for generated reflectionless code

[Mark Thomas]

On 27/01/2021 11:28, Konstantin Kolinko wrote:
> I see that java.io.tmpdir is also used here: (line 1700)
> 
> 
>  destDir="${java.io.tmpdir}" prefix="apache-tomcat-xreflect-"/>
> 
> Though this use should not cause a conflict on CI, but it is odd to
> write files somewhere outside of ${tomcat.output}.

I saw that and thought about changing it but since that location is used
and then deleted and, as you say, should not cause a conflict on CI I
decided not to address it in that commit.

I have a slight preference to move it under ${tomcat.output} as you
suggest but it hasn't quite got to the point where it is bothering me
enough for me to want to do something about it.

Mark


> 
> Best regards,
> Konstantin Kolinko
> 
> ср, 27 янв. 2021 г. в 12:41, :
>>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to branch master
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>>
>> The following commit(s) were added to refs/heads/master by this push:
>>  new c475441  Move storage location for generated reflectionless code
>> c475441 is described below
>>
>> commit c4754410f2cf0904940568fb33d4e7c2f87eac61
>> Author: Mark Thomas 
>> AuthorDate: Wed Jan 27 09:41:10 2021 +
>>
>> Move storage location for generated reflectionless code
>>
>> Using java.io.tmpdir was causing conflicts on CI systems when different
>> users run the build as the file could no be over-written
>> ---
>>  build.xml | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/build.xml b/build.xml
>> index 6c9bc10..455edf9 100644
>> --- a/build.xml
>> +++ b/build.xml
>> @@ -94,6 +94,8 @@
>>> value="${basedir}/modules/jdbc-pool"/>
>>
>>> value="${tomcat.output}/jdbc-pool"/>
>> +  
>> +  
>>
>>
>>
>> @@ -1746,7 +1748,7 @@
>> license="${tomcat.manifests}/servlet-api.jar.license"/>
>>
>>  
>> -> +>
>> file="${xreflect.directory}/sources/org/apache/tomcat/util/XReflectionIntrospectionUtils.java"
>>overwrite="true"/>
>>  
>>
>>
>> -
>> 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

Re: [tomcat] branch master updated: Move storage location for generated reflectionless code

[Konstantin Kolinko]

I see that java.io.tmpdir is also used here: (line 1700)




Though this use should not cause a conflict on CI, but it is odd to
write files somewhere outside of ${tomcat.output}.

Best regards,
Konstantin Kolinko

ср, 27 янв. 2021 г. в 12:41, :
>
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
>  new c475441  Move storage location for generated reflectionless code
> c475441 is described below
>
> commit c4754410f2cf0904940568fb33d4e7c2f87eac61
> Author: Mark Thomas 
> AuthorDate: Wed Jan 27 09:41:10 2021 +
>
> Move storage location for generated reflectionless code
>
> Using java.io.tmpdir was causing conflicts on CI systems when different
> users run the build as the file could no be over-written
> ---
>  build.xml | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/build.xml b/build.xml
> index 6c9bc10..455edf9 100644
> --- a/build.xml
> +++ b/build.xml
> @@ -94,6 +94,8 @@
> value="${basedir}/modules/jdbc-pool"/>
>
>
> +  
> +  
>
>
>
> @@ -1746,7 +1748,7 @@
> license="${tomcat.manifests}/servlet-api.jar.license"/>
>
>  
> - +
> file="${xreflect.directory}/sources/org/apache/tomcat/util/XReflectionIntrospectionUtils.java"
>overwrite="true"/>
>  
>
>
> -
> 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] branch 7.0.x updated: Code formatting clean-up - primarily to trigger a CI build

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 3b4bdf8  Code formatting clean-up - primarily to trigger a CI build
3b4bdf8 is described below

commit 3b4bdf8f9a9353044e1b9f6919527d627d9a5255
Author: Mark Thomas 
AuthorDate: Wed Jan 27 11:20:21 2021 +

Code formatting clean-up - primarily to trigger a CI build
---
 .../apache/catalina/ant/jmx/JMXAccessorCreateTask.java   | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
index f2da8b9..85ca32c 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -176,23 +176,23 @@ public class JMXAccessorCreateTask extends 
JMXAccessorTask {
 }
 if (classLoader != null && !"".equals(classLoader)) {
 if (isEcho()) {
-handleOutput("create MBean " + name + " from class "
-+ className + " with classLoader " + classLoader);
+handleOutput("create MBean " + name + " from class " + 
className + " with classLoader " + classLoader);
 }
-if(args == null)
+if(args == null) {
 jmxServerConnection.createMBean(className, new 
ObjectName(name), new ObjectName(classLoader));
-else
+} else {
 jmxServerConnection.createMBean(className, new 
ObjectName(name), new ObjectName(classLoader),argsA,sigA);
+}
 
 } else {
 if (isEcho()) {
-handleOutput("create MBean " + name + " from class "
-+ className);
+handleOutput("create MBean " + name + " from class " + 
className);
 }
-if(args == null)
+if(args == null) {
 jmxServerConnection.createMBean(className, new 
ObjectName(name));
-else
+} else {
 jmxServerConnection.createMBean(className, new 
ObjectName(name),argsA,sigA);
+}
 }
 return error;
 }


-
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: Code formatting clean-up - primarily to trigger a CI build

[markt]

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 e610066b Code formatting clean-up - primarily to trigger a CI build
e610066b is described below

commit e610066bebf96f6738a84caaeeb7f77fcde86d4f
Author: Mark Thomas 
AuthorDate: Wed Jan 27 11:20:21 2021 +

Code formatting clean-up - primarily to trigger a CI build
---
 .../apache/catalina/ant/jmx/JMXAccessorCreateTask.java   | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
index 558a258..bff4b42 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -156,23 +156,23 @@ public class JMXAccessorCreateTask extends 
JMXAccessorTask {
 }
 if (classLoader != null && !classLoader.isEmpty()) {
 if (isEcho()) {
-handleOutput("create MBean " + name + " from class "
-+ className + " with classLoader " + classLoader);
+handleOutput("create MBean " + name + " from class " + 
className + " with classLoader " + classLoader);
 }
-if(args == null)
+if(args == null) {
 jmxServerConnection.createMBean(className, new 
ObjectName(name), new ObjectName(classLoader));
-else
+} else {
 jmxServerConnection.createMBean(className, new 
ObjectName(name), new ObjectName(classLoader),argsA,sigA);
+}
 
 } else {
 if (isEcho()) {
-handleOutput("create MBean " + name + " from class "
-+ className);
+handleOutput("create MBean " + name + " from class " + 
className);
 }
-if(args == null)
+if(args == null) {
 jmxServerConnection.createMBean(className, new 
ObjectName(name));
-else
+} else {
 jmxServerConnection.createMBean(className, new 
ObjectName(name),argsA,sigA);
+}
 }
 }
 


-
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: Code formatting clean-up - primarily to trigger a CI build

[markt]

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 39e2a25  Code formatting clean-up - primarily to trigger a CI build
39e2a25 is described below

commit 39e2a25faa9274aeb3acdf387a2724d2a409e459
Author: Mark Thomas 
AuthorDate: Wed Jan 27 11:20:21 2021 +

Code formatting clean-up - primarily to trigger a CI build
---
 .../apache/catalina/ant/jmx/JMXAccessorCreateTask.java   | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
index 558a258..bff4b42 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -156,23 +156,23 @@ public class JMXAccessorCreateTask extends 
JMXAccessorTask {
 }
 if (classLoader != null && !classLoader.isEmpty()) {
 if (isEcho()) {
-handleOutput("create MBean " + name + " from class "
-+ className + " with classLoader " + classLoader);
+handleOutput("create MBean " + name + " from class " + 
className + " with classLoader " + classLoader);
 }
-if(args == null)
+if(args == null) {
 jmxServerConnection.createMBean(className, new 
ObjectName(name), new ObjectName(classLoader));
-else
+} else {
 jmxServerConnection.createMBean(className, new 
ObjectName(name), new ObjectName(classLoader),argsA,sigA);
+}
 
 } else {
 if (isEcho()) {
-handleOutput("create MBean " + name + " from class "
-+ className);
+handleOutput("create MBean " + name + " from class " + 
className);
 }
-if(args == null)
+if(args == null) {
 jmxServerConnection.createMBean(className, new 
ObjectName(name));
-else
+} else {
 jmxServerConnection.createMBean(className, new 
ObjectName(name),argsA,sigA);
+}
 }
 }
 


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

[tomcat] branch master updated: Code formatting clean-up - primarily to trigger a CI build

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new fe90fba  Code formatting clean-up - primarily to trigger a CI build
fe90fba is described below

commit fe90fba5a6f09ba2730682294de398eec3662291
Author: Mark Thomas 
AuthorDate: Wed Jan 27 11:20:21 2021 +

Code formatting clean-up - primarily to trigger a CI build
---
 .../apache/catalina/ant/jmx/JMXAccessorCreateTask.java   | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
index 558a258..bff4b42 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
@@ -156,23 +156,23 @@ public class JMXAccessorCreateTask extends 
JMXAccessorTask {
 }
 if (classLoader != null && !classLoader.isEmpty()) {
 if (isEcho()) {
-handleOutput("create MBean " + name + " from class "
-+ className + " with classLoader " + classLoader);
+handleOutput("create MBean " + name + " from class " + 
className + " with classLoader " + classLoader);
 }
-if(args == null)
+if(args == null) {
 jmxServerConnection.createMBean(className, new 
ObjectName(name), new ObjectName(classLoader));
-else
+} else {
 jmxServerConnection.createMBean(className, new 
ObjectName(name), new ObjectName(classLoader),argsA,sigA);
+}
 
 } else {
 if (isEcho()) {
-handleOutput("create MBean " + name + " from class "
-+ className);
+handleOutput("create MBean " + name + " from class " + 
className);
 }
-if(args == null)
+if(args == null) {
 jmxServerConnection.createMBean(className, new 
ObjectName(name));
-else
+} else {
 jmxServerConnection.createMBean(className, new 
ObjectName(name),argsA,sigA);
+}
 }
 }
 


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

[tomcat] branch 7.0.x updated: Update NSIS to version 3.06.1.

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 63d28b6  Update NSIS to version 3.06.1.
63d28b6 is described below

commit 63d28b6d41a972026c7dac9cfd4fc470df9f6cbc
Author: Konstantin Kolinko 
AuthorDate: Wed Jan 27 07:09:23 2021 +0300

Update NSIS to version 3.06.1.

Update build script to create an Unicode installer.
See https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
---
 build.properties.default   | 4 ++--
 res/tomcat.nsi | 2 ++
 webapps/docs/changelog.xml | 4 
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 8656694..d86148a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -201,10 +201,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.1i-win32-bin.zip
 
 # - NSIS, version 3.0 or later -
-nsis.version=3.04
+nsis.version=3.06.1
 nsis.checksum.enabled=true
 nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=434e89380742d415ca9b91676cb92540|ed241f7384f4e59d84b9a62c71d1f6955b6a719a
+nsis.checksum.value=15a0bb6e74be90ef4f11fa7befd0399a|f188416fe435cad991adbdc2e3eedc482a68fa75
 nsis.home=${base.path}/nsis-${nsis.version}
 nsis.exe=${nsis.home}/makensis.exe
 nsis.arch.dir=x86-unicode/
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index ab39f19..ac5ea59 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -15,6 +15,8 @@
 
 ; Tomcat script for Nullsoft Installer
 
+Unicode true
+
 !ifdef UNINSTALLONLY
   OutFile "tempinstaller.exe"
 !else
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9ba877b..3fbdb74 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -216,6 +216,10 @@
 Improvements to Russian translations. Provided by Polina and Azat.
 (markt)
   
+  
+Update the NSIS Installer used to build the Windows installer to 
version
+3.06.1. (kkolinko)
+  
 
   
 


-
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 to version 3.06.1. Update build script to create an Unicode installer. See https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode

[markt]

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 06e294b  Update NSIS to version 3.06.1. Update build script to create 
an Unicode installer. See 
https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
06e294b is described below

commit 06e294ba0577fc7e800fd6bd9f98ae48c6cdce29
Author: Konstantin Kolinko 
AuthorDate: Wed Jan 27 07:09:23 2021 +0300

Update NSIS to version 3.06.1.
Update build script to create an Unicode installer.
See https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
---
 build.properties.default   | 4 ++--
 res/tomcat.nsi | 2 ++
 webapps/docs/changelog.xml | 4 
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 23c9de4..283d43a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -160,10 +160,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.1i-win32-bin.zip
 
 # - NSIS, version 3.0 or later -
-nsis.version=3.04
+nsis.version=3.06.1
 nsis.checksum.enabled=true
 nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=434e89380742d415ca9b91676cb92540|ed241f7384f4e59d84b9a62c71d1f6955b6a719a
+nsis.checksum.value=15a0bb6e74be90ef4f11fa7befd0399a|f188416fe435cad991adbdc2e3eedc482a68fa75
 nsis.home=${base.path}/nsis-${nsis.version}
 nsis.exe=${nsis.home}/makensis.exe
 nsis.arch.dir=x86-unicode/
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 0bdeec2..3f92c83 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -15,6 +15,8 @@
 
 ; Tomcat script for Nullsoft Installer
 
+Unicode true
+
 !ifdef UNINSTALLONLY
   OutFile "tempinstaller.exe"
 !else
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f2734d..0b560dc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -244,6 +244,10 @@
 Improvements to Russian translations. Provided by Polina and Azat.
 (markt)
   
+  
+Update the NSIS Installer used to build the Windows installer to 
version
+3.06.1. (kkolinko)
+  
 
   
 


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

[tomcat] branch 9.0.x updated: Update NSIS to version 3.06.1. Update build script to create an Unicode installer. See https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode

[markt]

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 7f97ab6  Update NSIS to version 3.06.1. Update build script to create 
an Unicode installer. See 
https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
7f97ab6 is described below

commit 7f97ab6d6bf110c87231cc0f67ef758c57cdcdd5
Author: Konstantin Kolinko 
AuthorDate: Wed Jan 27 07:09:23 2021 +0300

Update NSIS to version 3.06.1.
Update build script to create an Unicode installer.
See https://nsis.sourceforge.io/Docs/Chapter1.html#intro-unicode
---
 build.properties.default   | 4 ++--
 res/tomcat.nsi | 2 ++
 webapps/docs/changelog.xml | 4 
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 96c46bd..f6aa289 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -156,10 +156,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.1i-win32-bin.zip
 
 # - NSIS, version 3.0 or later -
-nsis.version=3.04
+nsis.version=3.06.1
 nsis.checksum.enabled=true
 nsis.checksum.algorithm=MD5|SHA-1
-nsis.checksum.value=434e89380742d415ca9b91676cb92540|ed241f7384f4e59d84b9a62c71d1f6955b6a719a
+nsis.checksum.value=15a0bb6e74be90ef4f11fa7befd0399a|f188416fe435cad991adbdc2e3eedc482a68fa75
 nsis.home=${base.path}/nsis-${nsis.version}
 nsis.exe=${nsis.home}/makensis.exe
 nsis.arch.dir=x86-unicode/
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 0bdeec2..3f92c83 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -15,6 +15,8 @@
 
 ; Tomcat script for Nullsoft Installer
 
+Unicode true
+
 !ifdef UNINSTALLONLY
   OutFile "tempinstaller.exe"
 !else
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8b13143..00349f6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -259,6 +259,10 @@
 Improvements to Russian translations. Provided by Polina and Azat.
 (markt)
   
+  
+Update the NSIS Installer used to build the Windows installer to 
version
+3.06.1. (kkolinko)
+  
 
   
 


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

buildbot exception in on tomcat-7-trunk

[buildbot]

The Buildbot has detected a build exception on builder tomcat-7-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-7-trunk/builds/1845

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch 7.0.x] 4b080641507f76a4cd2dacf9a7877166365a516e
Blamelist: Mark Thomas 

BUILD FAILED: exception compile upload_2

Sincerely,
 -The Buildbot




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

[tomcat] branch 7.0.x updated: Update checkstyle DTDs

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 4b08064  Update checkstyle DTDs
4b08064 is described below

commit 4b080641507f76a4cd2dacf9a7877166365a516e
Author: Mark Thomas 
AuthorDate: Wed Jan 27 10:27:44 2021 +

Update checkstyle DTDs
---
 res/checkstyle/checkstyle.xml   | 4 ++--
 res/checkstyle/javax-checkstyle.xml | 4 ++--
 res/checkstyle/javax-import-control.xml | 4 ++--
 res/checkstyle/org-checkstyle.xml   | 4 ++--
 res/checkstyle/org-import-control.xml   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 77276d6..9989ffb 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+"https://checkstyle.org/dtds/configuration_1_3.dtd;>
 
   
   
diff --git a/res/checkstyle/javax-checkstyle.xml 
b/res/checkstyle/javax-checkstyle.xml
index 08501f9..41ec132 100644
--- a/res/checkstyle/javax-checkstyle.xml
+++ b/res/checkstyle/javax-checkstyle.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+"https://checkstyle.org/dtds/configuration_1_3.dtd;>
 
   
   
diff --git a/res/checkstyle/javax-import-control.xml 
b/res/checkstyle/javax-import-control.xml
index 2e7201d..7baca13 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/import_control_1_1.dtd;>
+"-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+"https://checkstyle.org/dtds/import_control_1_4.dtd;>
 
 
   
diff --git a/res/checkstyle/org-checkstyle.xml 
b/res/checkstyle/org-checkstyle.xml
index cd31f0a..39b6fa4 100644
--- a/res/checkstyle/org-checkstyle.xml
+++ b/res/checkstyle/org-checkstyle.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+"https://checkstyle.org/dtds/configuration_1_3.dtd;>
 
   
   
diff --git a/res/checkstyle/org-import-control.xml 
b/res/checkstyle/org-import-control.xml
index 3db9639..8cd206c 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/import_control_1_1.dtd;>
+"-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+"https://checkstyle.org/dtds/import_control_1_4.dtd;>
 
 
   

[tomcat] branch 8.5.x updated: Update checkstyle DTDs

[markt]

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 b9f6504  Update checkstyle DTDs
b9f6504 is described below

commit b9f650451ce58dff1d4fdd6ae9bb39d389113c3b
Author: Mark Thomas 
AuthorDate: Wed Jan 27 10:27:44 2021 +

Update checkstyle DTDs
---
 res/checkstyle/checkstyle.xml   | 4 ++--
 res/checkstyle/javax-checkstyle.xml | 4 ++--
 res/checkstyle/javax-import-control.xml | 4 ++--
 res/checkstyle/org-checkstyle.xml   | 4 ++--
 res/checkstyle/org-import-control.xml   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 2eb1670..5963da9 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+"https://checkstyle.org/dtds/configuration_1_3.dtd;>
 
   
   
diff --git a/res/checkstyle/javax-checkstyle.xml 
b/res/checkstyle/javax-checkstyle.xml
index bb7568c..3eb5045 100644
--- a/res/checkstyle/javax-checkstyle.xml
+++ b/res/checkstyle/javax-checkstyle.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+"https://checkstyle.org/dtds/configuration_1_3.dtd;>
 
   
   
diff --git a/res/checkstyle/javax-import-control.xml 
b/res/checkstyle/javax-import-control.xml
index 252cd96..5a374bb 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/import_control_1_1.dtd;>
+"-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+"https://checkstyle.org/dtds/import_control_1_4.dtd;>
 
 
   
diff --git a/res/checkstyle/org-checkstyle.xml 
b/res/checkstyle/org-checkstyle.xml
index 641673b..a4f8ae0 100644
--- a/res/checkstyle/org-checkstyle.xml
+++ b/res/checkstyle/org-checkstyle.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+"https://checkstyle.org/dtds/configuration_1_3.dtd;>
 
   
   
diff --git a/res/checkstyle/org-import-control.xml 
b/res/checkstyle/org-import-control.xml
index 8723aec..9b4b6d0 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/import_control_1_1.dtd;>
+"-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+"https://checkstyle.org/dtds/import_control_1_4.dtd;>
 
 
   

[tomcat] branch 9.0.x updated: Update checkstyle DTDs

[markt]

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 579bcc9  Update checkstyle DTDs
579bcc9 is described below

commit 579bcc9098e702951b02ceb62e89c3e8ddf3f80b
Author: Mark Thomas 
AuthorDate: Wed Jan 27 10:27:44 2021 +

Update checkstyle DTDs
---
 res/checkstyle/checkstyle.xml   | 4 ++--
 res/checkstyle/javax-checkstyle.xml | 4 ++--
 res/checkstyle/javax-import-control.xml | 4 ++--
 res/checkstyle/org-checkstyle.xml   | 4 ++--
 res/checkstyle/org-import-control.xml   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 9417272..33822d1 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+"https://checkstyle.org/dtds/configuration_1_3.dtd;>
 
   
   
diff --git a/res/checkstyle/javax-checkstyle.xml 
b/res/checkstyle/javax-checkstyle.xml
index bb7568c..3eb5045 100644
--- a/res/checkstyle/javax-checkstyle.xml
+++ b/res/checkstyle/javax-checkstyle.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+"https://checkstyle.org/dtds/configuration_1_3.dtd;>
 
   
   
diff --git a/res/checkstyle/javax-import-control.xml 
b/res/checkstyle/javax-import-control.xml
index 3ce4303..1286699 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/import_control_1_1.dtd;>
+"-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+"https://checkstyle.org/dtds/import_control_1_4.dtd;>
 
 
   
diff --git a/res/checkstyle/org-checkstyle.xml 
b/res/checkstyle/org-checkstyle.xml
index 641673b..a4f8ae0 100644
--- a/res/checkstyle/org-checkstyle.xml
+++ b/res/checkstyle/org-checkstyle.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/configuration_1_2.dtd;>
+"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+"https://checkstyle.org/dtds/configuration_1_3.dtd;>
 
   
   
diff --git a/res/checkstyle/org-import-control.xml 
b/res/checkstyle/org-import-control.xml
index 8938188..1ab2d12 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 http://www.puppycrawl.com/dtds/import_control_1_1.dtd;>
+"-//Checkstyle//DTD ImportControl Configuration 1.4//EN"
+"https://checkstyle.org/dtds/import_control_1_4.dtd;>
 
 
   

[tomcat] branch master updated (f47b9f4 -> b8a7ab7)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from f47b9f4  Code reformatting / clean-up primarily to trigger CI build
 add b8a7ab7  Update checkstyle DTDs

No new revisions were added by this update.

Summary of changes:
 res/checkstyle/checkstyle.xml | 4 ++--
 res/checkstyle/jakarta-checkstyle.xml | 4 ++--
 res/checkstyle/jakarta-import-control.xml | 4 ++--
 res/checkstyle/org-checkstyle.xml | 4 ++--
 res/checkstyle/org-import-control.xml | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)


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

[tomcat] branch 7.0.x updated: Code reformatting / clean-up primarily to trigger CI build

[markt]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new aa039a6  Code reformatting / clean-up primarily to trigger CI build
aa039a6 is described below

commit aa039a6dd296cacf2ee6f44bd647b4a947c6ee50
Author: Mark Thomas 
AuthorDate: Wed Jan 27 10:09:03 2021 +

Code reformatting / clean-up primarily to trigger CI build
---
 java/org/apache/catalina/servlets/CGIServlet.java | 34 ---
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/java/org/apache/catalina/servlets/CGIServlet.java 
b/java/org/apache/catalina/servlets/CGIServlet.java
index 4d811ea..0bf453a 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -825,8 +825,8 @@ public final class CGIServlet extends HttpServlet {
 // does not contain an unencoded "=" this is an indexed query.
 // The parsed query string becomes the command line parameters
 // for the cgi command.
-if (enableCmdLineArguments && (req.getMethod().equals("GET")
-|| req.getMethod().equals("POST") || 
req.getMethod().equals("HEAD"))) {
+if (enableCmdLineArguments && (req.getMethod().equals("GET") || 
req.getMethod().equals("POST") ||
+req.getMethod().equals("HEAD"))) {
 String qs;
 if (isIncluded) {
 qs = (String) req.getAttribute(
@@ -1038,10 +1038,7 @@ public final class CGIServlet extends HttpServlet {
 sCGIFullName = sCGINames[2];
 sCGIName = sCGINames[3];
 
-if (sCGIFullPath == null
-|| sCGIScriptName == null
-|| sCGIFullName == null
-|| sCGIName == null) {
+if (sCGIFullPath == null || sCGIScriptName == null || sCGIFullName 
== null || sCGIName == null) {
 return false;
 }
 
@@ -1074,8 +1071,7 @@ public final class CGIServlet extends HttpServlet {
  * (see method findCGI, where the real work is done)
  *
  */
-if (pathInfo == null
-|| (pathInfo.substring(sCGIFullName.length()).length() <= 0)) {
+if (pathInfo == null || 
(pathInfo.substring(sCGIFullName.length()).length() <= 0)) {
 sPathInfoCGI = "";
 } else {
 sPathInfoCGI = pathInfo.substring(sCGIFullName.length());
@@ -1416,9 +1412,7 @@ public final class CGIServlet extends HttpServlet {
  */
 protected String blanksToString(String couldBeBlank,
   String subForBlanks) {
-return (("".equals(couldBeBlank) || couldBeBlank == null)
-? subForBlanks
-: couldBeBlank);
+return (couldBeBlank == null || couldBeBlank.isEmpty()) ? 
subForBlanks : couldBeBlank;
 }
 
 
@@ -1499,11 +1493,7 @@ public final class CGIServlet extends HttpServlet {
  * Checks and sets ready status
  */
 protected void updateReadyStatus() {
-if (command != null
-&& env != null
-&& wd != null
-&& params != null
-&& response != null) {
+if (command != null && env != null && wd != null && params != null 
&& response != null) {
 readyToRun = true;
 } else {
 readyToRun = false;
@@ -1639,13 +1629,11 @@ public final class CGIServlet extends HttpServlet {
 log.debug("envp: [" + env + "], command: [" + command + "]");
 }
 
-if ((command.contains(File.separator + "." + File.separator))
-|| (command.contains(File.separator + ".."))
-|| (command.contains(".." + File.separator))) {
-throw new IOException(this.getClass().getName()
-  + "Illegal Character in CGI command "
-  + "path ('.' or '..') detected.  Not "
-  + "running CGI [" + command + "].");
+if ((command.contains(File.separator + "." + File.separator)) ||
+(command.contains(File.separator + "..")) ||
+(command.contains(".." + File.separator))) {
+throw new IOException(this.getClass().getName() + "Illegal 
Character in CGI command path " +
+"('.' or '..') detected.  Not running CGI [" + command 
+ "].");
 }
 
 /* original content/structure of this section taken from


-
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: Code reformatting / clean-up primarily to trigger CI build

[markt]

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 6eff8c7  Code reformatting / clean-up primarily to trigger CI build
6eff8c7 is described below

commit 6eff8c7210a22336894f5efc4abddd2cf71ada64
Author: Mark Thomas 
AuthorDate: Wed Jan 27 10:09:03 2021 +

Code reformatting / clean-up primarily to trigger CI build
---
 java/org/apache/catalina/servlets/CGIServlet.java | 34 ---
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/java/org/apache/catalina/servlets/CGIServlet.java 
b/java/org/apache/catalina/servlets/CGIServlet.java
index e24c871..f71e2e3 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -800,8 +800,8 @@ public final class CGIServlet extends HttpServlet {
 // does not contain an unencoded "=" this is an indexed query.
 // The parsed query string becomes the command line parameters
 // for the cgi command.
-if (enableCmdLineArguments && (req.getMethod().equals("GET")
-|| req.getMethod().equals("POST") || 
req.getMethod().equals("HEAD"))) {
+if (enableCmdLineArguments && (req.getMethod().equals("GET") || 
req.getMethod().equals("POST") ||
+req.getMethod().equals("HEAD"))) {
 String qs;
 if (isIncluded) {
 qs = (String) req.getAttribute(
@@ -1013,10 +1013,7 @@ public final class CGIServlet extends HttpServlet {
 sCGIFullName = sCGINames[2];
 sCGIName = sCGINames[3];
 
-if (sCGIFullPath == null
-|| sCGIScriptName == null
-|| sCGIFullName == null
-|| sCGIName == null) {
+if (sCGIFullPath == null || sCGIScriptName == null || sCGIFullName 
== null || sCGIName == null) {
 return false;
 }
 
@@ -1049,8 +1046,7 @@ public final class CGIServlet extends HttpServlet {
  * (see method findCGI, where the real work is done)
  *
  */
-if (pathInfo == null
-|| (pathInfo.substring(sCGIFullName.length()).length() <= 0)) {
+if (pathInfo == null || 
(pathInfo.substring(sCGIFullName.length()).length() <= 0)) {
 sPathInfoCGI = "";
 } else {
 sPathInfoCGI = pathInfo.substring(sCGIFullName.length());
@@ -1386,9 +1382,7 @@ public final class CGIServlet extends HttpServlet {
  */
 protected String blanksToString(String couldBeBlank,
   String subForBlanks) {
-return (couldBeBlank == null || couldBeBlank.isEmpty())
-? subForBlanks
-: couldBeBlank;
+return (couldBeBlank == null || couldBeBlank.isEmpty()) ? 
subForBlanks : couldBeBlank;
 }
 
 
@@ -1469,11 +1463,7 @@ public final class CGIServlet extends HttpServlet {
  * Checks and sets ready status
  */
 protected void updateReadyStatus() {
-if (command != null
-&& env != null
-&& wd != null
-&& params != null
-&& response != null) {
+if (command != null && env != null && wd != null && params != null 
&& response != null) {
 readyToRun = true;
 } else {
 readyToRun = false;
@@ -1609,13 +1599,11 @@ public final class CGIServlet extends HttpServlet {
 log.debug("envp: [" + env + "], command: [" + command + "]");
 }
 
-if ((command.contains(File.separator + "." + File.separator))
-|| (command.contains(File.separator + ".."))
-|| (command.contains(".." + File.separator))) {
-throw new IOException(this.getClass().getName()
-  + "Illegal Character in CGI command "
-  + "path ('.' or '..') detected.  Not "
-  + "running CGI [" + command + "].");
+if ((command.contains(File.separator + "." + File.separator)) ||
+(command.contains(File.separator + "..")) ||
+(command.contains(".." + File.separator))) {
+throw new IOException(this.getClass().getName() + "Illegal 
Character in CGI command path " +
+"('.' or '..') detected.  Not running CGI [" + command 
+ "].");
 }
 
 /* original content/structure of this section taken from


-
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: Code reformatting / clean-up primarily to trigger CI build

[markt]

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 2de8d21  Code reformatting / clean-up primarily to trigger CI build
2de8d21 is described below

commit 2de8d217fdb0896813ada3232b2d6084ac6a38b8
Author: Mark Thomas 
AuthorDate: Wed Jan 27 10:09:03 2021 +

Code reformatting / clean-up primarily to trigger CI build
---
 java/org/apache/catalina/servlets/CGIServlet.java | 34 ---
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/java/org/apache/catalina/servlets/CGIServlet.java 
b/java/org/apache/catalina/servlets/CGIServlet.java
index 98672ad..dc928f1 100644
--- a/java/org/apache/catalina/servlets/CGIServlet.java
+++ b/java/org/apache/catalina/servlets/CGIServlet.java
@@ -800,8 +800,8 @@ public final class CGIServlet extends HttpServlet {
 // does not contain an unencoded "=" this is an indexed query.
 // The parsed query string becomes the command line parameters
 // for the cgi command.
-if (enableCmdLineArguments && (req.getMethod().equals("GET")
-|| req.getMethod().equals("POST") || 
req.getMethod().equals("HEAD"))) {
+if (enableCmdLineArguments && (req.getMethod().equals("GET") || 
req.getMethod().equals("POST") ||
+req.getMethod().equals("HEAD"))) {
 String qs;
 if (isIncluded) {
 qs = (String) req.getAttribute(
@@ -1013,10 +1013,7 @@ public final class CGIServlet extends HttpServlet {
 sCGIFullName = sCGINames[2];
 sCGIName = sCGINames[3];
 
-if (sCGIFullPath == null
-|| sCGIScriptName == null
-|| sCGIFullName == null
-|| sCGIName == null) {
+if (sCGIFullPath == null || sCGIScriptName == null || sCGIFullName 
== null || sCGIName == null) {
 return false;
 }
 
@@ -1049,8 +1046,7 @@ public final class CGIServlet extends HttpServlet {
  * (see method findCGI, where the real work is done)
  *
  */
-if (pathInfo == null
-|| (pathInfo.substring(sCGIFullName.length()).length() <= 0)) {
+if (pathInfo == null || 
(pathInfo.substring(sCGIFullName.length()).length() <= 0)) {
 sPathInfoCGI = "";
 } else {
 sPathInfoCGI = pathInfo.substring(sCGIFullName.length());
@@ -1386,9 +1382,7 @@ public final class CGIServlet extends HttpServlet {
  */
 protected String blanksToString(String couldBeBlank,
   String subForBlanks) {
-return (couldBeBlank == null || couldBeBlank.isEmpty())
-? subForBlanks
-: couldBeBlank;
+return (couldBeBlank == null || couldBeBlank.isEmpty()) ? 
subForBlanks : couldBeBlank;
 }
 
 
@@ -1469,11 +1463,7 @@ public final class CGIServlet extends HttpServlet {
  * Checks and sets ready status
  */
 protected void updateReadyStatus() {
-if (command != null
-&& env != null
-&& wd != null
-&& params != null
-&& response != null) {
+if (command != null && env != null && wd != null && params != null 
&& response != null) {
 readyToRun = true;
 } else {
 readyToRun = false;
@@ -1609,13 +1599,11 @@ public final class CGIServlet extends HttpServlet {
 log.debug("envp: [" + env + "], command: [" + command + "]");
 }
 
-if ((command.contains(File.separator + "." + File.separator))
-|| (command.contains(File.separator + ".."))
-|| (command.contains(".." + File.separator))) {
-throw new IOException(this.getClass().getName()
-  + "Illegal Character in CGI command "
-  + "path ('.' or '..') detected.  Not "
-  + "running CGI [" + command + "].");
+if ((command.contains(File.separator + "." + File.separator)) ||
+(command.contains(File.separator + "..")) ||
+(command.contains(".." + File.separator))) {
+throw new IOException(this.getClass().getName() + "Illegal 
Character in CGI command path " +
+"('.' or '..') detected.  Not running CGI [" + command 
+ "].");
 }
 
 /* original content/structure of this section taken from


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

[tomcat] branch master updated (c475441 -> f47b9f4)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from c475441  Move storage location for generated reflectionless code
 add f47b9f4  Code reformatting / clean-up primarily to trigger CI build

No new revisions were added by this update.

Summary of changes:
 java/org/apache/catalina/servlets/CGIServlet.java | 34 ---
 1 file changed, 11 insertions(+), 23 deletions(-)


-
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: Move storage location for generated reflectionless code

[markt]

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 c61053e  Move storage location for generated reflectionless code
c61053e is described below

commit c61053e7b5fdeb0ad5d89676d41a3a687aeff781
Author: Mark Thomas 
AuthorDate: Wed Jan 27 09:41:10 2021 +

Move storage location for generated reflectionless code

Using java.io.tmpdir was causing conflicts on CI systems when different
users run the build as the file could no be over-written
---
 build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index a7fad4d..57bda80 100644
--- a/build.xml
+++ b/build.xml
@@ -90,6 +90,8 @@
   
   
   
+  
+  
 
   
   
@@ -1737,7 +1739,7 @@
license="${tomcat.manifests}/servlet-api.jar.license"/>
 
 
-
 


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

Re: buildbot failure in on tomcat-trunk

[Mark Thomas]

On 27/01/2021 09:05, Konstantin Kolinko wrote:
> ср, 27 янв. 2021 г. в 11:14, Mark Thomas :
>>
>> On 27/01/2021 07:52, Mark Thomas wrote:
>>> On 27/01/2021 04:51, build...@apache.org wrote:



 BUILD FAILED: failed compile
>>>
>>> This is because the CI system uses NSIS 2.something to work around an
>>> incompatibility with NSIS 3 and wine. That was a while ago. I guess it
>>> is worth checking if the issue still exists as a first step in deciding
>>> how to handle this.
>>
>> Woot! I don't see the issue locally. I'll get the CI system updated.
>> This also opens up the option of building releases on Linux.
> 
> FYI:
> I added the "Unicode true" command to the .nsi file as NSIS 3.05
> deprecated support for ANSI. [1]
> When I build with the current version (3.06.1), it prints a warning
> unless that line is added.
> 
> Looking at their changelog [1], it says that starting with the next
> version (3.07) the default value for "Unicode" command will be changed
> to be true, so that explicit Unicode command will not be needed. So
> one option is to remove the "Unicode" line and just ignore the
> warning.

Thanks for the background. That is very helpful.

The CI system is currently on Ubuntu 18.04 LTS but testing shows that
the latest version of wine-stable available for 18.04.LTS and the latest
NSIS 3 are compatible. I have been able to build the installer on the CI
box and use it to install a working Tomcat instance on a local Windows VM.

I am going to go ahead and remove the hack that kept the CI system using
NSIS 2.

Mark

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

[tomcat] branch master updated: Move storage location for generated reflectionless code

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new c475441  Move storage location for generated reflectionless code
c475441 is described below

commit c4754410f2cf0904940568fb33d4e7c2f87eac61
Author: Mark Thomas 
AuthorDate: Wed Jan 27 09:41:10 2021 +

Move storage location for generated reflectionless code

Using java.io.tmpdir was causing conflicts on CI systems when different
users run the build as the file could no be over-written
---
 build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 6c9bc10..455edf9 100644
--- a/build.xml
+++ b/build.xml
@@ -94,6 +94,8 @@
   
   
   
+  
+  
 
   
   
@@ -1746,7 +1748,7 @@
license="${tomcat.manifests}/servlet-api.jar.license"/>
 
 
-
 


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

Re: buildbot failure in on tomcat-trunk

[Konstantin Kolinko]

ср, 27 янв. 2021 г. в 11:14, Mark Thomas :
>
> On 27/01/2021 07:52, Mark Thomas wrote:
> > On 27/01/2021 04:51, build...@apache.org wrote:
> >> The Buildbot has detected a new failure on builder tomcat-trunk while 
> >> building tomcat. Full details are available at:
> >> https://ci.apache.org/builders/tomcat-trunk/builds/5651
> >>
> >> Buildbot URL: https://ci.apache.org/
> >>
> >> Buildslave for this Build: asf946_ubuntu
> >>
> >> Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
> >> triggered this build
> >> Build Source Stamp: [branch master] 
> >> 654e01edd2c884af8456be08466f830ab9163dec
> >> Blamelist: Konstantin Kolinko 
> >>
> >> BUILD FAILED: failed compile
> >
> > This is because the CI system uses NSIS 2.something to work around an
> > incompatibility with NSIS 3 and wine. That was a while ago. I guess it
> > is worth checking if the issue still exists as a first step in deciding
> > how to handle this.
>
> Woot! I don't see the issue locally. I'll get the CI system updated.
> This also opens up the option of building releases on Linux.


FYI:
I added the "Unicode true" command to the .nsi file as NSIS 3.05
deprecated support for ANSI. [1]
When I build with the current version (3.06.1), it prints a warning
unless that line is added.

Looking at their changelog [1], it says that starting with the next
version (3.07) the default value for "Unicode" command will be changed
to be true, so that explicit Unicode command will not be needed. So
one option is to remove the "Unicode" line and just ignore the
warning.


[1] Changelog for NSIS:
https://nsis.sourceforge.io/Docs/AppendixF.html

Best regards,
Konstantin Kolinko.

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

Re: buildbot failure in on tomcat-trunk

[Mark Thomas]

On 27/01/2021 07:52, Mark Thomas wrote:
> On 27/01/2021 04:51, build...@apache.org wrote:
>> The Buildbot has detected a new failure on builder tomcat-trunk while 
>> building tomcat. Full details are available at:
>> https://ci.apache.org/builders/tomcat-trunk/builds/5651
>>
>> Buildbot URL: https://ci.apache.org/
>>
>> Buildslave for this Build: asf946_ubuntu
>>
>> Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
>> triggered this build
>> Build Source Stamp: [branch master] 654e01edd2c884af8456be08466f830ab9163dec
>> Blamelist: Konstantin Kolinko 
>>
>> BUILD FAILED: failed compile
> 
> This is because the CI system uses NSIS 2.something to work around an
> incompatibility with NSIS 3 and wine. That was a while ago. I guess it
> is worth checking if the issue still exists as a first step in deciding
> how to handle this.

Woot! I don't see the issue locally. I'll get the CI system updated.
This also opens up the option of building releases on Linux.

Mark

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