Author: ceki Date: Thu Feb 12 11:13:12 2009 New Revision: 2153 Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/logback-site/src/site/pages/faq.html Log: Added Bundle-RequiredExecutionEnvironment directive to OSGi manifests Also added an FAQ entry about logback dependencies This fixes LBGENERAL-8 Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Thu Feb 12 11:13:12 2009 @@ -119,6 +119,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> <executions> <execution> <id>bundle-test-jar</id> @@ -130,6 +135,27 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + <configuration> + <instructions> + <Export-Package>ch.qos.logback.access.*</Export-Package> + <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> + </instructions> + </configuration> + </plugin> + </plugins> </build> Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Thu Feb 12 11:13:12 2009 @@ -153,7 +153,8 @@ <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> </archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> </configuration> <executions> <execution> @@ -199,6 +200,7 @@ <instructions> <Export-Package>ch.qos.logback.classic.*</Export-Package> <Export-Package>org.slf4j.impl</Export-Package> + <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> </instructions> </configuration> </plugin> Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Thu Feb 12 11:13:12 2009 @@ -99,7 +99,8 @@ <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> </archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> </configuration> <executions> <execution> @@ -129,6 +130,7 @@ <configuration> <instructions> <Export-Package>ch.qos.logback.core.*</Export-Package> + <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> </instructions> </configuration> </plugin> Modified: logback/trunk/logback-site/src/site/pages/faq.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/faq.html (original) +++ logback/trunk/logback-site/src/site/pages/faq.html Thu Feb 12 11:13:12 2009 @@ -25,10 +25,14 @@ <h3>Logback project</h3> - <ol type="1"> + <ol> <li><a href="#why_lgpl">Why is logback distributed under LGPL and not the Apache Software License?</a> </li> + + <li><a href="#dependecy">What are logback's dependencies, i.e. + JDK version and third-party libraries?</a> + </li> </ol> @@ -102,6 +106,21 @@ </p> </dd> </dl> + + <hr/> + + <dl> + <dt><a name="dependecy" href="#dependecy">What are logback's + dependencies, i.e. JDK version and third-party libraries?</a> + </dt> + + <dd><p>This question is answered on a <a + href="dependencies.html">separate page</a> dedicated to the + question of dependencies.</p> + </dd> + </dl> + + </div> <div class="section">