Re: [VOTE] Release Apache Tomcat Connectors (JK) 1.2.50

2024-08-12 Thread Rainer Jung

Am 08.08.24 um 16:13 schrieb Mark Thomas:

Tag:
https://github.com/apache/tomcat-connectors/tree/JK_1_2_50

Source:
https://github.com/apache/tomcat-connectors/tree/JK_1_2_50

Dist:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/


This is a maintenance release with a handful of dependency updates and 
bug fixes (compared to 1.2.49). It also includes Windows binaries for IIS.


The significant changes are:
- Improve shared memory handling on non-Windows

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


+1 for release.

Thanks, especially for RM!

Rainer

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



(tomcat) branch main updated (043e9b3b33 -> 46f2b6bbf6)

2024-08-12 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 043e9b3b33 Simplify logic
 new 5583e5c5f2 Code clean-up - formatting. No functional change.
 new 46f2b6bbf6 Regenerate with latest JavaCC (7.0.13)

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


Summary of changes:
 java/org/apache/el/parser/ELParser.java| 7636 ++--
 java/org/apache/el/parser/ELParserConstants.java   |  321 +-
 .../org/apache/el/parser/ELParserTokenManager.java | 4529 ++--
 .../apache/el/parser/ELParserTreeConstants.java|  144 +-
 java/org/apache/el/parser/JJTELParserState.java|  227 +-
 java/org/apache/el/parser/Node.java|  111 +-
 java/org/apache/el/parser/ParseException.java  |  338 +-
 java/org/apache/el/parser/SimpleCharStream.java|  855 ++-
 java/org/apache/el/parser/SimpleNode.java  |   28 +-
 java/org/apache/el/parser/Token.java   |  215 +-
 java/org/apache/el/parser/TokenMgrError.java   |  237 +-
 11 files changed, 7348 insertions(+), 7293 deletions(-)


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



(tomcat) 02/02: Regenerate with latest JavaCC (7.0.13)

2024-08-12 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

commit 46f2b6bbf6cae325ec2bce2c74740c627adf169e
Author: Mark Thomas 
AuthorDate: Mon Aug 12 13:46:01 2024 +0100

Regenerate with latest JavaCC (7.0.13)

No change.
---
 java/org/apache/el/parser/ELParserTreeConstants.java | 4 ++--
 java/org/apache/el/parser/JJTELParserState.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/el/parser/ELParserTreeConstants.java 
b/java/org/apache/el/parser/ELParserTreeConstants.java
index 50966ac520..240eaf2c90 100644
--- a/java/org/apache/el/parser/ELParserTreeConstants.java
+++ b/java/org/apache/el/parser/ELParserTreeConstants.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ELParserTreeConstants.java 
Version 7.0.10 */
+/* Generated By:JavaCC: Do not edit this line. ELParserTreeConstants.java 
Version 7.0.13 */
 package org.apache.el.parser;
 
 public interface ELParserTreeConstants {
@@ -54,4 +54,4 @@ public interface ELParserTreeConstants {
 "MethodParameters", "SetData", "ListData", "MapData", "MapEntry", 
"Identifier", "Function", "True", "False",
 "FloatingPoint", "Integer", "String", "Null", };
 }
-/* JavaCC - OriginalChecksum=4a0b3deb38bd21ee4df7ed00585cdbf6 (do not edit 
this line) */
+/* JavaCC - OriginalChecksum=40650ef76eedbdb11f7d9a6683a802ca (do not edit 
this line) */
diff --git a/java/org/apache/el/parser/JJTELParserState.java 
b/java/org/apache/el/parser/JJTELParserState.java
index c87c5a193f..e7dec64365 100644
--- a/java/org/apache/el/parser/JJTELParserState.java
+++ b/java/org/apache/el/parser/JJTELParserState.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. JJTELParserState.java Version 
7.0.10 */
+/* Generated By:JavaCC: Do not edit this line. JJTELParserState.java Version 
7.0.13 */
 package org.apache.el.parser;
 
 @SuppressWarnings("all") // Ignore warnings in generated code
