[Bug 65909] New: catalina.properties jarsToScan refers to wrong log4j web jar

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

Bug ID: 65909
   Summary: catalina.properties jarsToScan refers to wrong log4j
web jar
   Product: Tomcat 10
   Version: 10.0.16
  Hardware: PC
OS: Mac OS X 10.1
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: mse...@guh-software.de
  Target Milestone: --

The 
tomcat.util.scan.StandardJarScanFilter.jarsToScan
in catalina.properties referes to

log4j-web*.jar

but should refer to

log4j-jakarta-web*.jar

since this is the log4j dependency for Jakarta EE 9+ web servlet containers.

Please see https://github.com/apache/tomcat/pull/477 that fixes this problem.

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



[GitHub] [tomcat] mseele opened a new pull request #477: Refer to correct log4j web jar

2022-02-21 Thread GitBox


mseele opened a new pull request #477:
URL: https://github.com/apache/tomcat/pull/477


   log4j-jakarta-web*.jar is the jar that supports Jakarta EE 9+ web servlet 
containers


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

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

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



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



[VOTE] Release Apache Tomcat 9.0.59

2022-02-21 Thread Rémy Maucherat
The proposed Apache Tomcat 9.0.59 release is now available for voting.

The notable changes compared to 9.0.58 are:

- Add support for additional user attributes to TomcatPrincipal and
   GenericPrincipal

- Correct a regression in the fix for 65454 that meant that
   minSpareThreads and maxThreads settings were ignored when the
   Connector used an internal executor

- Improve the detection of the Linux duplicate accept bug and reduce
   (hopefully avoid) instances of false positives.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://nightlies.apache.org/tomcat/tomcat-9.0.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.59/
The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1358
The tag is:
https://github.com/apache/tomcat/tree/9.0.59
020f955044c1f9b512ee3da477eaa018da87e71a

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

Rémy

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



svn commit: r52686 - in /dev/tomcat/tomcat-9/v9.0.59: ./ bin/ bin/embed/ src/

2022-02-21 Thread remm
Author: remm
Date: Mon Feb 21 21:05:03 2022
New Revision: 52686

Log:
Upload 9.0.59 for voting

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

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

Added: dev/tomcat/tomcat-9/v9.0.59/KEYS
==
--- dev/tomcat/tomcat-9/v9.0.59/KEYS (added)
+++ dev/tomcat/tomcat-9/v9.0.59/KEYS Mon Feb 21 21:05:03 2022
@@ -0,0 +1,237 @@
+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).
+
+
+pub   1024D/33C60243 2004-09-12
+  Key fingerprint = DCFD 35E0 BF8C A734 4752  DE8B 6FB2 1E89 33C6 0243
+uid  Mark E D Thomas 
+uid  Mark E D Thomas 
+uid  Mark E D Thomas 
+sub   2048g/0BECE548 2004-09-12
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v1.4.9 (MingW32)
+
+mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL
+rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw
+4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u
+k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON
+tT0cYipAp5IcYt6Zq5QzHiZreyQXLAjItDS2oGCIXfNbTYJ3kxxJTCU/3wlefVdq

[tomcat] branch 9.0.x updated: Next is 9.0.60

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

remm 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 fe7afdb  Next is 9.0.60
fe7afdb is described below

commit fe7afdb9c863d991889114a32a754fa351686076
Author: remm 
AuthorDate: Mon Feb 21 21:53:40 2022 +0100

Next is 9.0.60
---
 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 6bc7de3..cf437c4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=9
 version.minor=0
-version.build=59
+version.build=60
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 711905f..e95da90 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.59
+maven.asf.release.deploy.version=9.0.60
 
 #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 9d3b5ae..294fcef 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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



[tomcat] 01/01: Tag 9.0.59

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

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

commit 020f955044c1f9b512ee3da477eaa018da87e71a
Author: remm 
AuthorDate: Mon Feb 21 21:51:52 2022 +0100

Tag 9.0.59
---
 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 6bc7de3..dd6cbd5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=9
 version.minor=0
 version.build=59
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9d3b5ae..8a95dc5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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.59 created (now 020f955)

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

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


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

 new 020f955  Tag 9.0.59

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

2022-02-21 Thread Mark Thomas

On 21/02/2022 19:58, Mark Thomas wrote:


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


Unit tests pass on Linux, MacOS and Windows.

