From 74d04056bf0f9c879ea00477b6ef9d04089a7bd0 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 12 May 2020 16:51:03 +0100 Subject: [PATCH] Tweak EFSL replacements on advice from platform-dev list --- api/src/main/javadoc/doc-files/EFSL.html | 12 ++++++------ spec/src/main/asciidoc/license-efsl.adoc | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/api/src/main/javadoc/doc-files/EFSL.html b/api/src/main/javadoc/doc-files/EFSL.html index 1348c326..b6f19749 100644 --- a/api/src/main/javadoc/doc-files/EFSL.html +++ b/api/src/main/javadoc/doc-files/EFSL.html @@ -19,9 +19,8 @@

Eclipse Foundation Specification License - v1.0

  • link or URL to the original Eclipse Foundation document.
  • 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 © [$date-of-document] - Eclipse Foundation, Inc. - https://www.eclipse.org/legal/efsl.php" + of the form: "Copyright © [$date-of-document] Eclipse + Foundation, Inc. https://www.eclipse.org/legal/efsl.php"
    • @@ -42,9 +41,10 @@

    Eclipse Foundation Specification License - v1.0

    The notice is:

    -

    "Copyright © [$date-of-document] Eclipse Foundation. This software or - document includes material copied from or derived from [title and URI - of the Eclipse Foundation specification document]."

    +

    "Copyright © 2018, 2020 Eclipse Foundation. This software or + document includes material copied from or derived from + Jakarta ® Expression Language + https://jakarta.ee/specifications/expression-language/4.0/"

    Disclaimers

    diff --git a/spec/src/main/asciidoc/license-efsl.adoc b/spec/src/main/asciidoc/license-efsl.adoc index 55cf8a65..6c9519f2 100644 --- a/spec/src/main/asciidoc/license-efsl.adoc +++ b/spec/src/main/asciidoc/license-efsl.adoc @@ -14,7 +14,7 @@ endif::[] Release: {revdate} .... -Copyright (c) {revyear} Eclipse Foundation. +Copyright (c) 2018, {revyear} Eclipse Foundation. === Eclipse Foundation Specification License @@ -32,7 +32,7 @@ document, or portions thereof, that you use: * link or URL to the original Eclipse Foundation document. * 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) {revyear} Eclipse Foundation, Inc. + of the form: "Copyright © [$date-of-document] Eclipse Foundation, Inc. https://www.eclipse.org/legal/efsl.php[https://www.eclipse.org/legal/efsl.php]" Inclusion of the full text of this NOTICE must be provided. We @@ -52,9 +52,10 @@ specification is expressly prohibited. The notice is: -"Copyright (c) {revyear} Eclipse Foundation. This software or document -includes material copied from or derived from {doctitle} {revnumber} -{revremark} [URI of the Eclipse Foundation specification document]." +"Copyright © 2018, 2020 Eclipse Foundation. This software or document +includes material copied from or derived from +Jakarta ® Expression Language +https://jakarta.ee/specifications/expression-language/4.0/[https://jakarta.ee/specifications/expression-language/4.0/]" ==== Disclaimers