@@ -126,4 +126,4 @@ public class JJTELParserState {
 }
 }
 }
-/* JavaCC - OriginalChecksum=5f71fbb7f7a6d37c4c91e15a8243ab32 (do not edit 
this line) */
+/* JavaCC - OriginalChecksum=61260c571cf3016ef9e7eba56bd3802a (do not edit 
this line) */


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



Re: (tomcat) 02/02: Regenerate with latest JavaCC (7.0.13)

2024-08-12 Thread Mark Thomas

On 12/08/2024 13:51, ma...@apache.org wrote:

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

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

commit 46f2b6bbf6cae325ec2bce2c74740c627adf169e
Author: Mark Thomas 
AuthorDate: Mon Aug 12 13:46:01 2024 +0100

 Regenerate with latest JavaCC (7.0.13)
 
 No change.


FYI I'm starting to look at some possible EL changes for Tomcat 12 (yes, 
I know - 11 isn't stable and I'm looking at 12) so I wanted to make sure 
I started from the current latest generated code.


We don't need to backport this since the generated code is the same but 
I am going to back-port for consistency.


Mark

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



(tomcat) 02/02: Regenerate with latest JavaCC (7.0.13)

2024-08-12 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit c8293f09339507ecc0463a415f80f4189c2e081c
Author: Mark Thomas 
AuthorDate: Mon Aug 12 14:47:38 2024 +0100

Regenerate with latest JavaCC (7.0.13)
---
 java/org/apache/el/parser/ELParserTreeConstants.java | 4 ++--
 java/org/apache/el/parser/JJTELParserState.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/el/parser/ELParserTreeConstants.java 
b/java/org/apache/el/parser/ELParserTreeConstants.java
index 8fae72bc7e..ab1623e62e 100644
--- a/java/org/apache/el/parser/ELParserTreeConstants.java
+++ b/java/org/apache/el/parser/ELParserTreeConstants.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ELParserTreeConstants.java 
Version 7.0.10 */
+/* Generated By:JavaCC: Do not edit this line. ELParserTreeConstants.java 
Version 7.0.13 */
 package org.apache.el.parser;
 
 public interface ELParserTreeConstants {
@@ -96,4 +96,4 @@ public interface ELParserTreeConstants {
 "MethodParameters", "SetData", "ListData", "MapData", "MapEntry", 
"Identifier", "Function", "True", "False",
 "FloatingPoint", "Integer", "String", "Null", };
 }
-/* JavaCC - OriginalChecksum=4a0b3deb38bd21ee4df7ed00585cdbf6 (do not edit 
this line) */
+/* JavaCC - OriginalChecksum=40650ef76eedbdb11f7d9a6683a802ca (do not edit 
this line) */
diff --git a/java/org/apache/el/parser/JJTELParserState.java 
b/java/org/apache/el/parser/JJTELParserState.java
index d9d40de49b..4315ef769b 100644
--- a/java/org/apache/el/parser/JJTELParserState.java
+++ b/java/org/apache/el/parser/JJTELParserState.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. JJTELParserState.java Version 
7.0.10 */
+/* Generated By:JavaCC: Do not edit this line. JJTELParserState.java Version 
7.0.13 */
 package org.apache.el.parser;
 
 @SuppressWarnings("all") // Ignore warnings in generated code
@@ -133,4 +133,4 @@ public class JJTELParserState {
 }
 }
 }
-/* JavaCC - OriginalChecksum=5f71fbb7f7a6d37c4c91e15a8243ab32 (do not edit 
this line) */
+/* JavaCC - OriginalChecksum=61260c571cf3016ef9e7eba56bd3802a (do not edit 
this line) */


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



(tomcat) branch 10.1.x updated (bc85743c1e -> c8293f0933)

2024-08-12 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from bc85743c1e Code clean-up - formatting. No functional change.
 new 36dcbb8843 Code clean-up - formatting. No functional change.
 new c8293f0933 Regenerate with latest JavaCC (7.0.13)

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