Mark

-
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.1.0-M11

2022-02-21 Thread Mark Thomas

On 21/02/2022 18:42, Mark Thomas wrote:


The proposed 10.1.0-M11 release is:
[ ] Broken - do not release
[X] Alpha - go ahead and release as 10.1.0-M11 (alpha)


Unit tests pass on Linux, MacOS and Windows.

Mark

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

2022-02-21 Thread Mark Thomas

The proposed Apache Tomcat 10.0.17 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. Java EE applications designed for Tomcat 9 and earlier may be 
placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will 
automatically convert them to Jakarta EE and copy them to the webapps 
directory


The notable changes compared to 10.0.16 are:

- Add support for additional user attributes to TomcatPrincipal and
  GenericPrincipal

- Correct a regression in the fix for 65454 that meant that
  minSpareThreads and maxThreads settings were ignored when the
  Connector used an internal executor

- Improve the detection of the Linux duplicate accept bug and reduce
  (hopefully avoid) instances of false positives.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://nightlies.apache.org/tomcat/tomcat-10.0.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.0.17/

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

The tag is:
https://github.com/apache/tomcat/tree/10.0.17
138879e330cd7133dacfe4a319e2fc822b1e9257

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

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



svn commit: r52684 - in /dev/tomcat/tomcat-10/v10.0.17: ./ bin/ bin/embed/ src/

2022-02-21 Thread markt
Author: markt
Date: Mon Feb 21 19:47:09 2022
New Revision: 52684

Log:
Upload 10.0.17 for voting

Added:
dev/tomcat/tomcat-10/v10.0.17/
dev/tomcat/tomcat-10/v10.0.17/KEYS
dev/tomcat/tomcat-10/v10.0.17/README.html
dev/tomcat/tomcat-10/v10.0.17/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.17/bin/
dev/tomcat/tomcat-10/v10.0.17/bin/README.html
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-deployer.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-deployer.zip.asc
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-windows-x64.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-windows-x86.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17.exe   (with props)
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17.exe.asc
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17.exe.sha512
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17.zip   (with props)
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17.zip.asc
dev/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-10.0.17.zip.sha512
dev/tomcat/tomcat-10/v10.0.17/bin/embed/
dev/tomcat/tomcat-10/v10.0.17/bin/embed/apache-tomcat-10.0.17-embed.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.0.17/bin/embed/apache-tomcat-10.0.17-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.0.17/bin/embed/apache-tomcat-10.0.17-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.17/bin/embed/apache-tomcat-10.0.17-embed.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.17/bin/embed/apache-tomcat-10.0.17-embed.zip.asc

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

Added: dev/tomcat/tomcat-10/v10.0.17/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.17/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.17/KEYS Mon Feb 21 19:47:09 2022
@@ -0,0 +1,453 @@
+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).
+
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX
+pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t
+6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K
+GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz
+4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M
+UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
+kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn
+lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi
+GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8

[tomcat] 01/01: Tag 10.0.17

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

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

commit 138879e330cd7133dacfe4a319e2fc822b1e9257
Author: Mark Thomas 
AuthorDate: Mon Feb 21 19:32:46 2022 +

Tag 10.0.17
---
 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 3b761ff..2f5cff7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=10
 version.minor=0
 version.build=17
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e8d81b8..e92ef9e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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.17 created (now 138879e)

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

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


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

 new 138879e  Tag 10.0.17

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

2022-02-21 Thread Mark Thomas

The proposed Apache Tomcat 10.1.0-M11 release is now available for
voting.

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory.


The notable changes compared to 10.1.0-M10 are:

- Add support for additional user attributes to TomcatPrincipal and
  GenericPrincipal

- Correct a regression in the fix for 65454 that meant that
  minSpareThreads and maxThreads settings were ignored when the
  Connector used an internal executor

- Improve the detection of the Linux duplicate accept bug and reduce
  (hopefully avoid) instances of false positives.

For full details, see the changelog:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M11/

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M11
049799677ba307378a256621bb1a7b03f597571c


The proposed 10.1.0-M11 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 10.1.0-M11 (alpha)

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



svn commit: r52679 - in /dev/tomcat/tomcat-10/v10.1.0-M11: ./ bin/ bin/embed/ src/

2022-02-21 Thread markt
Author: markt
Date: Mon Feb 21 18:09:48 2022
New Revision: 52679

