svn commit: r956307 - in /logging/log4j/trunk: NOTICE pom.xml src/changes/changes.xml

[carnold]

Author: carnold
Date: Sat Jun 19 23:39:15 2010
New Revision: 956307

URL: http://svn.apache.org/viewvc?rev=956307&view=rev
Log:
Bug 49098: javadoc.jar was missing NOTICE and LICENSE and contained .svn entries

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

Modified: logging/log4j/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/logging/log4j/trunk/NOTICE?rev=956307&r1=956306&r2=956307&view=diff
==============================================================================
--- logging/log4j/trunk/NOTICE (original)
+++ logging/log4j/trunk/NOTICE Sat Jun 19 23:39:15 2010
@@ -1,5 +1,5 @@
 Apache log4j
-Copyright 2007 The Apache Software Foundation
+Copyright 2010 The Apache Software Foundation
 
 This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).

Modified: logging/log4j/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/trunk/pom.xml?rev=956307&r1=956306&r2=956307&view=diff
==============================================================================
--- logging/log4j/trunk/pom.xml (original)
+++ logging/log4j/trunk/pom.xml Sat Jun 19 23:39:15 2010
@@ -280,6 +280,23 @@ target platform and specify -Dntdll_targ
               <goal>run</goal>
             </goals>
           </execution>
+          <execution>
+            <id>javadoc.resources</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <copy todir="${project.build.directory}/apidocs/META-INF">
+                  <fileset dir="${basedir}">
+                    <include name="LICENSE" />
+                    <include name="NOTICE" />
+                  </fileset>
+                </copy>
+              </tasks>
+            </configuration>
+          </execution>
         </executions>
         <dependencies>
           <dependency>
@@ -328,13 +345,16 @@ target platform and specify -Dntdll_targ
             </goals>
           </execution>
         </executions>
+
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.6.1</version>
+        <version>2.7</version>
         <configuration>
           <docfilessubdirs>true</docfilessubdirs>
+          <excludedocfilessubdir>.svn</excludedocfilessubdir>
           <encoding>UTF-8</encoding>
+          <docEncoding>${commons.docEncoding}</docEncoding>
         </configuration>
         <executions>
           <execution>

Modified: logging/log4j/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=956307&r1=956306&r2=956307&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Sat Jun 19 23:39:15 2010
@@ -24,6 +24,7 @@
        <action issue="49470">log4j 1.2.17 release preparation</action>
        <action issue="43282" action="fix">Eliminate duplicates in OSGi 
Import-Package directive.</action>
        <action issue="48588" action="fix">DOMConfigurator does not close input 
stream when configured based on URL.</action>
+       <action issue="49078" action="fix">javadoc.jar was missing NOTICE and 
LICENSE and contained .svn entries.</action>
     </release>
 
     <release version="1.2.16" date="2010-04-06" description="Maintenance 
release">



---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscr...@logging.apache.org
For additional commands, e-mail: log4j-dev-h...@logging.apache.org