This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via f9270abea533d957fecbd7edcbff04fe90a05844 (commit) from 393d8899a64ae7562afe44105b7938b0fd9218a9 (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=f9270abea533d957fecbd7edcbf... http://github.com/ceki/slf4j/commit/f9270abea533d957fecbd7edcbff04fe90a05844 commit f9270abea533d957fecbd7edcbff04fe90a05844 Author: Ceki Gulcu <ceki@qos.ch> Date: Sun Oct 16 23:43:08 2011 +0200 fix bug #166 diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index f5e466a..da850be 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -1,26 +1,26 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.2</version> - </parent> - - <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-parent</artifactId> + <version>1.6.2</version> + </parent> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> + <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - <name>JUL to SLF4J bridge</name> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> - <url>http://www.slf4j.org</url> - <description> - JUL to SLF4J bridge - </description> + <packaging>jar</packaging> + <name>JUL to SLF4J bridge</name> + + <url>http://www.slf4j.org</url> + <description> + JUL to SLF4J bridge + </description> <dependencies> <dependency> @@ -32,20 +32,34 @@ <artifactId>slf4j-log4j12</artifactId> <version>${project.version}</version> <scope>test</scope> - </dependency> + </dependency> </dependencies> <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> + <Bundle-Description>${project.description}</Bundle-Description> + <Implementation-Version>${project.version} + </Implementation-Version> + </manifestEntries> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> </plugins> </build> diff --git a/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF b/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..1e2208d --- /dev/null +++ b/jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,7 @@ +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: jul.to.slf4j +Bundle-Name: jul-to-slf4j +Bundle-Vendor: SLF4J.ORG +Bundle-RequiredExecutionEnvironment: J2SE-1.3 +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/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 8a14cb9..fca7e36 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -38,6 +38,10 @@ reported by Ralph Goers. </p> + <p>Added missing OSGi manifest to the jul-to-slf4j module. This + fixes <a href="http://bugzilla.slf4j.org/show_bug.cgi?id=166">bug + #166</a> reported by Ekkehard Gentz. </p> + <p>In the log4j-over-slf4j module, added missing <code>getAllAppenders</code>() method in <code>Category</code> class. This fixes <a ----------------------------------------------------------------------- Summary of changes: jul-to-slf4j/pom.xml | 74 ++++++++++++-------- .../src/main/resources/META-INF/MANIFEST.MF | 7 ++ slf4j-site/src/site/pages/news.html | 4 + 3 files changed, 55 insertions(+), 30 deletions(-) create mode 100644 jul-to-slf4j/src/main/resources/META-INF/MANIFEST.MF hooks/post-receive -- SLF4J: Simple Logging Facade for Java