Log:
Upload 10.1.0-M11 for voting

Added:
dev/tomcat/tomcat-10/v10.1.0-M11/
dev/tomcat/tomcat-10/v10.1.0-M11/KEYS
dev/tomcat/tomcat-10/v10.1.0-M11/README.html
dev/tomcat/tomcat-10/v10.1.0-M11/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.1.0-M11/bin/
dev/tomcat/tomcat-10/v10.1.0-M11/bin/README.html

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-deployer.tar.gz   
(with props)

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-deployer.zip  
 (with props)

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-deployer.zip.asc

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-deployer.zip.sha512

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-fulldocs.tar.gz   
(with props)

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-fulldocs.tar.gz.sha512

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-windows-x64.zip   
(with props)

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-windows-x64.zip.sha512

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-windows-x86.zip   
(with props)

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11.exe   (with 
props)
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11.exe.asc
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11.exe.sha512
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11.zip   (with 
props)
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11.zip.asc
dev/tomcat/tomcat-10/v10.1.0-M11/bin/apache-tomcat-10.1.0-M11.zip.sha512
dev/tomcat/tomcat-10/v10.1.0-M11/bin/embed/

dev/tomcat/tomcat-10/v10.1.0-M11/bin/embed/apache-tomcat-10.1.0-M11-embed.tar.gz
   (with props)

dev/tomcat/tomcat-10/v10.1.0-M11/bin/embed/apache-tomcat-10.1.0-M11-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M11/bin/embed/apache-tomcat-10.1.0-M11-embed.tar.gz.sha512

dev/tomcat/tomcat-10/v10.1.0-M11/bin/embed/apache-tomcat-10.1.0-M11-embed.zip   
(with props)

dev/tomcat/tomcat-10/v10.1.0-M11/bin/embed/apache-tomcat-10.1.0-M11-embed.zip.asc

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

dev/tomcat/tomcat-10/v10.1.0-M11/src/apache-tomcat-10.1.0-M11-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M11/src/apache-tomcat-10.1.0-M11-src.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.0-M11/src/apache-tomcat-10.1.0-M11-src.zip.asc
dev/tomcat/tomcat-10/v10.1.0-M11/src/apache-tomcat-10.1.0-M11-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.1.0-M11/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.0-M11/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.0-M11/KEYS Mon Feb 21 18:09:48 2022
@@ -0,0 +1,453 @@
+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).
+
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX
+pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t
+6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K
+GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz
+4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M

[tomcat] 01/01: Tag 10.1.0-M11

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

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

commit 049799677ba307378a256621bb1a7b03f597571c
Author: Mark Thomas 
AuthorDate: Mon Feb 21 17:44:50 2022 +

Tag 10.1.0-M11
---
 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 cba8cb0..df4c5f9 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M11-dev
+version.suffix=-M11
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4c086a8..344be3f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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.1.0-M11 created (now 0497996)

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

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


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

 new 0497996  Tag 10.1.0-M11

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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



[tomcat] branch 10.0.x updated: Temporary workaround for broken DigiCert ONE REST API

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 870e03b  Temporary workaround for broken DigiCert ONE REST API
870e03b is described below

commit 870e03b595bedaeca9770fadbb3c14397b4608ef
Author: Mark Thomas 
AuthorDate: Mon Feb 21 17:35:42 2022 +

Temporary workaround for broken DigiCert ONE REST API
---
 build.properties.default | 12 ++--
 build.xml|  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 583a8dc..3b761ff 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -81,11 +81,19 @@ gpg.exec=/path/to/gpg
 # Code signing of Windows installer
 # See https://infra.apache.org/digicert-use.html for setup instructions
 do.codesigning=false
-codesigning.alias=Tomcat-PMC-cert-2021-11
+#codesigning.alias=Tomcat-PMC-cert-2021-11
 codesigning.digest=SHA-512
-codesigning.storetype=DIGICERTONE
+#codesigning.storetype=DIGICERTONE
 # Set codesigning.storepass in build.properties with the following syntax
 #codesigning.storepass=|/path/to/Certificate_pkcs12.p12|
