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

Applied Hugues Malphettes's patch #65 as given in [1] 

[1] http://bugzilla.slf4j.org/show_bug.cgi?id=152
This commit is contained in:
Ceki Gulcu 2009-11-24 00:21:59 +01:00
parent 83b7bf3369
commit e5bbca3f28
18 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jcl-over-slf4j/pom.xml
View File

@ -49,7 +49,7 @@
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>

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

@ -6,4 +6,4 @@ Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.3
Export-Package: org.apache.commons.logging;version=1.1.1,
org.apache.commons.logging.impl;version=1.1.1
Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}
Import-Package: org.slf4j;version=${parsedVersion.osgiVersion}, org.slf4j.spi;version=${parsedVersion.osgiVersion}

2
log4j-over-slf4j/pom.xml
View File

@ -54,7 +54,7 @@
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>

15
pom.xml
View File

@ -176,6 +176,21 @@
</configuration>
</plugin>
<!-- as suggested in http://bugzilla.slf4j.org/show_bug.cgi?id=152 -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.3</version>
<executions>
<execution>
<id>parse-version</id>
<goals>
<goal>parse-version</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

2
slf4j-api/pom.xml
View File

@ -44,7 +44,7 @@
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>

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

@ -4,5 +4,5 @@ Bundle-SymbolicName: slf4j.api
Bundle-Name: slf4j-api
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.3
Export-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}
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}

2
slf4j-ext/pom.xml
View File

@ -81,7 +81,7 @@
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
<Premain-Class>org.slf4j.agent.AgentPremain</Premain-Class>

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

@ -4,5 +4,5 @@ Bundle-SymbolicName: slf4j.ext
Bundle-Name: slf4j-log4j12
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.slf4j.profiler;version=${project.version}, org.slf4j.cal10n;version=${project.version}, org.slf4j.ext;version=${project.version}
Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}, ch.qos.cal10n;version=${cal10n.version}
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}

2
slf4j-jcl/pom.xml
View File

@ -41,7 +41,7 @@
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>

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

@ -5,6 +5,6 @@ Bundle-Name: slf4j-jcl
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api
Bundle-RequiredExecutionEnvironment: J2SE-1.3
Export-Package: org.slf4j.impl;version=${project.version}
Import-Package: org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}, org.apache.commons.logging
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

2
slf4j-jdk14/pom.xml
View File

@ -55,7 +55,7 @@
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>

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

@ -4,6 +4,6 @@ Bundle-SymbolicName: slf4j.jdk14
Bundle-Name: slf4j-jdk14
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.3
Export-Package: org.slf4j.impl;version=${project.version}
Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}
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

2
slf4j-log4j12/pom.xml
View File

@ -42,7 +42,7 @@
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>

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

@ -4,6 +4,6 @@ Bundle-SymbolicName: slf4j.log4j12
Bundle-Name: slf4j-log4j12
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.3
Export-Package: org.slf4j.impl;version=${project.version}
Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}, org.apache.log4j
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

2
slf4j-nop/pom.xml
View File

@ -37,7 +37,7 @@
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>

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

@ -4,6 +4,6 @@ Bundle-SymbolicName: slf4j.nop
Bundle-Name: slf4j-nop
Bundle-Vendor: SLF4J.ORG
Bundle-RequiredExecutionEnvironment: J2SE-1.3
Export-Package: org.slf4j.impl;version=${project.version}
Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}
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

2
slf4j-simple/pom.xml
View File

@ -32,7 +32,7 @@
<configuration>
<archive>
<manifestEntries>
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>

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

@ -5,6 +5,6 @@ Bundle-Name: slf4j-simple
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api
Bundle-RequiredExecutionEnvironment: J2SE-1.3
Export-Package: org.slf4j.impl;version=${project.version}
Import-Package: org.slf4j;version=${project.version}, org.slf4j.spi;version=${project.version}, org.slf4j.helpers;version=${project.version}
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