logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grobme...@apache.org
Subject svn commit: r1344700 - in /logging/log4j/trunk: pom.xml src/changes/changes.xml
Date Thu, 31 May 2012 13:04:19 GMT
Author: grobmeier
Date: Thu May 31 13:04:18 2012
New Revision: 1344700

URL: http://svn.apache.org/viewvc?rev=1344700&view=rev
Log:
applied 49932 and cleaned up felix plugin

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=1344700&r1=1344699&r2=1344700&view=diff
==============================================================================
--- logging/log4j/trunk/pom.xml (original)
+++ logging/log4j/trunk/pom.xml Thu May 31 13:04:18 2012
@@ -413,29 +413,27 @@ target platform and specify -Dntdll_targ
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <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.*;version=1.2.17;-noimport:=true</Export-Package>
-            <!-- 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>
-        </configuration>
-      </plugin>
+        <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <version>2.1.0</version>
+            <extensions>true</extensions>
+            <configuration>
+                <instructions>
+                    <Bundle-SymbolicName>org.apache.log4j</Bundle-SymbolicName>
+                    <Export-Package>org.apache.log4j.*;version=${project.version};-noimport:=true</Export-Package>
+                    <Import-Package>
+                        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>
+                    <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
+                    <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
+                </instructions>
+            </configuration>
+        </plugin>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <version>3.1</version>

Modified: logging/log4j/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=1344700&r1=1344699&r2=1344700&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Thu May 31 13:04:18 2012
@@ -21,6 +21,7 @@
   </properties>
   <body>
     <release version="1.2.18" date="2012-??-??" description="Maintenance release">
+       <action issue="49932" action="fix" dev="grobmeier" due-to="Steve Coy">Additional
OSGI/BND configuration elements</action>
        <action action="remove" dev="grobmeier">Ant is not longer supported as build
tool</action>
        <action action="update" dev="grobmeier">Made use of Mavens Fludio Skin</action>
        <action issue="49359" action="update" dev="grobmeier">Log4j site should have
some mention of git mirroring</action>



Mime
View raw message