+# Once DigiCert fix the broken REST API
+# - Uncomment alias & storetype above
+# - Remove the four lines below
+# - Remove the keystore field from build.xml
+codesigning.keystore=${user.home}/.digicertone/pkcs11properties.cfg
+codesigning.storepass=NONE
+codesigning.storetype=PKCS11
+codesigning.alias=Tomcat-PMC-key-2021-11
 
 # - Settings to use when downloading files -
 trydownload.httpusecaches=true
diff --git a/build.xml b/build.xml
index cb0e971..d75b22b 100644
--- a/build.xml
+++ b/build.xml
@@ -2523,6 +2523,7 @@ skip.installer property in build.properties" />
   unless="skip.installer" 
depends="-installer-create-uninstaller,setup-jsign"
   if="${do.codesigning}">
 
   description="Builds and optionally signs the Windows installer"
   depends="-installer,setup-jsign" if="${do.codesigning}" >
 

[tomcat] branch 9.0.x updated: Temporary workaround for broken DigiCert ONE REST API

2022-02-21 Thread 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 6a58fb9  Temporary workaround for broken DigiCert ONE REST API
6a58fb9 is described below

commit 6a58fb9cde6fea3fe54922553bff05a5faa6d9bd
Author: Mark Thomas 
AuthorDate: Mon Feb 21 17:35:42 2022 +

Temporary workaround for broken DigiCert ONE REST API
---
 build.properties.default | 12 ++--
 build.xml|  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index f0fb460..6bc7de3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -81,11 +81,19 @@ gpg.exec=/path/to/gpg
 # Code signing of Windows installer
 # See https://infra.apache.org/digicert-use.html for setup instructions
 do.codesigning=false
-codesigning.alias=Tomcat-PMC-cert-2021-11
+#codesigning.alias=Tomcat-PMC-cert-2021-11
 codesigning.digest=SHA-512
-codesigning.storetype=DIGICERTONE
+#codesigning.storetype=DIGICERTONE
 # Set codesigning.storepass in build.properties with the following syntax
 #codesigning.storepass=|/path/to/Certificate_pkcs12.p12|
+# Once DigiCert fix the broken REST API
+# - Uncomment alias & storetype above
+# - Remove the four lines below
+# - Remove the keystore field from build.xml
+codesigning.keystore=${user.home}/.digicertone/pkcs11properties.cfg
+codesigning.storepass=NONE
+codesigning.storetype=PKCS11
+codesigning.alias=Tomcat-PMC-key-2021-11
 
 # - Settings to use when downloading files -
 trydownload.httpusecaches=true
diff --git a/build.xml b/build.xml
index 6e24ad4..326d7b1 100644
--- a/build.xml
+++ b/build.xml
@@ -2505,6 +2505,7 @@ skip.installer property in build.properties" />
   unless="skip.installer" 
depends="-installer-create-uninstaller,setup-jsign"
   if="${do.codesigning}">
 
   description="Builds and optionally signs the Windows installer"
   depends="-installer,setup-jsign" if="${do.codesigning}" >
 

[tomcat] branch 8.5.x updated: Temporary workaround for broken DigiCert ONE REST API

2022-02-21 Thread 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 f583fe5  Temporary workaround for broken DigiCert ONE REST API
f583fe5 is described below

commit f583fe52705c2d2911f20fd00d7647804a7f9f10
Author: Mark Thomas 
AuthorDate: Mon Feb 21 17:35:42 2022 +

Temporary workaround for broken DigiCert ONE REST API
---
 build.properties.default | 12 ++--
 build.xml|  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 92c9b54..16876ac 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -84,11 +84,19 @@ gpg.exec=/path/to/gpg
 # Code signing of Windows installer
 # See https://infra.apache.org/digicert-use.html for setup instructions
 do.codesigning=false
-codesigning.alias=Tomcat-PMC-cert-2021-11
+#codesigning.alias=Tomcat-PMC-cert-2021-11
 codesigning.digest=SHA-512
-codesigning.storetype=DIGICERTONE
+#codesigning.storetype=DIGICERTONE
 # Set codesigning.storepass in build.properties with the following syntax
 #codesigning.storepass=|/path/to/Certificate_pkcs12.p12|
+# Once DigiCert fix the broken REST API
+# - Uncomment alias & storetype above
+# - Remove the four lines below
+# - Remove the keystore field from build.xml
+codesigning.keystore=${user.home}/.digicertone/pkcs11properties.cfg
+codesigning.storepass=NONE
+codesigning.storetype=PKCS11
+codesigning.alias=Tomcat-PMC-key-2021-11
 
 # - Settings to use when downloading files -
 trydownload.httpusecaches=true
