[slf4j-dev] svn commit: r750 - in slf4j/trunk: osgi-over-slf4j slf4j-api/src/main/resources/META-INF slf4j-osgi-integration-test slf4j-simple/src/main/resources/META-INF
ceki at slf4j.org
ceki at slf4j.org
Thu Feb 22 22:15:18 CET 2007
Author: ceki
Date: Thu Feb 22 22:15:18 2007
New Revision: 750
Modified:
slf4j/trunk/osgi-over-slf4j/pom.xml
slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-osgi-integration-test/pom.xml
slf4j/trunk/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
Log:
Seems to work better
Modified: slf4j/trunk/osgi-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/osgi-over-slf4j/pom.xml (original)
+++ slf4j/trunk/osgi-over-slf4j/pom.xml Thu Feb 22 22:15:18 2007
@@ -1,24 +1,24 @@
<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>
+ <parent>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.slf4j</groupId>
- <artifactId>osgi-over-slf4j</artifactId>
- <version>${parent.version}</version>
- <packaging>bundle</packaging>
- <name>OSGi LogService Implemented Over SLF4J</name>
-
- <url>http://www.slf4j.org</url>
- <description>
- OSGi LogService implementation over SLF4J
- </description>
-
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.slf4j</groupId>
+ <artifactId>osgi-over-slf4j</artifactId>
+ <version>${parent.version}</version>
+ <packaging>bundle</packaging>
+ <name>OSGi LogService Implemented Over SLF4J</name>
+
+ <url>http://www.slf4j.org</url>
+ <description>
+ OSGi LogService implementation over SLF4J
+ </description>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.compendium</artifactId>
<version>4.0</version>
<scope>provided</scope>
</dependency>
@@ -38,27 +38,24 @@
<artifactId>slf4j-simple</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.osgi.service.log
- </Export-Package>
- <Import-Package>org.slf4j;version="[1.3,1.4)",*</Import-Package>
- <Private-Package>org.slf4j.osgi.logservice.impl</Private-Package>
- <Bundle-Activator>org.slf4j.osgi.logservice.impl.Activator</Bundle-Activator>
- </instructions>
- </configuration>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.osgi.service.log</Export-Package>
+ <Import-Package>org.slf4j;version="[1.3,1.4)",*</Import-Package>
+ <Private-Package>org.slf4j.osgi.logservice.impl</Private-Package>
+ <Bundle-Activator>org.slf4j.osgi.logservice.impl.Activator</Bundle-Activator>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
- </build>
-
+ </build>
</project>
\ No newline at end of file
Modified: slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF (original)
+++ slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF Thu Feb 22 22:15:18 2007
@@ -4,4 +4,4 @@
Bundle-Name: slf4j-api
Bundle-Vendor: SLF4J.ORG
Export-Package: org.slf4j, org.slf4j.spi, org.slf4j.helpers
-Require-Bundle: org.slf4j.impl
+Import-Package: org.slf4j.impl
Modified: slf4j/trunk/slf4j-osgi-integration-test/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-osgi-integration-test/pom.xml (original)
+++ slf4j/trunk/slf4j-osgi-integration-test/pom.xml Thu Feb 22 22:15:18 2007
@@ -21,87 +21,87 @@
<description>
OSGi integration tests for the slf4j.
</description>
- <!-- These dependencies are deceptive they are only for the springframework testing env.
- bundles being tested are specified in the -->
+ <!-- These dependencies are deceptive they are only for the springframework testing env.
+ bundles being tested are specified in the -->
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-osgi-test-bundle</artifactId>
- <version>${parent.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>org.springframework.osgi.test</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-core</artifactId>
- <version>2.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-context</artifactId>
- <version>2.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-beans</artifactId>
- <version>2.1-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>jcl104-over-slf4j.osgi</artifactId>
- <version>1.1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j-full</artifactId>
- <version>1.1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>log4j.osgi</artifactId>
- <version>1.2.13-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-osgi-test-bundle</artifactId>
+ <version>${parent.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>org.springframework.osgi.test</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>jcl104-over-slf4j.osgi</artifactId>
+ <version>1.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j-full</artifactId>
+ <version>1.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>log4j.osgi</artifactId>
+ <version>1.2.13-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
Modified: slf4j/trunk/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF (original)
+++ slf4j/trunk/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF Thu Feb 22 22:15:18 2007
@@ -3,6 +3,6 @@
Bundle-SymbolicName: slf4j.simple
Bundle-Name: slf4j-simple
Bundle-Vendor: SLF4J.ORG
-Require-Bundle: slf4j.api
-Export-Package: org.slf4j.impl
-Import-Package: org.slf4j.spi, org.slf4j.helpers
+Require-Bundle: slf4j.api;visibility:=reexport
+Export-Package: org.slf4j, org.slf4j.spi, org.slf4j.impl
+Import-Package: org.slf4j, org.slf4j.spi, org.slf4j.helpers
More information about the slf4j-dev
mailing list