From 63ee34377ad5a37d46726c5283fa67afa1a9e7ed Mon Sep 17 00:00:00 2001
From: Curtis William Arnold <carnold@apache.org>
Date: Sat, 19 Jun 2010 23:39:15 +0000
Subject: [PATCH] Bug 49098: javadoc.jar was missing NOTICE and LICENSE and
 contained .svn entries

git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/trunk@956307 13f79535-47bb-0310-9956-ffa450edef68
---
 NOTICE                  |  4 ++--
 pom.xml                 | 22 +++++++++++++++++++++-
 src/changes/changes.xml |  1 +
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/NOTICE b/NOTICE
index 0375732360..d697542317 100644
--- a/NOTICE
+++ b/NOTICE
@@ -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/).
diff --git a/pom.xml b/pom.xml
index e6d7927e0e..9ced458436 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,6 +280,23 @@ target platform and specify -Dntdll_target=msbuild on the mvn command line.
               <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_target=msbuild on the mvn command line.
             </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>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index a730901b46..a449ebd2a1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -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">