diff --git a/integration/src/IBUNDLE-META-INF/MANIFEST.MF b/integration/src/IBUNDLE-META-INF/MANIFEST.MF index 2142088a..f7f1d5d3 100644 --- a/integration/src/IBUNDLE-META-INF/MANIFEST.MF +++ b/integration/src/IBUNDLE-META-INF/MANIFEST.MF @@ -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 \ No newline at end of file diff --git a/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF index bb1d43e4..a9f06fd5 100755 --- a/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -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} diff --git a/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF b/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF index 6e4ed9ee..d4f9ffb9 100644 --- a/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -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 diff --git a/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF index b63540aa..9518f15f 100755 --- a/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -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}, diff --git a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF index 73cebcfc..ce04dd8b 100644 --- a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -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} diff --git a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF index aee11701..3a3d458e 100644 --- a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF @@ -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 diff --git a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF index 602207f1..7251f31f 100755 --- a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF @@ -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}, diff --git a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF index fd9cfb24..9f7c363e 100755 --- a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF @@ -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}, diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF index f6e9dd48..73dc3c1c 100755 --- a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF @@ -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}, diff --git a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF index 7c1942a9..6b95a08a 100755 --- a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF @@ -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}, diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 3b443d7e..049c3c84 100755 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -48,6 +48,18 @@ SLF4J-233 by John Vasileff.
+In all relevant MANIFEST.MF files set the
+ Bundle-RequiredExecutionEnvironment directive to
+ JavaSE-1.6. This fixes SLF4J-449 as
+ reported by Larissa Smirnova.
In the slf4j-ext package, marked the ch.qos.cal10n package as optional. This fixes SLF4J-439 reported