logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1495798 - in /logging/log4j/log4j2/trunk: pom.xml src/changes/changes.xml
Date Sun, 23 Jun 2013 08:23:04 GMT
Author: rgoers
Date: Sun Jun 23 08:23:04 2013
New Revision: 1495798

URL: http://svn.apache.org/r1495798
Log:
LOG4J2-289 - Add javadoc fix tool to site build. Fix problems with changes.xml introduced
in revision 1490676. Prevent unit tests from creating icons in the doc and stealing the focus.

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

Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1495798&r1=1495797&r2=1495798&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Sun Jun 23 08:23:04 2013
@@ -134,8 +134,8 @@
     <slf4j.version>1.7.5</slf4j.version>
     <logback.version>1.0.13</logback.version>
     <log4jParentDir>${basedir}</log4jParentDir>
-    <Log4jReleaseVersion>2.0-beta7</Log4jReleaseVersion>
-    <Log4jReleaseCount>ninth</Log4jReleaseCount>
+    <Log4jReleaseVersion>2.0-beta8</Log4jReleaseVersion>
+    <Log4jReleaseCount>tenth</Log4jReleaseCount>
     <jackson.version>2.2.1</jackson.version>
     <flumeVersion>1.3.1</flumeVersion>
     <disruptor.version>3.0.1</disruptor.version>
@@ -479,6 +479,24 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.adoptopenjdk.maven.plugins</groupId>
+          <artifactId>javadoc-updater-maven-plugin</artifactId>
+          <version>0.1-SNAPSHOT</version>
+          <executions>
+            <execution>
+              <phase>site</phase>
+              <goals>
+                <goal>fixjavadoc</goal>
+              </goals>
+              <configuration>
+                <!-- by default check target/site if apidocs are not here change the value
+                <directory>${project.reporting.outputDirectory}</directory>
+                -->
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
           <version>${pmd.plugin.version}</version>
@@ -555,6 +573,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${surefire.plugin.version}</version>
         <configuration>
+          <systemPropertyVariables>
+            <java.awt.headless>true</java.awt.headless>
+          </systemPropertyVariables>
           <forkMode>always</forkMode>
         </configuration>
       </plugin>

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1495798&r1=1495797&r2=1495798&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Sun Jun 23 08:23:04 2013
@@ -18,11 +18,12 @@
 <document>
   <properties>
     <title>Changes</title>
-    <author email="rgoers@apache.org">Ralph Goers</author>
-    <author email="ggregory@apache.org">Gary Gregory</author>
   </properties>
   <body>
     <release version="2.0-beta8" date="2013-??-??" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-289" dev="rgoers" type="fix">
+        Add javadoc fix tool to site build.
+      </action>
       <action issue="LOG4J2-288" dev="gregory" type="update">
         Update JUnit to 4.11 from 4.7.
       </action>
@@ -60,7 +61,6 @@
         Wasted work in XMLLayout.toSerializable().
       </action>
     </release>
-  <body>
     <release version="2.0-beta7" date="2013-06-01" description="Bug fixes and enhancements">
       <action issue="LOG4J2-249" dev="rgoers" type="update">
         Allow context parameters in Log4jContextListener to include properties.



Mime
View raw message