Author: carnold
Date: Sat Jun 19 23:43:41 2010
New Revision: 956309

URL: http://svn.apache.org/viewvc?rev=956309&view=rev
Log:
Bug 49078: javadoc.jar was missing NOTICE and LICENSE

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

Modified: logging/log4j/companions/extras/trunk/NOTICE
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/NOTICE?rev=956309&r1=956308&r2=956309&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/NOTICE (original)
+++ logging/log4j/companions/extras/trunk/NOTICE Sat Jun 19 23:43:41 2010
@@ -1,5 +1,5 @@
 Apache Extras Companion for log4j 1.2.
-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/companions/extras/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/pom.xml?rev=956309&r1=956308&r2=956309&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/pom.xml (original)
+++ logging/log4j/companions/extras/trunk/pom.xml Sat Jun 19 23:43:41 2010
@@ -161,6 +161,23 @@
               <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>
@@ -201,6 +218,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <encoding>UTF-8</encoding>
+          <docEncoding>UTF-8</docEncoding>
         </configuration>
         <executions>
             <execution>

Modified: logging/log4j/companions/extras/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/changes/changes.xml?rev=956309&r1=956308&r2=956309&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/extras/trunk/src/changes/changes.xml Sat Jun 19 
23:43:41 2010
@@ -39,6 +39,7 @@
        <action action="fix" issue="48953">Unused imports and variables in test 
code cause gcj compile warnings.</action>
        <action action="add" issue="43282">Add OSGi packaging info.</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.</action>
     </release>
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to