logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1411433 - in /logging/log4j/log4j2/trunk: api/pom.xml core/pom.xml dist/pom.xml flume-ng/pom.xml log4j12-api/pom.xml pom.xml slf4j-impl/pom.xml src/changes/changes.xml web/pom.xml
Date Mon, 19 Nov 2012 21:37:10 GMT
Author: rgoers
Date: Mon Nov 19 21:37:06 2012
New Revision: 1411433

URL: http://svn.apache.org/viewvc?rev=1411433&view=rev
Log:
LOG4J2-111 - Enhanced javadoc copyright statement.

Modified:
    logging/log4j/log4j2/trunk/api/pom.xml
    logging/log4j/log4j2/trunk/core/pom.xml
    logging/log4j/log4j2/trunk/dist/pom.xml
    logging/log4j/log4j2/trunk/flume-ng/pom.xml
    logging/log4j/log4j2/trunk/log4j12-api/pom.xml
    logging/log4j/log4j2/trunk/pom.xml
    logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
    logging/log4j/log4j2/trunk/src/changes/changes.xml
    logging/log4j/log4j2/trunk/web/pom.xml

Modified: logging/log4j/log4j2/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/pom.xml?rev=1411433&r1=1411432&r2=1411433&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/api/pom.xml Mon Nov 19 21:37:06 2012
@@ -83,8 +83,9 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${javadoc.plugin.version}</version>
         <configuration>
-          <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}.
All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo,
and the
-            Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom>
+          <bottom> <![CDATA[<p align="center">Copyright &#169; {inceptionYear}-{currentYear}
{organizationName}. All Rights Reserved.<br />
+            Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache
Logging project logo,
+            and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
           <!-- module link generation is completely broken in the javadoc plugin for a
multi-module non-aggregating
          project -->
           <detectOfflineLinks>false</detectOfflineLinks>

Modified: logging/log4j/log4j2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/pom.xml?rev=1411433&r1=1411432&r2=1411433&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/core/pom.xml Mon Nov 19 21:37:06 2012
@@ -183,8 +183,9 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${javadoc.plugin.version}</version>
         <configuration>
-          <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}.
All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo,
and the
-            Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom>
+          <bottom> <![CDATA[<p align="center">Copyright &#169; {inceptionYear}-{currentYear}
{organizationName}. All Rights Reserved.<br />
+            Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache
Logging project logo,
+            and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
           <!-- module link generation is completely broken in the javadoc plugin for a
multi-module non-aggregating
          project -->
           <detectOfflineLinks>false</detectOfflineLinks>

Modified: logging/log4j/log4j2/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/dist/pom.xml?rev=1411433&r1=1411432&r2=1411433&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/dist/pom.xml (original)
+++ logging/log4j/log4j2/trunk/dist/pom.xml Mon Nov 19 21:37:06 2012
@@ -111,18 +111,18 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>log4j12-api</artifactId>
+      <artifactId>log4j-1.2-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>log4j12-api</artifactId>
+      <artifactId>log4j-1.2-api</artifactId>
       <version>${project.version}</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j.adapters</groupId>
-      <artifactId>log4j12-api</artifactId>
+      <artifactId>log4j-1.2-api</artifactId>
       <version>${project.version}</version>
       <classifier>javadoc</classifier>
     </dependency>

Modified: logging/log4j/log4j2/trunk/flume-ng/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/pom.xml?rev=1411433&r1=1411432&r2=1411433&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/flume-ng/pom.xml (original)
+++ logging/log4j/log4j2/trunk/flume-ng/pom.xml Mon Nov 19 21:37:06 2012
@@ -178,8 +178,9 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${javadoc.plugin.version}</version>
         <configuration>
-          <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}.
All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo,
and the
-            Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom>
+          <bottom> <![CDATA[<p align="center">Copyright &#169; {inceptionYear}-{currentYear}
{organizationName}. All Rights Reserved.<br />
+            Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache
Logging project logo,
+            and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
           <!-- module link generation is completely broken in the javadoc plugin for a
multi-module non-aggregating
          project -->
           <detectOfflineLinks>false</detectOfflineLinks>

Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1411433&r1=1411432&r2=1411433&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Mon Nov 19 21:37:06 2012
@@ -91,8 +91,9 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>${javadoc.plugin.version}</version>
             <configuration>
-              <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}.
All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo,
and the
-                Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom>
+              <bottom> <![CDATA[<p align="center">Copyright &#169; {inceptionYear}-{currentYear}
{organizationName}. All Rights Reserved.<br />
+            Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache
Logging project logo,
+            and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
               <!-- module link generation is completely broken in the javadoc plugin for
a multi-module non-aggregating
                    project -->
               <detectOfflineLinks>false</detectOfflineLinks>

Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1411433&r1=1411432&r2=1411433&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Mon Nov 19 21:37:06 2012
@@ -220,6 +220,11 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>${javadoc.plugin.version}</version>
+          <configuration>
+            <bottom><![CDATA[<p align="center">Copyright &#169; {inceptionYear}-{currentYear}
{organizationName}. All Rights Reserved.<br />
+            Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache
Logging project logo,
+            and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1411433&r1=1411432&r2=1411433&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original)
+++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Mon Nov 19 21:37:06 2012
@@ -97,8 +97,9 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>${javadoc.plugin.version}</version>
             <configuration>
-              <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}.
All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo,
and the
-                Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom>
+              <bottom> <![CDATA[<p align="center">Copyright &#169; {inceptionYear}-{currentYear}
{organizationName}. All Rights Reserved.<br />
+            Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache
Logging project logo,
+            and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
               <!-- module link generation is completely broken in the javadoc plugin for
a multi-module non-aggregating
                    project -->
               <detectOfflineLinks>false</detectOfflineLinks>

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1411433&r1=1411432&r2=1411433&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Nov 19 21:37:06 2012
@@ -23,6 +23,9 @@
 
   <body>
     <release version="2.0-beta4" date="TBD" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-111" dev="rgoers" type="fix">
+        Enhanced javadoc copyright statement.
+      </action>
       <action issue="LOG4J2-110" dev="rgoers" type="update">
         Renamed log4j12-api to log4j-1.2-api.
       </action>

Modified: logging/log4j/log4j2/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/web/pom.xml?rev=1411433&r1=1411432&r2=1411433&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/web/pom.xml (original)
+++ logging/log4j/log4j2/trunk/web/pom.xml Mon Nov 19 21:37:06 2012
@@ -103,8 +103,9 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>${javadoc.plugin.version}</version>
             <configuration>
-              <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}.
All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo,
and the
-                Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom>
+              <bottom> <![CDATA[<p align="center">Copyright &#169; {inceptionYear}-{currentYear}
{organizationName}. All Rights Reserved.<br />
+            Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache
Logging project logo,
+            and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
               <!-- module link generation is completely broken in the javadoc plugin for
a multi-module non-aggregating
                    project -->
               <detectOfflineLinks>false</detectOfflineLinks>



Mime
View raw message