diff --git a/build.xml b/build.xml
index 8427711..39a8b32 100644
--- a/build.xml
+++ b/build.xml
@@ -2186,6 +2186,7 @@ skip.installer property in build.properties" />
   unless="skip.installer" 
depends="-installer-create-uninstaller,setup-jsign"
   if="${do.codesigning}">
 
   description="Builds and optionally signs the Windows installer"
   depends="-installer,setup-jsign" if="${do.codesigning}" >
 

[tomcat] branch main updated: Temporary workaround for broken DigiCert ONE REST API

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 7c54e36  Temporary workaround for broken DigiCert ONE REST API
7c54e36 is described below

commit 7c54e369e87f1eedd50e42f895c2b0cd058e30b8
Author: Mark Thomas 
AuthorDate: Mon Feb 21 17:35:42 2022 +

Temporary workaround for broken DigiCert ONE REST API
---
 build.properties.default | 12 ++--
 build.xml|  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index f5d1ef1..cba8cb0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -79,11 +79,19 @@ gpg.exec=/path/to/gpg
 # Code signing of Windows installer
 # See https://infra.apache.org/digicert-use.html for setup instructions
 do.codesigning=false
-codesigning.alias=Tomcat-PMC-cert-2021-11
+#codesigning.alias=Tomcat-PMC-cert-2021-11
 codesigning.digest=SHA-512
-codesigning.storetype=DIGICERTONE
+#codesigning.storetype=DIGICERTONE
 # Set codesigning.storepass in build.properties with the following syntax
 #codesigning.storepass=|/path/to/Certificate_pkcs12.p12|
+# Once DigiCert fix the broken REST API
+# - Uncomment alias & storetype above
+# - Remove the four lines below
+# - Remove the keystore field from build.xml
+codesigning.keystore=${user.home}/.digicertone/pkcs11properties.cfg
+codesigning.storepass=NONE
+codesigning.storetype=PKCS11
+codesigning.alias=Tomcat-PMC-key-2021-11
 
 # - Settings to use when downloading files -
 trydownload.httpusecaches=true
diff --git a/build.xml b/build.xml
index 54cd5fd..fb5c56a 100644
--- a/build.xml
+++ b/build.xml
@@ -2562,6 +2562,7 @@ skip.installer property in build.properties" />
   unless="skip.installer" 
depends="-installer-create-uninstaller,setup-jsign"
   if="${do.codesigning}">
 
   description="Builds and optionally signs the Windows installer"
   depends="-installer,setup-jsign" if="${do.codesigning}" >
 

[tomcat] branch 8.5.x updated: Fix indent

2022-02-21 Thread 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 6ce68ce  Fix indent
6ce68ce is described below

commit 6ce68ceea5cc3de07c28df4b1b46ee155787db8d
Author: Mark Thomas 
AuthorDate: Mon Feb 21 16:25:18 2022 +

Fix indent
---
 build.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index a640e20..8427711 100644
--- a/build.xml
+++ b/build.xml
@@ -2214,11 +2214,11 @@ skip.installer property in build.properties" />
   description="Builds and optionally signs the Windows installer"
   depends="-installer,setup-jsign" if="${do.codesigning}" >
 http://timestamp.digicert.com"/>
+storepass="${codesigning.storepass}"
+storetype="${codesigning.storetype}"
+alias="${codesigning.alias}"
+alg="${codesigning.digest}"
+tsaurl="http://timestamp.digicert.com"/>
 
 
 

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

2022-02-21 Thread 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 14a9ff6  Fix indent
14a9ff6 is described below

commit 14a9ff6b4a01dfb239fe26d25ecdf7f2c464f629
Author: Mark Thomas 
AuthorDate: Mon Feb 21 16:25:18 2022 +

Fix indent
---
 build.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index d641dc4..6e24ad4 100644
--- a/build.xml
+++ b/build.xml
@@ -2533,11 +2533,11 @@ skip.installer property in build.properties" />
   description="Builds and optionally signs the Windows installer"
   depends="-installer,setup-jsign" if="${do.codesigning}" >
 http://timestamp.digicert.com"/>