Summary of changes:
 java/org/apache/el/parser/ArithmeticNode.java  |1 +
 java/org/apache/el/parser/AstAnd.java  |3 +-
 java/org/apache/el/parser/AstBracketSuffix.java|3 +-
 java/org/apache/el/parser/AstChoice.java   |4 +-
 .../apache/el/parser/AstCompositeExpression.java   |3 +-
 .../apache/el/parser/AstDeferredExpression.java|6 +-
 java/org/apache/el/parser/AstDiv.java  |3 +-
 java/org/apache/el/parser/AstDotSuffix.java|4 +-
 .../org/apache/el/parser/AstDynamicExpression.java |6 +-
 java/org/apache/el/parser/AstEmpty.java|4 +-
 java/org/apache/el/parser/AstEqual.java|3 +-
 java/org/apache/el/parser/AstFalse.java|3 +-
 java/org/apache/el/parser/AstFloatingPoint.java|6 +-
 java/org/apache/el/parser/AstFunction.java |8 +-
 java/org/apache/el/parser/AstGreaterThan.java  |3 +-
 java/org/apache/el/parser/AstGreaterThanEqual.java |3 +-
 java/org/apache/el/parser/AstIdentifier.java   |9 +-
 java/org/apache/el/parser/AstInteger.java  |6 +-
 java/org/apache/el/parser/AstLambdaExpression.java |5 +-
 java/org/apache/el/parser/AstLambdaParameters.java |2 +-
 java/org/apache/el/parser/AstLessThan.java |3 +-
 java/org/apache/el/parser/AstLessThanEqual.java|3 +-
 java/org/apache/el/parser/AstListData.java |3 +
 .../org/apache/el/parser/AstLiteralExpression.java |5 +-
 java/org/apache/el/parser/AstMapEntry.java |1 +
 java/org/apache/el/parser/AstMethodParameters.java |3 +
 java/org/apache/el/parser/AstMinus.java|3 +-
 java/org/apache/el/parser/AstMod.java  |3 +-
 java/org/apache/el/parser/AstMult.java |3 +-
 java/org/apache/el/parser/AstNegative.java |4 +-
 java/org/apache/el/parser/AstNot.java  |4 +-
 java/org/apache/el/parser/AstNotEqual.java |3 +-
 java/org/apache/el/parser/AstNull.java |4 +-
 java/org/apache/el/parser/AstOr.java   |3 +-
 java/org/apache/el/parser/AstPlus.java |3 +-
 java/org/apache/el/parser/AstSetData.java  |2 +
 java/org/apache/el/parser/AstString.java   |7 +-
 java/org/apache/el/parser/AstTrue.java |3 +-
 java/org/apache/el/parser/AstValue.java|   14 +-
 java/org/apache/el/parser/BooleanNode.java |1 +
 java/org/apache/el/parser/ELParser.java| 7950 +++-
 java/org/apache/el/parser/ELParserConstants.java   |  381 +-
 .../org/apache/el/parser/ELParserTokenManager.java | 4663 ++--
 .../apache/el/parser/ELParserTreeConstants.java|  190 +-
 java/org/apache/el/parser/JJTELParserState.java|  184 +-
 java/org/apache/el/parser/Node.java|  105 +-
 java/org/apache/el/parser/NodeVisitor.java |1 +
 java/org/apache/el/parser/ParseException.java  |  343 +-
 java/org/apache/el/parser/SimpleCharStream.java|  898 +--
 java/org/apache/el/parser/SimpleNode.java  |   45 +-
 java/org/apache/el/parser/Token.java   |  239 +-
 java/org/apache/el/parser/TokenMgrError.java   |  282 +-
 52 files changed, 8079 insertions(+), 7362 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 (f0ffcb0b9b -> 550fe372b3)

2024-08-12 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from f0ffcb0b9b Code clean-up - formatting. No functional change.
 new e190c441ec Code clean-up - formatting. No functional change.
 new 550fe372b3 Regenerate with latest JavaCC (7.0.13)clear

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


