Author: carnold
Date: Sat Jun 12 05:07:17 2010
New Revision: 953935
URL: http://svn.apache.org/viewvc?rev=953935&view=rev
Log:
Bug 43282: Eliminate duplicates in OSGi Import-Package directive
Modified:
logging/log4j/trunk/pom.xml
logging/log4j/trunk/src/changes/changes.xml
Modified: logging/log4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/pom.xml?rev=953935&r1=953934&r2=953935&view=diff
==============================================================================
--- logging/log4j/trunk/pom.xml (original)
+++ logging/log4j/trunk/pom.xml Sat Jun 12 05:07:17 2010
@@ -165,6 +165,7 @@ target platform and specify -Dntdll_targ
<manifestSection>
<name>org.apache.log4j</name>
<manifestEntries>
+ <DynamicImport-Package>*</DynamicImport-Package>
<Implementation-Title>log4j</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor>"Apache Software
Foundation"</Implementation-Vendor>
@@ -401,20 +402,19 @@ target platform and specify -Dntdll_targ
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.1.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<!-- omit chainsaw and LF5 -->
<Export-Package>!org.apache.log4j.lf5.*,!org.apache.log4j.chainsaw.*,org.apache.log4j.*</Export-Package>
- <Import-Package>com.sun.jdmk.comm;resolution:=optional,
- javax.jms;resolution:=optional,
- javax.mail.*;resolution:=optional,
- javax.management;resolution:=optional,
- javax.naming;resolution:=optional,
- com.sun.jdmk.comm;resolution:=optional,
- com.ibm.uvm.tools;resolution:=optional,
- javax.swing.*;resolution:=optional,
+ <!-- all other potential imports are covered by
DynamicImport-Package earlier -->
+ <Import-Package>!javax.swing.*,
+ !com.ibm.uvm.tools.*,
+ !com.sun.jdmk.comm.*,
+ javax.jmdns.*;resolution:=optional,
+ javax.jms.*;resolution:=optional,
+ javax.mail.*;resolution:=optional,
*</Import-Package>
<Bundle-DocURL>http://logging.apache.org/log4j/1.2</Bundle-DocURL>
</instructions>
Modified: logging/log4j/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=953935&r1=953934&r2=953935&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Sat Jun 12 05:07:17 2010
@@ -20,6 +20,9 @@
<title>Apache log4j 1.2</title>
</properties>
<body>
+ <release version="1.2.17" date="2010-06-99" description="Maintenance
release">
+ <action issue="43282">Eliminate duplicates in OSGi Import-Package
directive.</action>
+ </release>
<release version="1.2.16" date="2010-04-06" description="Maintenance
release">
<action issue="43313">log4j 1.2.16 release preparation.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
