Update the license list.
Change-Id: Id78eae4bed82deeeb46024410d48b69aa44531e4
diff --git a/content/en_licenses.php b/content/en_licenses.php
index b27244e..118e55b 100644
--- a/content/en_licenses.php
+++ b/content/en_licenses.php
@@ -12,6 +12,21 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
+
+
+$licenseFile = dirname(__FILE__) . "/../licenses.json";
+$licenses = json_decode(file_get_contents($licenseFile), true);
+$modified = strtotime($licenses['meta']['updated']);
+
+function dumpLicenseList($licenses) {
+ asort($licenses);
+ echo "<ul>";
+ foreach ($licenses as $spdx => $name) {
+ echo "<li>{$name} (<a target=\"_spdx\" href=\"https://spdx.org/licenses/{$spdx}\">{$spdx}</a>)</li>";
+ }
+ echo "</ul>";
+}
+
?>
<div id="maincontent">
<div id="midcolumn">
@@ -25,18 +40,17 @@
determined that every one of these licenses can be used by your
Eclipse Foundation project. That is, <em>the licenses on this list are
not necessarily compatible with every Eclipse Foundation project
- license, or with each other</em>. If you have any questions about this
+ license, or with each other</em>. </p>
+
+ <p>If you have any questions about this
list or its use, please contact <a href="license@eclipse.org">license@eclipse.org</a>.
</p>
- <?php dumpLicenseList($licenseFile); ?>
+ <?php dumpLicenseList($licenses['approved']); ?>
<h3 id="nonapproved">Non Approved Licenses</h3>
- <ul>
- <li>GNU General Public License (GPL)</li>
- <li>Sun Binary Code License Agreement</li>
- </ul>
<p>
- Please note the LGPL has been approved by the Eclipse Board of Directors
- in certain cases. Please contact <a href="license@eclipse.org">license@eclipse.org</a>
+ Other licenses have been approved by the Eclipse Board of Directors
+ in certain cases.</p>
+ <p>Please contact <a href="license@eclipse.org">license@eclipse.org</a>
for more information.
</p>
</div>
diff --git a/licenses.json b/licenses.json
index 295655b..9db72fb 100644
--- a/licenses.json
+++ b/licenses.json
@@ -1,27 +1,36 @@
{
+ "meta": {
+ "updated": "2022-04-07"
+ },
"approved": {
+ "0BSD": "BSD Zero Clause License",
"Adobe-Glyph": "Adobe Glyph List License",
"Apache-1.0": "Apache Software License 1.0",
"Apache-1.1": "Apache Software License 1.1",
"Apache-2.0": "Apache Software License 2.0",
+ "ARTISTIC-2.0": "Artistic License 2.0",
"BSL-1.0": "Boost Software License",
"BSD-2-Clause": "BSD 2-Clause “Simplified” License",
+ "BSD-2-Clause-FreeBSD": "BSD 2-Clause FreeBSD License",
"BSD-3-Clause": "BSD 3-Clause “New” or “Revised” License",
"BSD-4-Clause": "BSD 4-Clause “Original” or “Old” License",
- "CC-By-2.5": "Creative Commons Attribution License 2.5",
- "CC-By-3.0": "Creative Commons Attribution 3.0 Unported",
- "CC-By-4.0": "Creative Commons Attribution 4.0 International",
- "CC-By-SA-3.0": "Creative Commons Attribution Share Alike 3.0 Unported",
+ "CC-BY-2.5": "Creative Commons Attribution License 2.5",
+ "CC-BY-3.0": "Creative Commons Attribution 3.0 Unported",
+ "CC-BY-4.0": "Creative Commons Attribution 4.0 International",
+ "CC-BY-SA-3.0": "Creative Commons Attribution Share Alike 3.0 Unported",
"CC-BY-SA-4.0": "Creative Commons Attribution Share Alike 4.0 International",
"CC0-1.0": "Creative Commons Zero V1.0 Universal",
"CDDL-1.0": "Common Development and Distribution License (CDDL) Version 1.0",
"CDDL-1.1": "Common Development and Distribution License (CDDL) Version 1.1",
"CPL-1.0": "Common Public License Version 1.0",
+ "EPL-1.0": "Eclipse Public License, v1.0",
+ "EPL-2.0": "Eclipse Public License, v2.0",
"FTL" : "FreeType License",
"GFDL-1.3-only": "GNU Free Documentation License Version 1.3",
"IPL-1.0": "IBM Public License 1.0",
"ISC": "ISC License",
"MIT": "MIT License",
+ "MIT-0": "MIT No Attribution",
"MPL-1.1": "Mozilla Public License Version 1.1",
"MPL-2.0": "Mozilla Public License Version 2.0",
"NTP": "NTP License",
@@ -32,10 +41,12 @@
"Unicode-TOU": "Unicode Terms of Use",
"Unicode-DFS-2015": "Unicode License Agreement – Data Files and Software (2015)",
"Unicode-DFS-2016": "Unicode License Agreement – Data Files and Software (2016)",
+ "UNLICENSE": "The Unlicense",
"UPL-1.0" : "Universal Permissive License v1.0",
"W3C": "W3C Software and Notice License (2002-12-31)",
"W3C-19980720": "W3C Software Notice and License (1998-07-20)",
"W3C-20150513": "W3C Software Notice and Document License (2015-05-13)",
+ "WTFPL": "Do What The Firetruck You Want To Public License",
"X11": "X11 License",
"Zlib": "Zlib License",
"ZPL-2.1" : "Zope Public License 2.1"
diff --git a/licenses.php b/licenses.php
index dc21e47..c8524f3 100644
--- a/licenses.php
+++ b/licenses.php
@@ -7,6 +7,7 @@
* which is available at https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
+ * Wayne Beaton (Eclipse Foundation)
* Eric Poirier (Eclipse Foundation)
*
* SPDX-License-Identifier: EPL-2.0
@@ -24,23 +25,6 @@
$Theme->setPageKeywords("legal, privacy, policy");
$Theme->setPageAuthor("Wayne Beaton");
-$licenseFile = dirname(__FILE__) . "/licenses.json";
-
-function dumpLicenseList($file) {
- $licenses = json_decode(file_get_contents($file), true);
- echo "<ul>";
- foreach ($licenses['approved'] as $spdx => $name) {
- echo "<li>{$name}</li>";
- }
- echo "</ul>";
-}
-
-// I'm pretty sure that this just won't work; it would end up
-// being the date that the content was extracted from Git onto
-// the web server.
-// $modified = max(filemtime(__FILE__), filemtime($licenseFile));
-$modified = strtotime("2017-10-19");
-
ob_start();
include ("content/en_" . $App->getScriptName());
$html = ob_get_clean();
