diff options
author | Ceki Gulcu <ceki@qos.ch> | 2015-03-26 12:24:52 +0100 |
---|---|---|
committer | Ceki Gulcu <ceki@qos.ch> | 2015-03-26 12:24:52 +0100 |
commit | 0ab0f6da6429853f97685209ac3798b156d9980e (patch) | |
tree | 5e05d071319fe7711c76e72b8ea72705d5260bf2 | |
parent | 8e0eeb14e482c0e2ca995f490c16ae1e4e7bc314 (diff) | |
download | slf4j-0ab0f6da6429853f97685209ac3798b156d9980e.tar.gz |
Change Bundle-RequiredExecutionEnvironment declaration in MANIFEST.MF files
Set the maven-compiler-plugin to target/source JDK 1.5 using a variable.
-rw-r--r-- | integration/src/IBUNDLE-META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF | 2 | ||||
-rwxr-xr-x | jul-to-slf4j/pom.xml | 4 | ||||
-rw-r--r-- | jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF | 2 | ||||
-rwxr-xr-x | pom.xml | 1 | ||||
-rw-r--r-- | slf4j-android/pom.xml | 4 | ||||
-rw-r--r-- | slf4j-api/src/main/resources/META-INF/MANIFEST.MF | 2 | ||||
-rwxr-xr-x | slf4j-ext/pom.xml | 4 | ||||
-rw-r--r-- | slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF | 2 | ||||
-rwxr-xr-x | slf4j-migrator/pom.xml | 4 | ||||
-rw-r--r-- | slf4j-nop/src/main/resources/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | slf4j-simple/src/main/resources/META-INF/MANIFEST.MF | 2 | ||||
-rwxr-xr-x | slf4j-site/src/site/pages/news.html | 11 |
16 files changed, 29 insertions, 19 deletions
diff --git a/integration/src/IBUNDLE-META-INF/MANIFEST.MF b/integration/src/IBUNDLE-META-INF/MANIFEST.MF index 10d04448..d518a2b6 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.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 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 a78719a4..d5233ea3 100644 --- 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.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.apache.commons.logging;version=1.1.1, org.apache.commons.logging.impl;version=1.1.1 Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion} diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 3f098442..47e7dbc2 100755 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -38,8 +38,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>${required.jdk.version}</source> + <target>${required.jdk.version}</target> </configuration> </plugin> <plugin> 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 1e2208d4..e1ab4c0d 100644 --- a/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -2,6 +2,6 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: jul.to.slf4j Bundle-Name: jul-to-slf4j Bundle-Vendor: SLF4J.ORG -Bundle-RequiredExecutionEnvironment: J2SE-1.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 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} 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 6703b640..531f5842 100644 --- a/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF +++ b/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: log4j.over.slf4j Bundle-Name: log4j-over-slf4j Bundle-Vendor: SLF4J.ORG -Bundle-RequiredExecutionEnvironment: J2SE-1.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.apache.log4j;version=${log4j.version},org.apache.log4j.helpers;version=${log4j.version},org.apache.log4j.spi;version=${log4j.version},org.apache.log4j.xml;version=${log4j.version} Import-Package: org.slf4j;version=${slf4j.api.minimum.compatible.version}, org.slf4j.helpers;version=${slf4j.api.minimum.compatible.version}, org.slf4j.spi;version=${slf4j.api.minimum.compatible.version} @@ -35,6 +35,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <required.jdk.version>1.5</required.jdk.version> <slf4j.api.minimum.compatible.version>1.6.0</slf4j.api.minimum.compatible.version> <cal10n.version>0.8.1</cal10n.version> <log4j.version>1.2.17</log4j.version> diff --git a/slf4j-android/pom.xml b/slf4j-android/pom.xml index bce3be5d..c6fbd907 100644 --- a/slf4j-android/pom.xml +++ b/slf4j-android/pom.xml @@ -53,8 +53,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>${required.jdk.version}</source> + <target>${required.jdk.version}</target> </configuration> </plugin> </plugins> diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF index 9dfbf9f4..2940ef8f 100644 --- a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: slf4j.api Bundle-Name: slf4j-api Bundle-Vendor: SLF4J.ORG -Bundle-RequiredExecutionEnvironment: J2SE-1.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion} Import-Package: org.slf4j.impl;version=${slf4j.api.minimum.compatible.version} diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index e9e21df3..223eac73 100755 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -53,8 +53,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>${required.jdk.version}</source> + <target>${required.jdk.version}</target> </configuration> </plugin> diff --git a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF index ea973a0d..a9ee90ef 100644 --- a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF +++ b/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: slf4j.jcl Bundle-Name: slf4j-jcl Bundle-Vendor: SLF4J.ORG Require-Bundle: slf4j.api -Bundle-RequiredExecutionEnvironment: J2SE-1.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} Import-Package: org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, org.apache.commons.logging Fragment-Host: slf4j.api
\ No newline at end of file diff --git a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF index 1593db31..bab3c6fe 100644 --- 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.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion} Fragment-Host: slf4j.api
\ No newline at end of file diff --git a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF index a76da1c9..23a42952 100644 --- 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.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion}, org.apache.log4j Fragment-Host: slf4j.api
\ No newline at end of file diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index f3798efc..104673be 100755 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -24,8 +24,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>${required.jdk.version}</source> + <target>${required.jdk.version}</target> </configuration> </plugin> diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF index 25891ad5..c009d03d 100644 --- 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.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion} Fragment-Host: slf4j.api
\ No newline at end of file diff --git a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF index 54c78bd6..897c9727 100644 --- 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.3 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.slf4j.impl;version=${parsedVersion.osgiVersion} Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}, org.slf4j.helpers;version=${parsedVersion.osgiVersion} Fragment-Host: slf4j.api
\ No newline at end of file diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 5cfb1e2d..ef0aac7e 100755 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -29,8 +29,17 @@ <hr noshade="noshade" size="1"/> - <h3>, 2015 - Release of SLF4J 1.7.11</h3> + <h3>March 26th, 2015 - Release of SLF4J 1.7.11</h3> + <p>As SLF4J requires JDK 1.5 or later, the + <code>Bundle-RequiredExecutionEnvironment</code> declaration in the + various MANIFEST files have been updated to J2SE-1.5. + </p> + + <p>Added missing Bundle-ManifestVersion attribute in the MANIFEST + files in log4j-over-slf4j. The issue was raised in <a + href="http://jira.qos.ch/browse/SLF4J-321">SLF4J-231</a> by Nikolas + Falco who also provided the the appropriate pull request. </p> <p>Added <code>setThreshold</code> method in <code>AppenderSkeleton</code> class in the log4j-over-slf4j |