Skip to content

Commit

Permalink
fix SLF4J-449
Browse files Browse the repository at this point in the history
  • Loading branch information
@ceki
ceki committed Feb 19, 2019
1 parent 603ae2c commit 458525e
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 10 deletions.
2 changes: 1 addition & 1 deletion integration/src/IBUNDLE-META-INF/MANIFEST.MF
View file
Expand Up @@ -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 changes: 1 addition & 1 deletion jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View file
Expand Up @@ -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 changes: 1 addition & 1 deletion jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF
View file
Expand Up @@ -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 changes: 1 addition & 1 deletion log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View file
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
View file
Expand Up @@ -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 changes: 1 addition & 1 deletion slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
View file
Expand Up @@ -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 changes: 1 addition & 1 deletion slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
View file
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
View file
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
View file
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
View file
Expand Up @@ -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},
Expand Down
12 changes: 12 additions & 0 deletions slf4j-site/src/site/pages/news.html
View file
Expand Up @@ -48,6 +48,18 @@ <h3>2019 - Release of SLF4J 1.8.0-beta5</h3>
<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
Expand Down

1 comment on commit 458525e

@rgansevles
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix does not seem to be complete, please see my pull request #205

Please sign in to comment.