You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2019/02/22 09:54:24 UTC
[mina] branch 2.1.0 updated (f858147 -> 09e23a2)
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a change to branch 2.1.0
in repository https://gitbox.apache.org/repos/asf/mina.git.
from f858147 Merge branch '2.1.0' of http://git-wip-us.apache.org/repos/asf/mina.git into 2.1.0
new 71e9323 Ported changes made in 2.0.19
new 724dfd4 Ported some more 2.0.20 changes
new 09e23a2 [maven-release-plugin] prepare release 2.1.0
The 3 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:
distribution/pom.xml | 2 +-
mina-core/pom.xml | 2 +-
.../core/polling/AbstractPollingIoProcessor.java | 3 +-
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 | 76 +++++++++++-----------
15 files changed, 53 insertions(+), 52 deletions(-)
[mina] 01/03: Ported changes made in 2.0.19
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 2.1.0
in repository https://gitbox.apache.org/repos/asf/mina.git
commit 71e9323ccd15402823b54f38914483e80ebc0bd8
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Fri Feb 22 10:27:52 2019 +0100
Ported changes made in 2.0.19
---
pom.xml | 72 ++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f8d301..f904ecd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<prerequisites>
- <maven>3.0.5</maven>
+ <maven>3.5.0</maven>
</prerequisites>
<organization>
@@ -92,51 +92,51 @@
<!-- additionalparam>-Xdoclint:none</additionalparam -->
<!-- Maven Plugins -->
- <version.apache.rat.plugin>0.12</version.apache.rat.plugin>
+ <version.apache.rat.plugin>0.13</version.apache.rat.plugin>
<version.api.plugin>3.5.2</version.api.plugin>
- <version.assembly.plugin>3.1.0</version.assembly.plugin>
+ <version.assembly.plugin>3.1.1</version.assembly.plugin>
<version.build.helper.plugin>3.0.0</version.build.helper.plugin>
- <version.bundle.plugin>3.3.0</version.bundle.plugin>
+ <version.bundle.plugin>4.1.0</version.bundle.plugin>
<version.changes.plugin>2.12.1</version.changes.plugin>
- <version.checkstyle.plugin>2.17</version.checkstyle.plugin>
- <version.clean.plugin>3.0.0</version.clean.plugin>
+ <version.checkstyle.plugin>3.0.0</version.checkstyle.plugin>
+ <version.clean.plugin>3.1.0</version.clean.plugin>
<version.clirr.plugin>2.8</version.clirr.plugin>
<version.cobertura.plugin>2.7</version.cobertura.plugin>
- <version.compiler.plugin>3.7.0</version.compiler.plugin>
+ <version.compiler.plugin>3.8.0</version.compiler.plugin>
<version.dashboard.plugin>1.0.0-beta-1</version.dashboard.plugin>
- <version.dependency.plugin>3.0.2</version.dependency.plugin>
- <version.deploy.plugin>2.8.2</version.deploy.plugin>
+ <version.dependency.plugin>3.1.1</version.dependency.plugin>
+ <version.deploy.plugin>3.0.0-M1</version.deploy.plugin>
<version.docck.plugin>1.1</version.docck.plugin>
<version.eclipse.plugin>2.10</version.eclipse.plugin>
- <version.enforcer.plugin>3.0.0-M1</version.enforcer.plugin>
+ <version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
<version.findbugs.plugin>3.0.5</version.findbugs.plugin>
<version.gpg.plugin>1.6</version.gpg.plugin>
- <version.install.plugin>2.5.2</version.install.plugin>
- <version.jar.plugin>3.0.2</version.jar.plugin>
+ <version.install.plugin>3.0.0-M1</version.install.plugin>
+ <version.jar.plugin>3.1.1</version.jar.plugin>
<version.javancss.plugin>2.1</version.javancss.plugin>
- <version.javadoc.plugin>3.0.0-M1</version.javadoc.plugin>
+ <version.javadoc.plugin>3.0.1</version.javadoc.plugin>
<version.jdepend.plugin>2.0</version.jdepend.plugin>
- <version.jxr.plugin>2.5</version.jxr.plugin>
- <version.model.plugin>3.5.2</version.model.plugin>
- <version.plexus.utils>3.1.0</version.plexus.utils>
- <version.plugin.plugin>3.5</version.plugin.plugin>
- <version.pmd.plugin>3.8</version.pmd.plugin>
+ <version.jxr.plugin>3.0.0</version.jxr.plugin>
+ <version.model.plugin>3.6.0</version.model.plugin>
+ <version.plexus.utils>3.1.1</version.plexus.utils>
+ <version.plugin.plugin>3.6.0</version.plugin.plugin>
+ <version.pmd.plugin>3.11.0</version.pmd.plugin>
<version.project.plugin>3.0-alpha-2</version.project.plugin>
- <version.project.info.report.plugin>2.9</version.project.info.report.plugin>
+ <version.project.info.report.plugin>3.0.0</version.project.info.report.plugin>
<version.rat.maven.plugin>1.0-alpha-3</version.rat.maven.plugin>
<version.release.plugin>2.5.3</version.release.plugin>
- <version.remote.resources.plugin>1.5</version.remote.resources.plugin>
- <version.resources.plugin>3.0.2</version.resources.plugin>
- <version.scm.plugin>1.9.5</version.scm.plugin>
- <version.site.plugin>3.6</version.site.plugin>
+ <version.remote.resources.plugin>1.6.0</version.remote.resources.plugin>
+ <version.resources.plugin>3.1.0</version.resources.plugin>
+ <version.scm.plugin>1.11.1</version.scm.plugin>
+ <version.site.plugin>3.7.1</version.site.plugin>
<version.source.plugin>3.0.1</version.source.plugin>
- <version.shade.plugin>3.1.0</version.shade.plugin>
- <version.surefire.plugin>2.20.1</version.surefire.plugin>
- <version.surfire.report.plugin>2.20.1</version.surfire.report.plugin>
+ <version.shade.plugin>3.2.1</version.shade.plugin>
+ <version.surefire.plugin>3.0.0-M3</version.surefire.plugin>
+ <version.surfire.report.plugin>3.0.0-M3</version.surfire.report.plugin>
<version.taglist.plugin>2.4</version.taglist.plugin>
<version.tools.maven.plugin>1.4</version.tools.maven.plugin>
- <version.versions.plugin>2.5</version.versions.plugin>
- <version.xbean.plugin>4.6</version.xbean.plugin>
+ <version.versions.plugin>2.7</version.versions.plugin>
+ <version.xbean.plugin>4.12</version.xbean.plugin>
<!-- Jars -->
<version.easymock>2.5.2</version.easymock>
@@ -146,15 +146,15 @@
<version.junit>4.12</version.junit>
<version.jzlib>1.1.3</version.jzlib>
<version.log4j>1.2.17</version.log4j>
- <version.ognl>3.2.4</version.ognl>
+ <version.ognl>3.2.10</version.ognl>
<version.pmd>4.3</version.pmd>
<version.rmock>2.0.2</version.rmock>
- <version.slf4j.api>1.7.25</version.slf4j.api>
- <version.slf4j.log4j12>1.7.25</version.slf4j.log4j12>
- <version.slf4j.jcl.over.slf4j>1.7.25</version.slf4j.jcl.over.slf4j>
+ <version.slf4j.api>1.7.26</version.slf4j.api>
+ <version.slf4j.log4j12>1.7.26</version.slf4j.log4j12>
+ <version.slf4j.jcl.over.slf4j>1.7.26</version.slf4j.jcl.over.slf4j>
<version.springframework>2.5.6.SEC03</version.springframework>
- <version.tomcat.jni>9.0.5</version.tomcat.jni>
- <version.xbean.spring>4.6</version.xbean.spring>
+ <version.tomcat.jni>9.0.16</version.tomcat.jni>
+ <version.xbean.spring>4.12</version.xbean.spring>
<!-- OSGi minimum versions -->
<osgi-min-version.slf4j.api>1.7</osgi-min-version.slf4j.api>
@@ -825,14 +825,14 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>3.0.0</version>
+ <version>3.3.2</version>
</dependency>
<!-- Add support for 'scpexe' -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
- <version>3.0.0</version>
+ <version>3.3.2</version>
</dependency>
</dependencies>
</plugin>
[mina] 03/03: [maven-release-plugin] prepare release 2.1.0
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 2.1.0
in repository https://gitbox.apache.org/repos/asf/mina.git
commit 09e23a29bc8554e34940f3b5b896a14c17912422
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Fri Feb 22 10:54:22 2019 +0100
[maven-release-plugin] prepare release 2.1.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 f7523e3..0909138 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>distribution</artifactId>
diff --git a/mina-core/pom.xml b/mina-core/pom.xml
index 7056043..489a8c6 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-core</artifactId>
diff --git a/mina-example/pom.xml b/mina-example/pom.xml
index 92be164..1f82e3e 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-example</artifactId>
diff --git a/mina-filter-compression/pom.xml b/mina-filter-compression/pom.xml
index 4766c19..17ae164 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-filter-compression</artifactId>
diff --git a/mina-http/pom.xml b/mina-http/pom.xml
index 72d0f62..ec19264 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-http</artifactId>
diff --git a/mina-integration-beans/pom.xml b/mina-integration-beans/pom.xml
index d2f89bc..3e4feec 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-integration-beans</artifactId>
diff --git a/mina-integration-jmx/pom.xml b/mina-integration-jmx/pom.xml
index 41f2459..d3712af 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-integration-jmx</artifactId>
diff --git a/mina-integration-ognl/pom.xml b/mina-integration-ognl/pom.xml
index dbb3a7e..182d304 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-integration-ognl</artifactId>
diff --git a/mina-integration-xbean/pom.xml b/mina-integration-xbean/pom.xml
index 5ff6d40..9180dcd 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/mina-legal/pom.xml b/mina-legal/pom.xml
index bebd795..edf72f5 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-legal</artifactId>
diff --git a/mina-statemachine/pom.xml b/mina-statemachine/pom.xml
index 43668e5..d13c0b9 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-statemachine</artifactId>
diff --git a/mina-transport-apr/pom.xml b/mina-transport-apr/pom.xml
index b388d65..1311a14 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-transport-apr</artifactId>
diff --git a/mina-transport-serial/pom.xml b/mina-transport-serial/pom.xml
index 6f38a05..14ba8c4 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.0-SNAPSHOT</version>
+ <version>2.1.0</version>
</parent>
<artifactId>mina-transport-serial</artifactId>
diff --git a/pom.xml b/pom.xml
index f904ecd..3715a97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
</organization>
<groupId>org.apache.mina</groupId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0</version>
<artifactId>mina-parent</artifactId>
<name>Apache MINA</name>
<packaging>pom</packaging>
@@ -55,7 +55,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/mina.git</connection>
<url>https://github.com/apache/mina/tree/2.0</url>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/mina.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>2.1.0</tag>
</scm>
<distributionManagement>
[mina] 02/03: Ported some more 2.0.20 changes
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 2.1.0
in repository https://gitbox.apache.org/repos/asf/mina.git
commit 724dfd497fd8ca07b368133bdca6d8ed8acac0c2
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Fri Feb 22 10:33:25 2019 +0100
Ported some more 2.0.20 changes
---
.../java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
index 78807ee..5fe4ca1 100644
--- a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
+++ b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoProcessor.java
@@ -1157,7 +1157,6 @@ public abstract class AbstractPollingIoProcessor<S extends AbstractIoSession> im
filterChain.fireExceptionCaught(e);
} finally {
try {
- clearWriteRequestQueue(session);
((AbstractIoService) session.getService()).getListeners().fireSessionDestroyed(session);
} catch (Exception e) {
// The session was either destroyed or not at this point.
@@ -1166,6 +1165,8 @@ public abstract class AbstractPollingIoProcessor<S extends AbstractIoSession> im
// the return value by bubbling up.
IoFilterChain filterChain = session.getFilterChain();
filterChain.fireExceptionCaught(e);
+ } finally {
+ clearWriteRequestQueue(session);
}
}