+storepass="${codesigning.storepass}"
+storetype="${codesigning.storetype}"
+alias="${codesigning.alias}"
+alg="${codesigning.digest}"
+tsaurl="http://timestamp.digicert.com"/>
 
 
 

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



[tomcat] branch 10.0.x updated: Fix indent

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 124e564  Fix indent
124e564 is described below

commit 124e5643fcf92375488e23c6eb6c2d03378dc9b9
Author: Mark Thomas 
AuthorDate: Mon Feb 21 16:25:18 2022 +

Fix indent
---
 build.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index cfbf19a..cb0e971 100644
--- a/build.xml
+++ b/build.xml
@@ -2551,11 +2551,11 @@ skip.installer property in build.properties" />
   description="Builds and optionally signs the Windows installer"
   depends="-installer,setup-jsign" if="${do.codesigning}" >
 http://timestamp.digicert.com"/>
+storepass="${codesigning.storepass}"
+storetype="${codesigning.storetype}"
+alias="${codesigning.alias}"
+alg="${codesigning.digest}"
+tsaurl="http://timestamp.digicert.com"/>
 
 
 

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



[tomcat] branch main updated: Fix indent

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

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


The following commit(s) were added to refs/heads/main by this push:
 new c351821  Fix indent
c351821 is described below

commit c3518215621e08e8b1a8afac2f1e6c4c73ef1218
Author: Mark Thomas 
AuthorDate: Mon Feb 21 16:25:18 2022 +

Fix indent
---
 build.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 9aef252..54cd5fd 100644
--- a/build.xml
+++ b/build.xml
@@ -2590,11 +2590,11 @@ skip.installer property in build.properties" />
   description="Builds and optionally signs the Windows installer"
   depends="-installer,setup-jsign" if="${do.codesigning}" >
 http://timestamp.digicert.com"/>
+storepass="${codesigning.storepass}"
+storetype="${codesigning.storetype}"
+alias="${codesigning.alias}"
+alg="${codesigning.digest}"
+tsaurl="http://timestamp.digicert.com"/>
 
 
 

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



Re: [tomcat] 01/01: Tag 10.1.0-M11

2022-02-21 Thread Mark Thomas

On 21/02/2022 12:03, ma...@apache.org wrote:

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

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

commit fc722155368837a5a1be7f92f64dfc52328441a1
Author: Mark Thomas 
AuthorDate: Mon Feb 21 12:02:38 2022 +

 Tag 10.1.0-M11


I need to drop this tag.

DigiCert have changed the REST API to the code signing service and 
broken the JSign client in the process.


Sigh.

I have raised an issue with DigiCert support. Based on past experience, 
I am not hopeful for a speedy response.


I'll switch things back to the native clients until DigiCert get things 
sorted out. That means changes to build.xml hence the need to re-tag.


Mark



---
  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 f5d1ef1..6de2454 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=10
  version.minor=1
  version.build=0
  version.patch=0
-version.suffix=-M11-dev
+version.suffix=-M11
  
  # - Reproducible builds -

  # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4c086a8..344be3f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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



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

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

remm 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 ec6cecf  Update timestamp
ec6cecf is described below

commit ec6cecf7bb506e919683e9818a6702d82625f0bf
Author: remm 
AuthorDate: Mon Feb 21 13:34:11 2022 +0100

Update timestamp
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index f27dea5..f0fb460 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -38,8 +38,8 @@ version.suffix=-dev
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
 # Note: The value is in seconds (unlike milliseconds used by 
System.currentTimeMillis()).
-#2022-01-15T12:00:00Z
-#ant.tstamp.now=1642248000
+#2022-02-21T12:00:00Z
+#ant.tstamp.now=1645444800
 
 # - Source control flags -
 git.branch=9.0.x

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



[tomcat] 01/01: Tag 10.1.0-M11

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

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

commit fc722155368837a5a1be7f92f64dfc52328441a1
Author: Mark Thomas 
AuthorDate: Mon Feb 21 12:02:38 2022 +

Tag 10.1.0-M11
---
 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 f5d1ef1..6de2454 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -33,7 +33,7 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M11-dev
+version.suffix=-M11
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4c086a8..344be3f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,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] branch main updated (3c190574 -> 0a908ba)

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

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


from 3c190574 Update reference to JUnit
 add 0a908ba  Update build timestamp

No new revisions were added by this update.

Summary of changes:
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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



