Update EFSL for Specifications and Javadoc

Signed-off-by: Miguel Serra <[email protected]>
jakartaee · Jun 6, 2020 · a7a1c57 · a7a1c57
1 parent f8f1999
commit a7a1c57
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/api/src/main/javadoc/doc-files/speclicense.html b/api/src/main/javadoc/doc-files/speclicense.html
@@ -20,8 +20,8 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
   <li>All existing copyright notices, or if one does not exist, a notice
       (hypertext is preferred, but a textual representation is permitted)
       of the form: &quot;Copyright &copy; [$date-of-document]
-      &ldquo;Eclipse Foundation, Inc. &lt;&lt;url to this license&gt;&gt;
-      &quot;
+      Eclipse Foundation, Inc. <a href="https://www.eclipse.org/legal/efsl.php">
+      https://www.eclipse.org/legal/efsl.php</a>&quot;
   </li>
 </ul>
 
@@ -42,9 +42,10 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
 
 <p>The notice is:</p>
 
-<p>&quot;Copyright &copy; 2018 Eclipse Foundation. This software or
-  document includes material copied from or derived from [title and URI
-  of the Eclipse Foundation specification document].&quot;</p>
+<p>&quot;Copyright &copy; 2018, 2020 Eclipse Foundation. This software or
+  document includes material copied from or derived from
+  <a href="https://jakarta.ee/specifications/security/2.0">
+    https://jakarta.ee/specifications/security/2.0</a>.&quot;</p>
 
 <h2>Disclaimers</h2>
 
@@ -69,4 +70,4 @@ <h2>Disclaimers</h2>
   remain with copyright holders.</p>
 
 </body>
-</html>
+</html>
diff --git a/spec/src/main/asciidoc/license-efsl.adoc b/spec/src/main/asciidoc/license-efsl.adoc
@@ -28,7 +28,7 @@ document, or portions thereof, that you use:
 * All existing copyright notices, or if one does not exist, a notice
   (hypertext is preferred, but a textual representation is permitted)
   of the form: "Copyright (c) [$date-of-document]
-  Eclipse Foundation, Inc. <<url to this license>>"
+  Eclipse Foundation, Inc. https://www.eclipse.org/legal/efsl.php[]"
 
 Inclusion of the full text of this NOTICE must be provided. We
 request that authorship attribution be provided in any software,
@@ -47,9 +47,9 @@ specification is expressly prohibited.
 
 The notice is:
 
-"Copyright (c) 2018 Eclipse Foundation. This software or
-document includes material copied from or derived from [title and URI
-of the Eclipse Foundation specification document]."
+"Copyright (c) 2018, 2020 Eclipse Foundation. This software or
+document includes material copied from or derived from
+Jakarta™ Security https://jakarta.ee/specifications/security/2.0/[]."
 
 ==== Disclaimers