[slf4j-dev] [GIT] SLF4J: Simple Logging Facade for Java branch, master, updated. v_1.6.1-7-g98dd559

added by portage for gitosis-gentoo git-noreply at pixie.qos.ch
Wed Sep 15 22:22:21 CEST 2010


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  98dd5599daccbe803ebf4ce6cff1200645de71b2 (commit)
       via  50318514414982bcd2e30106081ddb9f5b0ee916 (commit)
      from  277f8d74ce14805067943bcdc093f39e80a6c34e (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=98dd5599daccbe803ebf4ce6cff1200645de71b2
http://github.com/ceki/slf4j/commit/98dd5599daccbe803ebf4ce6cff1200645de71b2

commit 98dd5599daccbe803ebf4ce6cff1200645de71b2
Author: Heiko Seeberger <heiko.seeberger at googlemail.com>
Date:   Wed Sep 15 08:33:28 2010 +0200

    Added Pax Runner composite provisioning file for easily firing up an OSGi container.

diff --git a/.gitignore b/.gitignore
index 3d3547c..d84d4b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ target
 .scala_dependencies
 integration/bundle/
 integration/felix-cache/
+runner
+
diff --git a/slf4j.composite b/slf4j.composite
new file mode 100644
index 0000000..07f98f6
--- /dev/null
+++ b/slf4j.composite
@@ -0,0 +1,4 @@
+scan-bundle:file:slf4j-api/target/slf4j-api-1.6.2-SNAPSHOT.jar
+scan-bundle:file:slf4j-simple/target/slf4j-simple-1.6.2-SNAPSHOT.jar
+scan-bundle:file:slf4j-scala-api/target/slf4j-scala-api-1.6.2-SNAPSHOT.jar
+scan-bundle:mvn:http://scala-tools.org/repo-releases!com.weiglewilczek.scala-lang-osgi/scala-library/2.8.0

http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=50318514414982bcd2e30106081ddb9f5b0ee916
http://github.com/ceki/slf4j/commit/50318514414982bcd2e30106081ddb9f5b0ee916

commit 50318514414982bcd2e30106081ddb9f5b0ee916
Author: Heiko Seeberger <heiko.seeberger at googlemail.com>
Date:   Wed Sep 15 08:32:14 2010 +0200

    Added OSGi stuff to slf4j-scala-api, based on Felix Bundle plugin.

diff --git a/slf4j-scala-api/pom.xml b/slf4j-scala-api/pom.xml
index 63e07d3..7ab9ef1 100644
--- a/slf4j-scala-api/pom.xml
+++ b/slf4j-scala-api/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.slf4j</groupId>
   <artifactId>slf4j-scala-api</artifactId>
-  <packaging>jar</packaging><!-- TODO: Switch to bundle! -->
+  <packaging>bundle</packaging>
   <name>SLF4J Scala API Module</name>
 
   <url>http://www.slf4j.org</url>
@@ -98,6 +98,32 @@
           </includes>
         </configuration>
       </plugin>
+
+      <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>
+            <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>

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

Summary of changes:
 .gitignore              |    2 ++
 slf4j-scala-api/pom.xml |   28 +++++++++++++++++++++++++++-
 slf4j.composite         |    4 ++++
 3 files changed, 33 insertions(+), 1 deletions(-)
 create mode 100644 slf4j.composite


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


More information about the slf4j-dev mailing list