Author: ceki
Date: Wed Feb 21 23:24:09 2007
New Revision: 743
Added:
slf4j/trunk/slf4j-api/src/main/resources/META-INF/
slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/
slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
Modified:
slf4j/trunk/slf4j-api/pom.xml
slf4j/trunk/slf4j-jdk14/pom.xml
slf4j/trunk/slf4j-log4j12/pom.xml
slf4j/trunk/slf4j-nop/pom.xml
slf4j/trunk/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-simple/pom.xml
Log:
Moving to the older MANIFEST.MF style
Modified: slf4j/trunk/slf4j-api/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-api/pom.xml (original)
+++ slf4j/trunk/slf4j-api/pom.xml Wed Feb 21 23:24:09 2007
@@ -42,6 +42,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Version>1.3.0.SNAPSHOT</Bundle-Version>
+ <Bundle-Description>${project.description}</Bundle-Description>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ </manifestEntries>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
<executions>
<execution>
<id>bundle-test-jar</id>
Added: slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- (empty file)
+++ slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF Wed Feb
21 23:24:09 2007
@@ -0,0 +1,8 @@
+Implementation-Title: slf4j-api
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: slf4j.api
+Bundle-Name: slf4j-api
+Bundle-Vendor: SLF4J.ORG
+Export-Package: org.slf4j
+ org.slf4j.spi,
+ org.slf4j.helpers
\ No newline at end of file
Modified: slf4j/trunk/slf4j-jdk14/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jdk14/pom.xml (original)
+++ slf4j/trunk/slf4j-jdk14/pom.xml Wed Feb 21 23:24:09 2007
@@ -43,23 +43,19 @@
</configuration>
</plugin>
- <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.slf4j;version=1.3,
org.slf4j.spi;version=1.3
- </Export-Package>
- <Private-Package>
- org.slf4j.impl,
org.slf4j.helpers
- </Private-Package>
-
<Import-Package>!org.slf4j.*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Version>${project.version}</Bundle-Version>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ </manifestEntries>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
Added: slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- (empty file)
+++ slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF Wed Feb
21 23:24:09 2007
@@ -0,0 +1,9 @@
+Implementation-Title: slf4j-jdk14
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: slf4j.jdk14
+Bundle-Name: slf4j-jdk14
+Bundle-Vendor: SLF4J.ORG
+Require-Bundle: slf4j.api;visibility:=reexport
+Export-Package: org.slf4j, org.slf4j.impl
+Import-Package: org.slf4j.spi, org.slf4j.helpers
+Bundle-ClassPath: ., target/classes/
\ No newline at end of file
Modified: slf4j/trunk/slf4j-log4j12/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-log4j12/pom.xml (original)
+++ slf4j/trunk/slf4j-log4j12/pom.xml Wed Feb 21 23:24:09 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,25 +39,20 @@
<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.slf4j;version=1.3,
org.slf4j.spi;version=1.3
- </Export-Package>
- <Private-Package>
- org.slf4j.impl, org.slf4j.helpers
- </Private-Package>
- <Import-Package>org.apache.log4j,
!org.slf4j.*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Version>${project.version}</Bundle-Version>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ </manifestEntries>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
Modified: slf4j/trunk/slf4j-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml (original)
+++ slf4j/trunk/slf4j-nop/pom.xml Wed Feb 21 23:24:09 2007
@@ -29,30 +29,25 @@
<version>${project.version}</version>
</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.slf4j;version=1.3,
org.slf4j.spi;version=1.3
- </Export-Package>
- <Private-Package>
- org.slf4j.impl,
org.slf4j.helpers
- </Private-Package>
-
<Import-Package>!org.slf4j.*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Version>${project.version}</Bundle-Version>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ </manifestEntries>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
</project>
\ No newline at end of file
Modified: slf4j/trunk/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF Wed Feb
21 23:24:09 2007
@@ -1,7 +1,7 @@
-Implementation-Title: slf4j-simple
+Implementation-Title: slf4j-nop
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: slf4j.simple
-Bundle-Name: slf4j-simple
+Bundle-SymbolicName: slf4j.nop
+Bundle-Name: slf4j-nop
Bundle-Vendor: SLF4J.ORG
Require-Bundle: slf4j.api;visibility:=reexport
Export-Package: org.slf4j, org.slf4j.impl
Modified: slf4j/trunk/slf4j-simple/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-simple/pom.xml (original)
+++ slf4j/trunk/slf4j-simple/pom.xml Wed Feb 21 23:24:09 2007
@@ -28,25 +28,22 @@
</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.slf4j;version=1.3,
org.slf4j.spi;version=1.3
- </Export-Package>
- <Private-Package>
- org.slf4j.impl,
org.slf4j.helpers
- </Private-Package>
-
<Import-Package>!org.slf4j.*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Version>${project.version}</Bundle-Version>
+
<Implementation-Version>${project.version}</Implementation-Version>
+ </manifestEntries>
+
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
_______________________________________________
dev mailing list
[email protected]
http://www.slf4j.org/mailman/listinfo/dev
