natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix SLF4J-449

This commit is contained in:
Ceki Gulcu 2019-02-19 21:15:32 +01:00
parent 603ae2cb22
commit 458525e2e1
11 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/src/IBUNDLE-META-INF/MANIFEST.MF
View File

@ -10,6 +10,6 @@ Implementation-Title: iBundle
Bundle-ManifestVersion: 2
Bundle-SymbolicName: iBundle
Bundle-Name: abundle
Bundle-RequiredExecutionEnvironment: J2SE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: apack
Import-Package: org.osgi.framework, org.slf4j;version=1.5

2
jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: jcl.over.slf4j
Bundle-Name: jcl-over-slf4j
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.apache.commons.logging;version=1.2,
org.apache.commons.logging.impl;version=1.2
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}

2
jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: jul.to.slf4j
Bundle-Name: jul-to-slf4j
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.slf4j.bridge;version=${parsedVersion.osgiVersion};uses:="org.slf4j,org.slf4j.spi"
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},org.slf4j.spi;version=${parsedVersion.osgiVersion}
Automatic-Module-Name: jul.to.slf4j

2
log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: log4j.over.slf4j
Bundle-Name: log4j-over-slf4j
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.apache.log4j;version=${log4j.version},
org.apache.log4j.helpers;version=${log4j.version},
org.apache.log4j.spi;version=${log4j.version},

2
osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View File

@ -2,7 +2,7 @@ Implementation-Title: osgi-over-slf4j
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.slf4j.osgi-over-slf4j
Bundle-Name: OSGi LogService implemented over SLF4J
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Activator: org.slf4j.osgi.logservice.impl.Activator
Bundle-Category: osgi
Import-Package: org.osgi.framework;version="[1.5,2)",org.osgi.service.log;version="[1.3,2)",org.slf4j;version=${parsedVersion.osgiVersion}

2
slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.ext
Bundle-Name: slf4j-ext
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.slf4j.profiler;version=${parsedVersion.osgiVersion}, org.slf4j.cal10n;version=${parsedVersion.osgiVersion}, org.slf4j.ext;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, ch.qos.cal10n;version=${cal10n.version};resolution:=optional

2
slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.jdk14
Bundle-Name: slf4j-jdk14
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.slf4j.jul;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
org.slf4j.spi;version=${parsedVersion.osgiVersion},

2
slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.log4j12
Bundle-Name: slf4j-log4j12
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.slf4j.log4j12;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
org.slf4j.spi;version=${parsedVersion.osgiVersion},

2
slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
View File

@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: slf4j.nop
Bundle-Name: slf4j-nop
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.slf4j.nop;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
org.slf4j.spi;version=${parsedVersion.osgiVersion},

2
slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
View File

@ -4,7 +4,7 @@ Bundle-SymbolicName: slf4j.simple
Bundle-Name: slf4j-simple
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.slf4j.simple;version=${parsedVersion.osgiVersion}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion},
org.slf4j.spi;version=${parsedVersion.osgiVersion},

12
slf4j-site/src/site/pages/news.html
View File

@ -48,6 +48,18 @@
<a href="https://jira.qos.ch/browse/SLF4J-233">SLF4J-233</a> by
John Vasileff.</p>
<p>In all relevant <em>MANIFEST.MF</em> files set the
<code>Bundle-RequiredExecutionEnvironment</code> directive to
<code>JavaSE-1.6</code>. This fixes <a
href="https://jira.qos.ch/browse/SLF4J-449">SLF4J-449</a> as
reported by Larissa Smirnova.</p>
pdated the entry and corrected an issue loading slf4j with an
improper or unexpected execution environment <b
class="red">J2SE-1.6</b>, so changed the
Bundle-RequiredExecutionEnvironment from J2SE-1.6 to
<b>JavaSE-1.6</b>.
<p>In the slf4j-ext package, marked the ch.qos.cal10n package as
optional. This fixes <a
href="https://jira.qos.ch/browse/SLF4J-439">SLF4J-439</a> reported