[commons-jexl] 04/05: Merge remote-tracking branch 'origin/JEXL-369' into JEXL-369

[henrib]

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

henrib pushed a commit to branch JEXL-369
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git

commit 4182a62141e41033c71b24d437c5ba2daf998331
Merge: 75f9fe97 55aad518
Author: henrib <hen...@apache.org>
AuthorDate: Fri May 6 18:18:05 2022 +0200

    Merge remote-tracking branch 'origin/JEXL-369' into JEXL-369
    
    # Conflicts:
    #       src/main/java/org/apache/commons/jexl3/parser/JexlParser.java
    #       src/main/java/org/apache/commons/jexl3/parser/Parser.jjt