Author: ceki
Date: Thu Feb 22 20:15:56 2007
New Revision: 748
Modified:
slf4j/trunk/jcl104-over-slf4j/pom.xml
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-api/pom.xml
slf4j/trunk/slf4j-api/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-jcl/pom.xml
slf4j/trunk/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-jdk14/pom.xml
slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-log4j12/pom.xml
slf4j/trunk/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-nop/pom.xml
slf4j/trunk/slf4j-nop/src/main/resources/META-INF/MANIFEST.MF
slf4j/trunk/slf4j-simple/pom.xml
slf4j/trunk/slf4j-simple/src/main/resources/META-INF/MANIFEST.MF
Log:
- Attempted to restore the state of the various MANIFEST.MF files
where John E. Conlon left them previously.
The project builds properly. I have yet to test/exercise the various
OSGi modules.
- Instead of manually editing the <Bundle-Version> element manually
for each module, it is injected using the ${project_version_for_osgi}
property as set in the parent pom.xml file.
Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml Thu Feb 22 20:15:56 2007
@@ -11,7 +11,7 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
<version>${parent.version}</version>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<name>JCL Implemented Over SLF4J</name>
<url>http://www.slf4j.org</url>
@@ -30,20 +30,19 @@
<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.apache.commons.logging;version=1.0.4
- </Export-Package>
-
<Private-Package>org.apache.commons.logging.impl</Private-Package>
- <Import-Package>org.slf4j;version="[1.3,1.4)",
org.slf4j.spi;version="[1.3,1.4)"</Import-Package>
- </instructions>
- </configuration>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Version>${project_version_for_osgi}</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>
</plugin>
</plugins>
</build>
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Thu Feb 22 20:15:56 2007
@@ -18,6 +18,10 @@
</organization>
<inceptionYear>2005</inceptionYear>
+ <properties>
+ <project_version_for_osgi>1.3.0.SNAPSHOT</project_version_for_osgi>
+ </properties>
+
<modules>
<module>slf4j-api</module>
<module>slf4j-simple</module>
Modified: slf4j/trunk/slf4j-api/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-api/pom.xml (original)
+++ slf4j/trunk/slf4j-api/pom.xml Thu Feb 22 20:15:56 2007
@@ -45,7 +45,7 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>1.3.0.SNAPSHOT</Bundle-Version>
+ <Bundle-Version>${project_version_for_osgi}</Bundle-Version>
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
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 20:15:56 2007
@@ -5,4 +5,5 @@
Bundle-Vendor: SLF4J.ORG
Export-Package: org.slf4j
org.slf4j.spi,
- org.slf4j.helpers
\ No newline at end of file
+ org.slf4j.helpers
+Require-Bundle: org.slf4j.impl
Modified: slf4j/trunk/slf4j-jcl/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jcl/pom.xml (original)
+++ slf4j/trunk/slf4j-jcl/pom.xml Thu Feb 22 20:15:56 2007
@@ -1,4 +1,4 @@
-<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";>
+<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>
@@ -36,24 +36,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.*,!org.apache.avalon.framework.logger,*</Import-Package>
- </instructions>
- </configuration>
- </plugin>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Version>${project_version_for_osgi}</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>
+ </plugin>
+
</plugins>
</build>
Modified: slf4j/trunk/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-jcl/src/main/resources/META-INF/MANIFEST.MF Thu Feb
22 20:15:56 2007
@@ -3,7 +3,6 @@
Bundle-SymbolicName: slf4j.jcl
Bundle-Name: slf4j-jcl
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/
+Require-Bundle: slf4j.api
+Export-Package: org.slf4j.impl
+Import-Package: org.slf4j.spi, org.slf4j.helpers, org.apache.commons.logging
Modified: slf4j/trunk/slf4j-jdk14/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jdk14/pom.xml (original)
+++ slf4j/trunk/slf4j-jdk14/pom.xml Thu Feb 22 20:15:56 2007
@@ -45,18 +45,19 @@
<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>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-Version>${project_version_for_osgi}</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>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
Modified: slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-jdk14/src/main/resources/META-INF/MANIFEST.MF Thu Feb
22 20:15:56 2007
@@ -3,7 +3,6 @@
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
+Require-Bundle: slf4j.api
+Export-Package: 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 Thu Feb 22 20:15:56 2007
@@ -45,7 +45,8 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${project.version}</Bundle-Version>
+
<Bundle-Version>${project_version_for_osgi}</Bundle-Version>
+
<Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
Modified: slf4j/trunk/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
==============================================================================
--- slf4j/trunk/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ slf4j/trunk/slf4j-log4j12/src/main/resources/META-INF/MANIFEST.MF Thu Feb
22 20:15:56 2007
@@ -3,7 +3,6 @@
Bundle-SymbolicName: slf4j.log4j12
Bundle-Name: slf4j-log4j12
Bundle-Vendor: SLF4J.ORG
-Require-Bundle: slf4j.api;visibility:=reexport
-Export-Package: org.slf4j, org.slf4j.impl
+Require-Bundle: slf4j.api
+Export-Package: 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-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml (original)
+++ slf4j/trunk/slf4j-nop/pom.xml Thu Feb 22 20:15:56 2007
@@ -39,7 +39,8 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${project.version}</Bundle-Version>
+ <Bundle-Version>${project_version_for_osgi}</Bundle-Version>
+ <Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
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 Thu Feb
22 20:15:56 2007
@@ -3,7 +3,6 @@
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
+Require-Bundle: slf4j.api
+Export-Package: org.slf4j.impl
Import-Package: org.slf4j.spi, org.slf4j.helpers
-Bundle-ClassPath: ., target/classes/
Modified: slf4j/trunk/slf4j-simple/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-simple/pom.xml (original)
+++ slf4j/trunk/slf4j-simple/pom.xml Thu Feb 22 20:15:56 2007
@@ -1,10 +1,10 @@
<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>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-parent</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
@@ -15,9 +15,7 @@
<name>SLF4J Simple Binding</name>
<url>http://www.slf4j.org</url>
- <description>
- The slf4j Simple binding
- </description>
+ <description>SLF4J Simple binding</description>
<dependencies>
<dependency>
@@ -36,7 +34,8 @@
<configuration>
<archive>
<manifestEntries>
- <Bundle-Version>${project.version}</Bundle-Version>
+ <Bundle-Version>${project_version_for_osgi}</Bundle-Version>
+ <Bundle-Description>${project.description}</Bundle-Description>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
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 20:15:56 2007
@@ -3,7 +3,6 @@
Bundle-SymbolicName: slf4j.simple
Bundle-Name: slf4j-simple
Bundle-Vendor: SLF4J.ORG
-Require-Bundle: slf4j.api;visibility:=reexport
-Export-Package: org.slf4j, org.slf4j.impl
+Require-Bundle: slf4j.api
+Export-Package: org.slf4j.impl
Import-Package: org.slf4j.spi, org.slf4j.helpers
-Bundle-ClassPath: ., target/classes/
\ No newline at end of file
_______________________________________________
dev mailing list
[email protected]
http://www.slf4j.org/mailman/listinfo/dev
