You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by jo...@apache.org on 2021/07/31 07:01:53 UTC

[mina] branch 2.2.X created (now 1586923)

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

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


      at 1586923  changes product version to 2.2.0

This branch includes the following new commits:

     new fa58bb0  Merge branch 'bugfix/DIRMINA-1142' into 2.2.X
     new 1586923  changes product version to 2.2.0

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.


[mina] 01/02: Merge branch 'bugfix/DIRMINA-1142' into 2.2.X

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit fa58bb055a87e240bee81c7a1e7df27484c9e1b2
Merge: d90bbb9 024f23d
Author: Jonathan Valliere <jo...@apache.org>
AuthorDate: Sat Jul 31 02:54:04 2021 -0400

    Merge branch 'bugfix/DIRMINA-1142' into 2.2.X

 .../codec/AbstractProtocolDecoderOutput.java       |  66 +-
 .../codec/AbstractProtocolEncoderOutput.java       | 101 +--
 .../mina/filter/codec/ProtocolCodecFilter.java     | 918 +++++++++------------
 .../mina/filter/codec/ProtocolCodecSession.java    |  15 +-
 .../mina/filter/codec/ProtocolEncoderOutput.java   |  42 +-
 .../filter/codec/ParallelProtocolEncoderTest.java  | 184 +++++
 mina-core/src/test/resources/log4j.properties      |   4 +-
 .../apache/mina/http/HttpServerDecoderTest.java    | 472 ++++++-----
 8 files changed, 900 insertions(+), 902 deletions(-)

diff --cc mina-core/src/test/resources/log4j.properties
index d79de52,d79de52..b972832
--- a/mina-core/src/test/resources/log4j.properties
+++ b/mina-core/src/test/resources/log4j.properties
@@@ -16,11 -16,11 +16,11 @@@
  #############################################################################
  # Please don't modify the log level until we reach to acceptable test coverage.
  # It's very useful when I test examples manually.
--log4j.rootCategory=ERROR, stdout
++log4j.rootCategory=DEBUG, stdout
  
  log4j.appender.stdout=org.apache.log4j.ConsoleAppender
  log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
--log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
++log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] [%t] %p %c - %m%n
  
  # you could use this pattern to test the MDC with the Chat server
  #log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %t %p %X{name} [%X{user}] [%X{remoteIp}:%X{remotePort}] [%c] - %m%n

[mina] 02/02: changes product version to 2.2.0

Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 158692306d50ffe17522c65c5ec1327be689811c
Author: Jonathan Valliere <jo...@apache.org>
AuthorDate: Sat Jul 31 03:00:25 2021 -0400

    changes product version to 2.2.0
---
 distribution/pom.xml            | 2 +-
 mina-core/pom.xml               | 2 +-
 mina-example/pom.xml            | 2 +-
 mina-filter-compression/pom.xml | 2 +-
 mina-http/pom.xml               | 2 +-
 mina-integration-beans/pom.xml  | 2 +-
 mina-integration-jmx/pom.xml    | 2 +-
 mina-integration-ognl/pom.xml   | 2 +-
 mina-integration-xbean/pom.xml  | 2 +-
 mina-legal/pom.xml              | 2 +-
 mina-statemachine/pom.xml       | 2 +-
 mina-transport-apr/pom.xml      | 2 +-
 mina-transport-serial/pom.xml   | 2 +-
 pom.xml                         | 4 ++--
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 46a040a..735f87c 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>mina-parent</artifactId>
     <groupId>org.apache.mina</groupId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>distribution</artifactId>
diff --git a/mina-core/pom.xml b/mina-core/pom.xml
index ffe96c1..9a90416 100644
--- a/mina-core/pom.xml
+++ b/mina-core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-core</artifactId>
diff --git a/mina-example/pom.xml b/mina-example/pom.xml
index b8a1d8f..a0de088 100644
--- a/mina-example/pom.xml
+++ b/mina-example/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-example</artifactId>
diff --git a/mina-filter-compression/pom.xml b/mina-filter-compression/pom.xml
index 4c0f27f..c9b9a06 100644
--- a/mina-filter-compression/pom.xml
+++ b/mina-filter-compression/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-filter-compression</artifactId>
diff --git a/mina-http/pom.xml b/mina-http/pom.xml
index bc20120..d28f67d 100644
--- a/mina-http/pom.xml
+++ b/mina-http/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-http</artifactId>
diff --git a/mina-integration-beans/pom.xml b/mina-integration-beans/pom.xml
index 8e1a010..9dbdc0b 100644
--- a/mina-integration-beans/pom.xml
+++ b/mina-integration-beans/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-integration-beans</artifactId>
diff --git a/mina-integration-jmx/pom.xml b/mina-integration-jmx/pom.xml
index 745378c..251c153 100644
--- a/mina-integration-jmx/pom.xml
+++ b/mina-integration-jmx/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-integration-jmx</artifactId>
diff --git a/mina-integration-ognl/pom.xml b/mina-integration-ognl/pom.xml
index efed27a..ac6b001 100644
--- a/mina-integration-ognl/pom.xml
+++ b/mina-integration-ognl/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-integration-ognl</artifactId>
diff --git a/mina-integration-xbean/pom.xml b/mina-integration-xbean/pom.xml
index 2bbf0b2..4221e2a 100644
--- a/mina-integration-xbean/pom.xml
+++ b/mina-integration-xbean/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-integration-xbean</artifactId>
diff --git a/mina-legal/pom.xml b/mina-legal/pom.xml
index d5fb386..7f80902 100644
--- a/mina-legal/pom.xml
+++ b/mina-legal/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-parent</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>mina-legal</artifactId>
diff --git a/mina-statemachine/pom.xml b/mina-statemachine/pom.xml
index a4084a6..533760c 100644
--- a/mina-statemachine/pom.xml
+++ b/mina-statemachine/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-statemachine</artifactId>
diff --git a/mina-transport-apr/pom.xml b/mina-transport-apr/pom.xml
index 4d3de48..e0270c1 100644
--- a/mina-transport-apr/pom.xml
+++ b/mina-transport-apr/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-transport-apr</artifactId>
diff --git a/mina-transport-serial/pom.xml b/mina-transport-serial/pom.xml
index b85066b..dc96852 100644
--- a/mina-transport-serial/pom.xml
+++ b/mina-transport-serial/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.mina</groupId>
     <artifactId>mina-parent</artifactId>
-    <version>2.1.5-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mina-transport-serial</artifactId>
diff --git a/pom.xml b/pom.xml
index 1133f77..3959e17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
   </organization>
 
   <groupId>org.apache.mina</groupId>
-  <version>2.1.5-SNAPSHOT</version>
+  <version>2.2.0-SNAPSHOT</version>
   <artifactId>mina-parent</artifactId>
   <name>Apache MINA</name>
   <packaging>pom</packaging>
@@ -55,7 +55,7 @@
     <connection>scm:git:https://gitbox.apache.org/repos/asf/mina.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/mina.git</developerConnection>
     <url>https://github.com/apache/mina/tree/${project.scm.tag}</url>
-    <tag>2.1.X</tag>
+    <tag>2.2.X</tag>
   </scm>
 
   <distributionManagement>