You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2012/02/01 19:31:36 UTC

svn commit: r1239253 - /poi/trunk/src/documentation/content/xdocs/resolutions/res001.xml

Author: nick
Date: Wed Feb  1 18:31:35 2012
New Revision: 1239253

URL: http://svn.apache.org/viewvc?rev=1239253&view=rev
Log:
Update the license details to reflect current practice, to avoid confusion

Modified:
    poi/trunk/src/documentation/content/xdocs/resolutions/res001.xml

Modified: poi/trunk/src/documentation/content/xdocs/resolutions/res001.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/resolutions/res001.xml?rev=1239253&r1=1239252&r2=1239253&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/resolutions/res001.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/resolutions/res001.xml Wed Feb  1 18:31:35 2012
@@ -50,8 +50,9 @@
                 </p>
                 <ol>
                         <li>
-                        All classes and interfaces MUST have, right at the beginning, the POI
-                        License (see poi/doc/LICENSE).
+                        All classes and interfaces MUST have, right at the 
+                        beginning of the file, the Apache Software License
+                        2.0 License Header. (see /legal/LICENSE).
                         </li>
                         <li>
                         All classes and interfaces MUST include class javadoc. Conventionally,
@@ -75,11 +76,12 @@
         <section><title>Amendments (informal by extension and not by vote)</title>
             <section><title>License</title>
                 <p>
-                        As opposed to the formerly used POI License which was
-                        based on the Apache Public License, now that POI is part of
-                        Jakarta, use the APL 1.1 for the header.  Currently, the
-                        Apache Software Foundation requires us to use the full
-                        long version.
+                        As opposed to the formerly used POI License (which was
+                        based on the Apache Public License), now that POI is 
+                        part of Apache, use the standard Apache Software
+                        License 2.0 header.  As per standard Apache Software 
+                        Foundation policy, the full (long) version of the
+                        header should be used.
                 </p>
             </section>
             <section><title>2 cents</title>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org