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

Posted to commits@mina.apache.org by gg...@apache.org on 2023/12/14 20:49:55 UTC

(mina) 03/03: Merge branch '2.2.X' of https://gitbox.apache.org/repos/asf/mina.git into 2.2.X

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

ggregory pushed a commit to branch 2.2.X
in repository https://gitbox.apache.org/repos/asf/mina.git

commit 33ffc7d9047abc1c7e11f9b8903d404e4cb3809b
Merge: 6f12a2c5c e9d4fae3e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 14 15:49:35 2023 -0500

    Merge branch '2.2.X' of https://gitbox.apache.org/repos/asf/mina.git into 2.2.X

 LICENSE.jzlib.txt                                  |  2 +-
 LICENSE.ognl.txt                                   | 10 ------
 LICENSE.slf4j.txt                                  | 41 ++++++++++------------
 .../java/org/apache/mina/filter/ssl/SslFilter.java | 28 +++++++++++++--
 .../org/apache/mina/core/buffer/IoBufferTest.java  |  6 +++-
 mina-legal/pom.xml                                 |  7 +---
 mina-legal/src/main/resources/notices.xml          |  1 +
 pom.xml                                            | 15 +++-----
 8 files changed, 56 insertions(+), 54 deletions(-)