Summary of changes:
 java/org/apache/el/parser/ArithmeticNode.java  |1 +
 java/org/apache/el/parser/AstAnd.java  |3 +-
 java/org/apache/el/parser/AstBracketSuffix.java|3 +-
 java/org/apache/el/parser/AstChoice.java   |4 +-
 .../apache/el/parser/AstCompositeExpression.java   |3 +-
 .../apache/el/parser/AstDeferredExpression.java|6 +-
 java/org/apache/el/parser/AstDiv.java  |3 +-
 java/org/apache/el/parser/AstDotSuffix.java|4 +-
 .../org/apache/el/parser/AstDynamicExpression.java |6 +-
 java/org/apache/el/parser/AstEmpty.java|4 +-
 java/org/apache/el/parser/AstEqual.java|3 +-
 java/org/apache/el/parser/AstFalse.java|3 +-
 java/org/apache/el/parser/AstFloatingPoint.java|6 +-
 java/org/apache/el/parser/AstFunction.java |8 +-
 java/org/apache/el/parser/AstGreaterThan.java  |3 +-
 java/org/apache/el/parser/AstGreaterThanEqual.java |3 +-
 java/org/apache/el/parser/AstIdentifier.java   |8 +-
 java/org/apache/el/parser/AstInteger.java  |6 +-
 java/org/apache/el/parser/AstLambdaExpression.java |5 +-
 java/org/apache/el/parser/AstLambdaParameters.java |2 +-
 java/org/apache/el/parser/AstLessThan.java |3 +-
 java/org/apache/el/parser/AstLessThanEqual.java|3 +-
 java/org/apache/el/parser/AstListData.java |3 +
 .../org/apache/el/parser/AstLiteralExpression.java |5 +-
 java/org/apache/el/parser/AstMapEntry.java |1 +
 java/org/apache/el/parser/AstMethodParameters.java |3 +
 java/org/apache/el/parser/AstMinus.java|3 +-
 java/org/apache/el/parser/AstMod.java  |3 +-
 java/org/apache/el/parser/AstMult.java |3 +-
 java/org/apache/el/parser/AstNegative.java |4 +-
 java/org/apache/el/parser/AstNot.java  |4 +-
 java/org/apache/el/parser/AstNotEqual.java |3 +-
 java/org/apache/el/parser/AstNull.java |4 +-
 java/org/apache/el/parser/AstOr.java   |3 +-
 java/org/apache/el/parser/AstPlus.java |3 +-
 java/org/apache/el/parser/AstSetData.java  |2 +
 java/org/apache/el/parser/AstString.java   |7 +-
 java/org/apache/el/parser/AstTrue.java |3 +-
 java/org/apache/el/parser/AstValue.java|   13 +-
 java/org/apache/el/parser/BooleanNode.java |1 +
 java/org/apache/el/parser/ELParser.java| 7950 +++-
 java/org/apache/el/parser/ELParserConstants.java   |  381 +-
 .../org/apache/el/parser/ELParserTokenManager.java | 4663 ++--
 .../apache/el/parser/ELParserTreeConstants.java|  190 +-
 java/org/apache/el/parser/JJTELParserState.java|  184 +-
 java/org/apache/el/parser/Node.java|   94 +-
 java/org/apache/el/parser/NodeVisitor.java |1 +
 java/org/apache/el/parser/ParseException.java  |  343 +-
 java/org/apache/el/parser/SimpleCharStream.java|  898 +--
 java/org/apache/el/parser/SimpleNode.java  |   43 +-
 java/org/apache/el/parser/Token.java   |  239 +-
 java/org/apache/el/parser/TokenMgrError.java   |  282 +-
 52 files changed, 8069 insertions(+), 7357 deletions(-)


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



(tomcat) 02/02: Regenerate with latest JavaCC (7.0.13)clear

2024-08-12 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

commit 550fe372b36ba75da22a7eb433a5f9c684343d84
Author: Mark Thomas 
AuthorDate: Mon Aug 12 15:00:12 2024 +0100

