From: Nick Burch
Date: Wed, 1 Feb 2012 18:31:35 +0000 (+0000)
Subject: Update the license details to reflect current practice, to avoid confusion
X-Git-Tag: REL_3_8_FINAL~72
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3ab1ff03047cdc5a2f39adf03189fe8a3904415f;p=poi.git
Update the license details to reflect current practice, to avoid confusion
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1239253 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/src/documentation/content/xdocs/resolutions/res001.xml b/src/documentation/content/xdocs/resolutions/res001.xml
index 2a538e6211..2d5e08099d 100644
--- a/src/documentation/content/xdocs/resolutions/res001.xml
+++ b/src/documentation/content/xdocs/resolutions/res001.xml
@@ -50,8 +50,9 @@
-
- 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).
-
All classes and interfaces MUST include class javadoc. Conventionally,
@@ -75,11 +76,12 @@
Amendments (informal by extension and not by vote)
License
- 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.