[slf4j-dev] branch, master, updated. v1.5.9.RC1-5-ge5bbca3
added by portage for gitosis-gentoo
git-noreply at pixie.qos.ch
Tue Nov 24 00:41:39 CET 2009
The branch, master has been updated
via e5bbca3f28f08327497f591c72b5aac429e15f65 (commit)
from 83b7bf33691bcff75575f9e9ea94e586f3e58469 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=e5bbca3f28f08327497f591c72b5aac429e15f65
http://github.com/ceki/slf4j/commit/e5bbca3f28f08327497f591c72b5aac429e15f65
commit e5bbca3f28f08327497f591c72b5aac429e15f65
Author: Ceki Gulcu <ceki at qos.ch>
Date: Tue Nov 24 00:21:59 2009 +0100
Applied Hugues Malphettes's patch #65 as given in [1]
[1] http://bugzilla.slf4j.org/show_bug.cgi?id=152
diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml
index 100fae0..bee0bd5 100644
--- a/jcl-over-slf4j/pom.xml
+++ b/jcl-over-slf4j/pom.xml
@@ -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>
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 3a39037..390f3c1 100644
--- a/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
+++ b/jcl-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
@@ -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}
diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index b340f98..4f4c621 100644
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index a81545d..ad9ef2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index e2f5002..42e3133 100644
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -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>
diff --git a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
index 9cb6230..732e527 100644
--- a/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
@@ -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}
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
index 1867652..1aec725 100644
--- a/slf4j-ext/pom.xml
+++ b/slf4j-ext/pom.xml
@@ -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>
diff --git a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
index 2235ed7..f90c7af 100644
--- a/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-ext/src/main/resources/META-INF/MANIFEST.MF
@@ -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}
diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml
index 6859807..49cdfd4 100644
--- a/slf4j-jcl/pom.xml
+++ b/slf4j-jcl/pom.xml
@@ -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>
diff --git a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
index fa43185..a905c8f 100644
--- a/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
@@ -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
\ No newline at end of file
diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml
index ab33b77..ab08cac 100644
--- a/slf4j-jdk14/pom.xml
+++ b/slf4j-jdk14/pom.xml
@@ -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>
diff --git a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
index 5bb3ad9..4838f9d 100644
--- a/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
@@ -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
\ No newline at end of file
diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml
index 2082425..6719753 100644
--- a/slf4j-log4j12/pom.xml
+++ b/slf4j-log4j12/pom.xml
@@ -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>
diff --git a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
index 1de0956..d925dcc 100644
--- a/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
@@ -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
\ No newline at end of file
diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml
index 1175b87..10b80cb 100644
--- a/slf4j-nop/pom.xml
+++ b/slf4j-nop/pom.xml
@@ -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>
diff --git a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
index 970f28e..3623e74 100644
--- a/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
@@ -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
\ No newline at end of file
diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml
index 0ecee77..8fb801a 100644
--- a/slf4j-simple/pom.xml
+++ b/slf4j-simple/pom.xml
@@ -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>
diff --git a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
index 84ebee0..b2aa0c0 100644
--- a/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
+++ b/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
@@ -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
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
jcl-over-slf4j/pom.xml | 2 +-
.../src/main/resources/META-INF/MANIFEST.MF | 2 +-
log4j-over-slf4j/pom.xml | 2 +-
pom.xml | 15 +++++++++++++++
slf4j-api/pom.xml | 2 +-
slf4j-api/src/main/resources/META-INF/MANIFEST.MF | 2 +-
slf4j-ext/pom.xml | 2 +-
slf4j-ext/src/main/resources/META-INF/MANIFEST.MF | 4 ++--
slf4j-jcl/pom.xml | 2 +-
slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF | 4 ++--
slf4j-jdk14/pom.xml | 2 +-
.../src/main/resources/META-INF/MANIFEST.MF | 4 ++--
slf4j-log4j12/pom.xml | 2 +-
.../src/main/resources/META-INF/MANIFEST.MF | 4 ++--
slf4j-nop/pom.xml | 2 +-
slf4j-nop/src/main/resources/META-INF/MANIFEST.MF | 4 ++--
slf4j-simple/pom.xml | 2 +-
.../src/main/resources/META-INF/MANIFEST.MF | 4 ++--
18 files changed, 38 insertions(+), 23 deletions(-)
hooks/post-receive
--
SLF4J: Simple Logging Facade for Java
More information about the slf4j-dev
mailing list