Regenerate with latest JavaCC (7.0.13)clear
---
 java/org/apache/el/parser/ELParserTreeConstants.java | 4 ++--
 java/org/apache/el/parser/JJTELParserState.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/el/parser/ELParserTreeConstants.java 
b/java/org/apache/el/parser/ELParserTreeConstants.java
index 8fae72bc7e..ab1623e62e 100644
--- a/java/org/apache/el/parser/ELParserTreeConstants.java
+++ b/java/org/apache/el/parser/ELParserTreeConstants.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ELParserTreeConstants.java 
Version 7.0.10 */
+/* Generated By:JavaCC: Do not edit this line. ELParserTreeConstants.java 
Version 7.0.13 */
 package org.apache.el.parser;
 
 public interface ELParserTreeConstants {
@@ -96,4 +96,4 @@ public interface ELParserTreeConstants {
 "MethodParameters", "SetData", "ListData", "MapData", "MapEntry", 
"Identifier", "Function", "True", "False",
 "FloatingPoint", "Integer", "String", "Null", };
 }
-/* JavaCC - OriginalChecksum=4a0b3deb38bd21ee4df7ed00585cdbf6 (do not edit 
this line) */
+/* JavaCC - OriginalChecksum=40650ef76eedbdb11f7d9a6683a802ca (do not edit 
this line) */
diff --git a/java/org/apache/el/parser/JJTELParserState.java 
b/java/org/apache/el/parser/JJTELParserState.java
index d9d40de49b..4315ef769b 100644
--- a/java/org/apache/el/parser/JJTELParserState.java
+++ b/java/org/apache/el/parser/JJTELParserState.java
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. JJTELParserState.java Version 
7.0.10 */
+/* Generated By:JavaCC: Do not edit this line. JJTELParserState.java Version 
7.0.13 */
 package org.apache.el.parser;
 
 @SuppressWarnings("all") // Ignore warnings in generated code
@@ -133,4 +133,4 @@ public class JJTELParserState {
 }
 }
 }
-/* JavaCC - OriginalChecksum=5f71fbb7f7a6d37c4c91e15a8243ab32 (do not edit 
this line) */
+/* JavaCC - OriginalChecksum=61260c571cf3016ef9e7eba56bd3802a (do not edit 
this line) */


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



Buildbot success in on tomcat-9.0.x

2024-08-12 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/1040
Blamelist: Mark Thomas 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 9.0.x] 550fe372b36ba75da22a7eb433a5f9c684343d84


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 1

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


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



Create a Tomcat 12 branch?

2024-08-12 Thread Mark Thomas

All,

As I mentioned earlier, I am starting work on some new EL API features 
that will be part of Jakarta EE 12 so implemented in Tomcat 12.


How do we want to handle this?

My current thinking is:

- create a 11.0.x branch from current main
- main becomes 12.0.x

I'm not expecting releases to start from 12.0.x any time soon. Users 
that want to experiment with the new features can use snapshots. If we 
reach a point where snapshots would be useful we can re-assess.


The other alternative I thought of was creating my own 12.0.x branch in 
my fork but that seems wrong.


Yes, it means a little more back-porting but (for me at least) that is 
all scripted and I'm not expecting many conflicts between 12.0.x and 11.0.x.


I'd update the CI systems to build 12.0.x.

Part of me thinks it is a little odd to be thinking about 12.0.x before 
11.0.x is stable but on reflection I think it is a good thing that there 
is momentum already for new features in Jakarta EE 12.


Oh, there is also a small change to the Servlet API we could pick up.

Thoughts?

Mark

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



(tomcat) branch main updated: Add test case for null property

2024-08-12 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 315368925d Add test case for null property
315368925d is described below

commit 315368925d382ef15ad58e7c63918c3361d8fe85
Author: Mark Thomas 
AuthorDate: Mon Aug 12 22:12:19 2024 +0100

