Author: carnold
Date: Sat Jun 19 23:47:34 2010
New Revision: 956310

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

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

Modified: logging/log4j/companions/component/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/pom.xml?rev=956310&r1=956309&r2=956310&view=diff
==============================================================================
--- logging/log4j/companions/component/trunk/pom.xml (original)
+++ logging/log4j/companions/component/trunk/pom.xml Sat Jun 19 23:47:34 2010
@@ -156,6 +156,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>
@@ -196,6 +213,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <encoding>UTF-8</encoding>
+          <docEncoding>UTF-8</docEncoding>
         </configuration>
         <executions>
             <execution>

Modified: logging/log4j/companions/component/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/component/trunk/src/changes/changes.xml?rev=956310&r1=956309&r2=956310&view=diff
==============================================================================
--- logging/log4j/companions/component/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/component/trunk/src/changes/changes.xml Sat Jun 19 
23:47:34 2010
@@ -23,6 +23,7 @@
     <release version="1.0" date="TBD" description="Initial release">
       <action issue="42094" type="add">Component framework backported from 
log4j 1.3.</action>
       <action issue="49390" type="add">component 1.0 release 
preparation</action>
+      <action issue="49078" action="fix">javadoc.jar was missing NOTICE and 
LICENSE.</action>
     </release>
   </body>
 </document>



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

Reply via email to