You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tomee.apache.org by rz...@apache.org on 2024/04/12 09:52:55 UTC

(tomee) 06/06: Merge remote-tracking branch 'jm/amq6-java17' into amq6

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

rzo1 pushed a commit to branch amq6
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit e1a252419efad667114a5571f80c2eb7878fc55a
Merge: b2c0a6df1a 97c5831e8c
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Fri Apr 12 11:52:32 2024 +0200

    Merge remote-tracking branch 'jm/amq6-java17' into amq6
    
    # Conflicts:
    #       server/openejb-hessian/pom.xml

 examples/testing-security-4/pom.xml       | 6 ++++++
 maven/pom.xml                             | 4 ++--
 maven/tomee-embedded-maven-plugin/pom.xml | 5 +++++
 pom.xml                                   | 7 +++++++
 server/openejb-hessian/pom.xml            | 7 +++----
 5 files changed, 23 insertions(+), 6 deletions(-)