Add test case for null property
---
 test/org/apache/el/parser/TestAstValue.java | 35 +
 1 file changed, 35 insertions(+)

diff --git a/test/org/apache/el/parser/TestAstValue.java 
b/test/org/apache/el/parser/TestAstValue.java
new file mode 100644
index 00..46858c19c5
--- /dev/null
+++ b/test/org/apache/el/parser/TestAstValue.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.parser;
+
+import jakarta.el.ELProcessor;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestAstValue {
+
+@Test
+public void testNull01() {
+ELProcessor processor = new ELProcessor();
+TesterBeanB beanB = new TesterBeanB();
+Assert.assertNull(beanB.getText());
+processor.defineBean("bean", beanB);
+Object result = processor.eval("bean.text.toLowerCase()");
+Assert.assertNull(result);
+}
+}


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



(tomcat) branch 10.1.x updated: Add test case for null property

2024-08-12 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.1.x by this push:
 new abcb2b1faf Add test case for null property
abcb2b1faf is described below

commit abcb2b1faf8e1738b1b76e2c0b7e5bcffe24d3f0
Author: Mark Thomas 
AuthorDate: Mon Aug 12 22:12:19 2024 +0100

Add test case for null property
---
 test/org/apache/el/parser/TestAstValue.java | 35 +
 1 file changed, 35 insertions(+)

diff --git a/test/org/apache/el/parser/TestAstValue.java 
b/test/org/apache/el/parser/TestAstValue.java
new file mode 100644
index 00..46858c19c5
--- /dev/null
+++ b/test/org/apache/el/parser/TestAstValue.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.parser;
+
+import jakarta.el.ELProcessor;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestAstValue {
+
+@Test
+public void testNull01() {
+ELProcessor processor = new ELProcessor();
+TesterBeanB beanB = new TesterBeanB();
+Assert.assertNull(beanB.getText());
+processor.defineBean("bean", beanB);
+Object result = processor.eval("bean.text.toLowerCase()");
+Assert.assertNull(result);
+}
+}


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



(tomcat) branch 9.0.x updated: Add test case for null property

2024-08-12 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 5164db2916 Add test case for null property
5164db2916 is described below

commit 5164db29164e3b2c111609beac5e468c4bbdb4d0
Author: Mark Thomas 
AuthorDate: Mon Aug 12 22:12:19 2024 +0100

Add test case for null property
---
 test/org/apache/el/parser/TestAstValue.java | 35 +
 1 file changed, 35 insertions(+)

diff --git a/test/org/apache/el/parser/TestAstValue.java 
b/test/org/apache/el/parser/TestAstValue.java
new file mode 100644
index 00..46858c19c5
--- /dev/null
+++ b/test/org/apache/el/parser/TestAstValue.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.parser;
+
+import jakarta.el.ELProcessor;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestAstValue {
+
+@Test
+public void testNull01() {
+ELProcessor processor = new ELProcessor();
+TesterBeanB beanB = new TesterBeanB();
+Assert.assertNull(beanB.getText());
+processor.defineBean("bean", beanB);
+Object result = processor.eval("bean.text.toLowerCase()");
+Assert.assertNull(result);
+}
+}


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



[VOTE][RESULT] Release Apache Tomcat Connectors (JK) 1.2.50

2024-08-12 Thread Mark Thomas

The following votes were cast:

Binding:
+1: markt, schultz, rjung

No other votes were cast.

The vote therefore passes.

Thanks to everyone who contributed to this release.

Mark

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



svn commit: r70818 - /dev/tomcat/tomcat-connectors/jk/ /dev/tomcat/tomcat-connectors/jk/binaries/windows/ /dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/ /release/tomcat/tomcat-connectors/j

2024-08-12 Thread markt
Author: markt
Date: Mon Aug 12 21:23:50 2024
New Revision: 70818

Log:
Release Tomcat Connectors (JK) 1.2.50