[tomcat] tag 10.1.0-M11 created (now fc72215)

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

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


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

 new fc72215  Tag 10.1.0-M11

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: Tagging 10.1.x and 10.0.x tomorrow

2022-02-21 Thread Mark Thomas

Hi all,

That took rather longer than I expected.

I'm currently running my final tests and expect to tag later this morning.

Mark


On 10/02/2022 12:05, Rémy Maucherat wrote:

On Wed, Feb 9, 2022 at 1:18 PM Mark Thomas  wrote:


On 07/02/2022 21:06, Mark Thomas wrote:

Hi all,

Just a heads up that, barring surprises, I plan to be in a position to
tag 10.1.x and 10.0.x for the February release round towards the end of
tomorrow.


There were surprises. Looking more like the end of the week at the moment.


The situation with c3edf437da20af0f11edc0ad6d893399b01e6287 will have
to be resolved before tagging since it is an API change.
As usual in this case, if nobody seconds my objections, then this can
move along.

Rémy



Mark

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



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



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



[tomcat] branch 8.5.x updated: Update reference to JUnit, EasyMock and Objenesis

2022-02-21 Thread 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 8f75665  Update reference to JUnit, EasyMock and Objenesis
8f75665 is described below

commit 8f75665070861073fa12ca4e763ddb3630ad481a
Author: Mark Thomas 
AuthorDate: Mon Feb 21 07:59:29 2022 +

Update reference to JUnit, EasyMock and Objenesis
---
 res/ide-support/idea/tomcat.iml | 2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 2b30b18..9c47ba9 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -41,7 +41,7 @@
 
   
 
-
+
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 6f5058e..f3a7933 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.6/easymock-3.6.jar:${base.path}/objenesis-2.6/objenesis-2.6.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 4e60b3c..78e8c3f 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.6/easymock-3.6.jar:${base.path}/objenesis-2.6/objenesis-2.6.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
+output/classes:output/testclasses:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
 1.7
 
 

-
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 reference to JUnit

2022-02-21 Thread 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 0bf49aa  Update reference to JUnit
0bf49aa is described below

commit 0bf49aaceb2a9225f3d33d30e7b369b445408004
Author: Mark Thomas 
AuthorDate: Mon Feb 21 07:59:29 2022 +

Update reference to JUnit
---
 res/ide-support/idea/tomcat.iml | 2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index a4268e6..ba591c0 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -41,7 +41,7 @@
 
   
 
-
+
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 65b5205..b02a1da 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index acb514a..43d1d49 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
+output/classes:output/testclasses:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
 1.7
 
 

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



[tomcat] branch 10.0.x updated: Update reference to JUnit

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new d9a0ef5  Update reference to JUnit
d9a0ef5 is described below

commit d9a0ef51c047cb8a251f2de9d53bf1a5a6b4ecc1
Author: Mark Thomas 
AuthorDate: Mon Feb 21 07:59:29 2022 +

Update reference to JUnit
---
 res/ide-support/idea/tomcat.iml | 2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index c4dd47b..8659608 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -41,7 +41,7 @@
 
   
 
-
+
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index 65b5205..b02a1da 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.20/ecj-4.20.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 68a060e..ac77518 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
+output/classes:output/testclasses:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
 1.7
 
 

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



[tomcat] branch main updated: Update reference to JUnit

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

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


The following commit(s) were added to refs/heads/main by this push:
 new 3c190574 Update reference to JUnit
3c190574 is described below

commit 3c19057475cee44899afbfcd1be07ff8a7cb6deb
Author: Mark Thomas 
AuthorDate: Mon Feb 21 07:59:29 2022 +

Update reference to JUnit
---
 res/ide-support/idea/tomcat.iml | 2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
 res/ide-support/netbeans/project.xml| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 5be2060..b755fb9 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -41,7 +41,7 @@
 
   
 
-
+
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index c1c5039..0aa6d06 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.22/ecj-4.22.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index 1d3c25b..5b45bab 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -189,7 +189,7 @@
 
 test
 
-output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
+output/classes:output/testclasses:${base.path}/junit-4.13.2/junit-4.13.2.jar:${base.path}/easymock-4.3/easymock-4.3.jar:${base.path}/objenesis-3.2/objenesis-3.2.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest/hamcrest-2.2.jar
 1.7
 
 

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