Author: carnold
Date: Sat Jun 5 03:52:46 2010
New Revision: 951645
URL: http://svn.apache.org/viewvc?rev=951645&view=rev
Log:
Bug 43282: OSGi packaging info for extras
Modified:
logging/log4j/companions/extras/trunk/pom.xml
logging/log4j/companions/extras/trunk/src/changes/changes.xml
Modified: logging/log4j/companions/extras/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/pom.xml?rev=951645&r1=951644&r2=951645&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/pom.xml (original)
+++ logging/log4j/companions/extras/trunk/pom.xml Sat Jun 5 03:52:46 2010
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<version>1.1-SNAPSHOT</version>
<name>Apache Extras Companion for log4j 1.2.</name>
<description>This companion provides additional appenders, filters and
@@ -190,6 +190,9 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
<executions>
<execution>
<goals>
@@ -212,7 +215,53 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/org/apache/log4j/**/*.log</exclude>
+
<exclude>src/test/resources/org/apache/log4j/**/*.null</exclude>
+
<exclude>src/test/resources/org/apache/log4j/**/*.throwable</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.0</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.1</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.2</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.3</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.4</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.5</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.6</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.7</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.8</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.9</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.9</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.10</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.11</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.12</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.13</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.14</exclude>
+ <exclude>src/test/resources/org/apache/log4j/**/*.15</exclude>
+ </excludes>
+ </configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <!-- currently only exporting packages that
+ are also supplied by log4j.
+ Exporting org.apache.log4j.varia.SoundAppender
+ and org.apache.log4j.xml.XSLTLayout requires someone
+ more experiences with OSGi -->
+ <Export-Package>org.apache.log4j.extras;
+ org.apache.log4j.filter;
+ org.apache.log4j.rolling;
+ org.apache.log4j.rule</Export-Package>
+
<Bundle-DocURL>http://logging.apache.org/log4j/companions/extras/index.html</Bundle-DocURL>
+ </instructions>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
<dependencies>
@@ -255,7 +304,7 @@
<artifactId>maven-release-plugin</artifactId>
<!-- attempt to work-around MRELEASE-273, see bug 42099 for
release build notes -->
<configuration>
- <goals>package site-deploy assembly:attached deploy</goals>
+ <goals>package site-depl oy assembly:attached deploy</goals>
</configuration>
</plugin>
<plugin>
Modified: logging/log4j/companions/extras/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/changes/changes.xml?rev=951645&r1=951644&r2=951645&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/extras/trunk/src/changes/changes.xml Sat Jun 5
03:52:46 2010
@@ -36,7 +36,8 @@
<action action="add" issue="48902">Add %throwable{n} and {-n} pattern
to EnhancedPatternLayout to print n or drop last n lines.</action>
<action action="fix" issue="49812">Improve javadoc for LogMF, LogSF,
LogXF</action>
<action action="fix" issue="49007">CachedDateFormatTest fails on Apache
Harmony.</action>
- <action action="fix" issue="48953">Unused imports and variables in test
code cause gcj compile warnings.</action>
+ <action action="fix" issue="48953">Unused imports and variables in test
code cause gcj compile warnings.</action>
+ <action action="add" issue="43282">Add OSGi packaging info.</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
