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 2015/10/05 19:38:31 UTC
mina git commit: Applied patch for DIRMINA-1070
Repository: mina
Updated Branches:
refs/heads/2.0 10b7d7f5d -> b7e9732c3
Applied patch for DIRMINA-1070
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/b7e9732c
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/b7e9732c
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/b7e9732c
Branch: refs/heads/2.0
Commit: b7e9732c324e074857cbe0d506ce21f6a4123adc
Parents: 10b7d7f
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Oct 5 19:38:17 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Oct 5 19:38:17 2015 +0200
----------------------------------------------------------------------
mina-core/pom.xml | 2 +-
mina-filter-compression/pom.xml | 2 +-
mina-http/pom.xml | 2 +-
mina-integration-jmx/pom.xml | 2 +-
mina-statemachine/pom.xml | 2 +-
mina-transport-serial/pom.xml | 2 +-
pom.xml | 3 +++
7 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/b7e9732c/mina-core/pom.xml
----------------------------------------------------------------------
diff --git a/mina-core/pom.xml b/mina-core/pom.xml
index 03ec79c..0d25c87 100644
--- a/mina-core/pom.xml
+++ b/mina-core/pom.xml
@@ -97,7 +97,7 @@
org.apache.mina.util.byteaccess;version=${project.version};-noimport:=true
</Export-Package>
<Import-Package>
- javax.crypto,javax.crypto.spec,javax.net.ssl,javax.security.sasl,org.slf4j;version=${version.slf4j.api}
+ javax.crypto,javax.crypto.spec,javax.net.ssl,javax.security.sasl,org.slf4j;version=${osgi-min-version.slf4j.api}
</Import-Package>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/mina/blob/b7e9732c/mina-filter-compression/pom.xml
----------------------------------------------------------------------
diff --git a/mina-filter-compression/pom.xml b/mina-filter-compression/pom.xml
index c26936b..2732231 100644
--- a/mina-filter-compression/pom.xml
+++ b/mina-filter-compression/pom.xml
@@ -71,7 +71,7 @@
org.apache.mina.core.write;version=${project.version},
org.apache.mina.filter.util;version=${project.version},
com.jcraft.jzlib;version=${version.jzlib},
- org.slf4j;version=${version.slf4j.api}
+ org.slf4j;version=${osgi-min-version.slf4j.api}
</Import-Package>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/mina/blob/b7e9732c/mina-http/pom.xml
----------------------------------------------------------------------
diff --git a/mina-http/pom.xml b/mina-http/pom.xml
index 8a7486c..0bfc7ae 100644
--- a/mina-http/pom.xml
+++ b/mina-http/pom.xml
@@ -60,7 +60,7 @@
org.apache.mina.core.filterchain;version=${project.version},
org.apache.mina.core.session;version=${project.version},
org.apache.mina.filter.codec;version=${project.version},
- org.slf4j;version=${version.slf4j.api}
+ org.slf4j;version=${osgi-min-version.slf4j.api}
</Import-Package>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/mina/blob/b7e9732c/mina-integration-jmx/pom.xml
----------------------------------------------------------------------
diff --git a/mina-integration-jmx/pom.xml b/mina-integration-jmx/pom.xml
index 1282ae2..7f17a88 100644
--- a/mina-integration-jmx/pom.xml
+++ b/mina-integration-jmx/pom.xml
@@ -80,7 +80,7 @@
org.apache.mina.core.session;version=${project.version},
org.apache.mina.filter.executor;version=${project.version},
org.apache.mina.integration.beans;version=${project.version},
- org.slf4j;version=${version.slf4j.api}
+ org.slf4j;version=${osgi-min-version.slf4j.api}
</Import-Package>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/mina/blob/b7e9732c/mina-statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/mina-statemachine/pom.xml b/mina-statemachine/pom.xml
index 24aeb2b..fcb5911 100644
--- a/mina-statemachine/pom.xml
+++ b/mina-statemachine/pom.xml
@@ -76,7 +76,7 @@
org.apache.mina.core.filterchain;version=${project.version},
org.apache.mina.core.service;version=${project.version},
org.apache.mina.core.session;version=${project.version},
- org.slf4j;version=${version.slf4j.api}
+ org.slf4j;version=${osgi-min-version.slf4j.api}
</Import-Package>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/mina/blob/b7e9732c/mina-transport-serial/pom.xml
----------------------------------------------------------------------
diff --git a/mina-transport-serial/pom.xml b/mina-transport-serial/pom.xml
index d72d74d..20c51c1 100644
--- a/mina-transport-serial/pom.xml
+++ b/mina-transport-serial/pom.xml
@@ -83,7 +83,7 @@
org.apache.mina.core.write;version=${project.version},
org.apache.mina.integration.beans;version=${project.version},
org.apache.mina.util;version=${project.version},
- org.slf4j;version=${version.slf4j.api}
+ org.slf4j;version=${osgi-min-version.slf4j.api}
</Import-Package>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/mina/blob/b7e9732c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 39ab725..0929484 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,9 @@
<version.springframework>2.5.6.SEC03</version.springframework>
<version.tomcat.jni>8.0.27</version.tomcat.jni>
<version.xbean.spring>4.4</version.xbean.spring>
+
+ <!-- OSGi minimum versions -->
+ <osgi-min-version.slf4j.api>1.7</osgi-min-version.slf4j.api>
</properties>
<modules>