[slf4j-dev] branch, master, updated. aec79d97acacb680a1a611aa134c50dd6a3014af

[added by portage for gitosis-gentoo]

The branch, master has been updated
       via  aec79d97acacb680a1a611aa134c50dd6a3014af (commit)
      from  e3f037a8d92c04e6d831c8a15f1b6576ebc943b5 (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=aec79d97acacb680a1a611aa134c50dd6a3014af
http://github.com/ceki/slf4j/commit/aec79d97acacb680a1a611aa134c50dd6a3014af

commit aec79d97acacb680a1a611aa134c50dd6a3014af
Author: Ceki Gulcu <ceki at qos.ch>
Date:   Fri Sep 4 20:16:00 2009 +0200

    Fixed http://bugzilla.slf4j.org/show_bug.cgi?id=117

diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml
index 63b64c0..4917e7e 100644
--- a/log4j-over-slf4j/pom.xml
+++ b/log4j-over-slf4j/pom.xml
@@ -51,15 +51,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>bundle-test-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>           
-            </goals>
-          </execution>
-        </executions>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${project.version}</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/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7d575ff
--- /dev/null
+++ b/log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Implementation-Title: log4j-over-slf4j
+Bundle-SymbolicName: log4j.over.slf4j
+Bundle-Name: log4j-over-slf4j
+Bundle-Vendor: SLF4J.ORG
+Export-Package: org.apache.log4j
+Import-Package: org.slf4j, org.slf4j.spi
diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html
index d9e8361..0cfab9b 100644
--- a/slf4j-site/src/site/pages/news.html
+++ b/slf4j-site/src/site/pages/news.html
@@ -56,7 +56,10 @@
   href="http://bugzilla.slf4j.org/show_bug.cgi?id=146">bug report
   146</a> by Dapeng Ni.</p>
 
-
+  <p>Added missing OSGi manifest to the <em>log4j-over-slf4j</em>
+  module as requested by Wade Poziombka in <a
+  href="http://bugzilla.slf4j.org/show_bug.cgi?id=117">bug 117</a>.
+  </p>
 
   <hr noshade="noshade" size="1"/>
 

-----------------------------------------------------------------------

Summary of changes:
 log4j-over-slf4j/pom.xml                           |   19 ++++++++++---------
 .../src/main/resources/META-INF/MANIFEST.MF        |    6 ++++++
 slf4j-site/src/site/pages/news.html                |    5 ++++-
 3 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 log4j-over-slf4j/src/main/resources/META-INF/MANIFEST.MF


hooks/post-receive
-- 
SLF4J: Simple Logging Facade for Java