logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1479054 - in /logging/log4j/log4j2/trunk: core/pom.xml src/changes/changes.xml
Date Sat, 04 May 2013 07:42:34 GMT
Author: rgoers
Date: Sat May  4 07:42:34 2013
New Revision: 1479054

URL: http://svn.apache.org/r1479054
Log:
LOG4J2-159 - Use OSGi version number format

Modified:
    logging/log4j/log4j2/trunk/core/pom.xml
    logging/log4j/log4j2/trunk/src/changes/changes.xml

Modified: logging/log4j/log4j2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/pom.xml?rev=1479054&r1=1479053&r2=1479054&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/core/pom.xml Sat May  4 07:42:34 2013
@@ -178,11 +178,23 @@
             <Import-Package>${osgi.import}</Import-Package>
             <DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Fragment-Host>org.apache.commons.log4j-api;bundle-version=${project.version}</Fragment-Host>
+            <Fragment-Host>org.apache.commons.log4j-api;bundle-version=${project.version.osgi}</Fragment-Host>
           </instructions>
         </configuration>
         <executions>
           <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>cleanVersions</goal>
+            </goals>
+            <configuration>
+              <versions>
+
+                <project.version.osgi>${project.version}</project.version.osgi>
+              </versions>
+            </configuration>
+          </execution>
+          <execution>
             <id>bundle-manifest</id>
             <phase>process-classes</phase>
             <goals>
@@ -355,7 +367,7 @@
 			</properties>
 
 			<dependencies>
-			    <!-- 
+			    <!--
 				<dependency>
 					<groupId>com.sun</groupId>
 					<artifactId>tools</artifactId>

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1479054&r1=1479053&r2=1479054&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Sat May  4 07:42:34 2013
@@ -23,6 +23,9 @@
 
   <body>
     <release version="2.0-beta6" date="@TBD@" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-159" dev="rgoers" type="fix">
+        Use OSGi version format in Fragment-Host
+      </action>
       <action issue="LOG4J2-234" dev="rgoers" type="fix">
         RegexFilter threw a NullPointerException when used as a context-wide filter.
       </action>



Mime
View raw message