From 73e47695629f147eda618f3cbffc4631d6f0e8e9 Mon Sep 17 00:00:00 2001
From: Heiko Seeberger <heiko.seeberger@googlemail.com>
Date: Thu, 16 Sep 2010 09:29:04 +0200
Subject: [PATCH 1/2] OSGi work: Moved common configuration of Felix Bundle
 plugin to parent POM.

---
 pom.xml                 | 19 ++++++++++++
 slf4j-scala-api/pom.xml | 69 +----------------------------------------
 2 files changed, 20 insertions(+), 68 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5f688b0c..49421f0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,25 @@
       </resource>
     </resources>
 
+    <pluginManagement>
+      <plugins>
+
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.1.0</version>
+          <extensions>true</extensions>
+          <configuration>
+            <instructions>
+              <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
+              <_versionpolicy>[$(@),$(version;=+;$(@)))</_versionpolicy>
+            </instructions>
+          </configuration>
+        </plugin>
+        
+      </plugins>
+    </pluginManagement>
+
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/slf4j-scala-api/pom.xml b/slf4j-scala-api/pom.xml
index 7ab9ef15..7960e601 100644
--- a/slf4j-scala-api/pom.xml
+++ b/slf4j-scala-api/pom.xml
@@ -102,86 +102,19 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.1.0</version>
-        <extensions>true</extensions>
-        <!--executions>
-          <execution>
-            <goals>
-              <goal>bundle</goal>
-            </goals>
-          </execution>
-        </executions-->
         <configuration>
           <instructions>
+            <!-- We need at least Java 5 for Scala 2.8! -->
             <Bundle-RequiredExecutionEnvironment>J2SE-1.5,JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
             <Export-Package>org.slf4j.scala.*;version="${project.version}"</Export-Package>
             <Import-Package>
               scala.*;version="[${scala.version},${scala.version}]",
               *
             </Import-Package>
-            <_versionpolicy>[$(@),$(version;=+;$(@)))</_versionpolicy>
           </instructions>
         </configuration>
       </plugin>
 
-      <!--plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <forkMode>once</forkMode>
-          <reportFormat>plain</reportFormat>
-          <trimStackTrace>false</trimStackTrace>
-          <excludes>
-            <exclude>**/AllTest.java</exclude>
-            <exclude>**/PackageTest.java</exclude>
-          </excludes>
-        </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>
-        <executions>
-          <execution>
-            <id>bundle-test-jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin-->
-
-      <!--plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals>
-             <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <tasks>
-            <echo>Removing slf4j-api's dummy StaticLoggerBinder and StaticMarkerBinder</echo>
-            <delete dir="target/classes/org/slf4j/impl"/>
-          </tasks>
-        </configuration>
-      </plugin-->
-
     </plugins>
 
   </build>

From 7e9992fde390cf5ac6a969b61f10138192ba2d5a Mon Sep 17 00:00:00 2001
From: Heiko Seeberger <heiko.seeberger@googlemail.com>
Date: Thu, 16 Sep 2010 09:52:04 +0200
Subject: [PATCH 2/2] OSGi work: Using Felix Bundle plugin (BND) for slf4j-api
 now. Excluded org.slf4j.impl package from imported packages.

---
 slf4j-api/pom.xml       | 23 +++++++++++++++++++----
 slf4j-scala-api/pom.xml |  4 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml
index 4e3be809..2518e372 100644
--- a/slf4j-api/pom.xml
+++ b/slf4j-api/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.slf4j</groupId>
   <artifactId>slf4j-api</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>SLF4J API Module</name>
 
   <url>http://www.slf4j.org</url>
@@ -20,7 +20,7 @@
 
   <dependencies>
 
-  </dependencies> 
+  </dependencies>
 
   <build>
     <plugins>
@@ -39,6 +39,21 @@
       </plugin>
 
       <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>org.slf4j.*;version="${project.version}"</Export-Package>
+            <Import-Package>
+              !org.slf4j.impl.*,
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+
+      <!-- That will be done by the Felix Bundle plugin (BND)! -->
+      <!--plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
@@ -61,7 +76,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
+      </plugin-->
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -85,7 +100,7 @@
     </plugins>
 
   </build>
-  
+
   <reporting>
     <plugins>
       <plugin>
diff --git a/slf4j-scala-api/pom.xml b/slf4j-scala-api/pom.xml
index 7960e601..9ce57f28 100644
--- a/slf4j-scala-api/pom.xml
+++ b/slf4j-scala-api/pom.xml
@@ -57,7 +57,7 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-  </dependencies> 
+  </dependencies>
 
   <build>
     <plugins>
@@ -118,7 +118,7 @@
     </plugins>
 
   </build>
-  
+
   <reporting>
     <plugins>
       <plugin>