Added:

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.asc
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.sha512
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.sha512

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip.asc
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip.sha512
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip.sha512

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-i386-iis.zip
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-i386-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-i386-iis.zip.asc
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-i386-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-i386-iis.zip.sha512
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-i386-iis.zip.sha512

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-x86_64-iis.zip
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-x86_64-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-x86_64-iis.zip.asc
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-x86_64-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-x86_64-iis.zip.sha512
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.50-windows-x86_64-iis.zip.sha512
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.tar.gz
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.tar.gz
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.tar.gz.asc
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.tar.gz.asc

release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.tar.gz.sha512
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.tar.gz.sha512
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.zip
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.zip
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.zip.asc
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.zip.asc
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.zip.sha512
  - copied unchanged from r70817, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.50-src.zip.sha512
Removed:

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-i386-symbols.zip.sha512

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip

dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.50-windows-x86_64-symbols.zip.asc

dev/tomcat/tomcat-connectors/jk/binaries/windows/sym

Buildbot failure in on tomcat-9.0.x

2024-08-12 Thread buildbot
Build status: BUILD FAILED: failed compile (failure) Logs copied. (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/1041
Blamelist: Mark Thomas 
Build Text: failed compile (failure) Logs copied. (failure)
Status Detected: new failure
Build Source Stamp: [branch 9.0.x] 5164db29164e3b2c111609beac5e468c4bbdb4d0


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 2


-- ASF Buildbot


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



Re: Create a Tomcat 12 branch?

2024-08-12 Thread Rémy Maucherat
On Mon, Aug 12, 2024 at 8:30 PM Mark Thomas  wrote:
>
> All,
>
> As I mentioned earlier, I am starting work on some new EL API features
> that will be part of Jakarta EE 12 so implemented in Tomcat 12.
>
> How do we want to handle this?
>
> My current thinking is:
>
> - create a 11.0.x branch from current main
> - main becomes 12.0.x
>
> I'm not expecting releases to start from 12.0.x any time soon. Users
> that want to experiment with the new features can use snapshots. If we
> reach a point where snapshots would be useful we can re-assess.
>
> The other alternative I thought of was creating my own 12.0.x branch in
> my fork but that seems wrong.
>
> Yes, it means a little more back-porting but (for me at least) that is
> all scripted and I'm not expecting many conflicts between 12.0.x and 11.0.x.
>
> I'd update the CI systems to build 12.0.x.
>
> Part of me thinks it is a little odd to be thinking about 12.0.x before
> 11.0.x is stable but on reflection I think it is a good thing that there
> is momentum already for new features in Jakarta EE 12.
>
> Oh, there is also a small change to the Servlet API we could pick up.
>
> Thoughts?

This is unavoidable if there are already new EE features to include.
So +1

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



Re: Create a Tomcat 12 branch?

2024-08-12 Thread Rainer Jung

Am 12.08.24 um 20:30 schrieb Mark Thomas:

All,

As I mentioned earlier, I am starting work on some new EL API features 
that will be part of Jakarta EE 12 so implemented in Tomcat 12.


How do we want to handle this?

My current thinking is:

- create a 11.0.x branch from current main
- main becomes 12.0.x


Probably the least surprising solution compared to how TC usually 
develops. Main is for the highest major version.


I'm not expecting releases to start from 12.0.x any time soon. Users 
that want to experiment with the new features can use snapshots. If we 
reach a point where snapshots would be useful we can re-assess.


The other alternative I thought of was creating my own 12.0.x branch in 
my fork but that seems wrong.


Agreed.

Yes, it means a little more back-porting but (for me at least) that is 
all scripted and I'm not expecting many conflicts between 12.0.x and 
11.0.x.


Sounds good.


I'd update the CI systems to build 12.0.x.

Part of me thinks it is a little odd to be thinking about 12.0.x before 
11.0.x is stable but on reflection I think it is a good thing that there 
is momentum already for new features in Jakarta EE 12.


Agreed.


Oh, there is also a small change to the Servlet API we could pick up.

Thoughts?


+1 for 11.0.x branch plus main for 12.0.x.

Best regards,

Rainer

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