From 16e386c89232e9c29d8690d57f59491ce3825bd8 Mon Sep 17 00:00:00 2001 From: Lukas Jungmann Date: Thu, 28 Mar 2024 09:58:59 +0100 Subject: [PATCH] update spec license to 1.1 Signed-off-by: Lukas Jungmann --- .../main/javadoc/doc-files/speclicense.html | 37 +++++++++---------- spec/src/main/asciidoc/license-efsl.adoc | 31 +++++++--------- 2 files changed, 30 insertions(+), 38 deletions(-) diff --git a/api/src/main/javadoc/doc-files/speclicense.html b/api/src/main/javadoc/doc-files/speclicense.html index 408ce9dc..715b9a01 100644 --- a/api/src/main/javadoc/doc-files/speclicense.html +++ b/api/src/main/javadoc/doc-files/speclicense.html @@ -2,7 +2,7 @@ -Eclipse Foundation Specification License - v1.0 +Eclipse Foundation Specification License - v1.1 -

Eclipse Foundation Specification License - v1.0

-

By using and/or copying this document, or the Eclipse Foundation - document from which this statement is linked, you (the licensee) agree - that you have read, understood, and will comply with the following - terms and conditions:

+

Eclipse Foundation Specification License - v1.1

+

By using and/or copying this document, or the Eclipse document from which this statement is linked + or incorporated by reference, you (the licensee) agree that you have read, understood, + and will comply with the following terms and conditions:

Permission to copy, and distribute the contents of this document, or the Eclipse Foundation document from which this statement is linked, in @@ -30,12 +29,11 @@

Eclipse Foundation Specification License - v1.0

document, or portions thereof, that you use:

@@ -56,14 +54,13 @@

Eclipse Foundation Specification License - v1.0

The notice is:

-

"Copyright © 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) [$date-of-document] Eclipse Foundation AISBL. This software or document + includes material copied from or derived from [title and URI of the Eclipse Foundation specification document]."

Disclaimers

-

THIS DOCUMENT IS PROVIDED "AS IS," AND THE COPYRIGHT - HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR +

THIS DOCUMENT IS PROVIDED "AS IS," AND TO THE EXTENT PERMITTED BY APPLICABLE LAW THE COPYRIGHT + HOLDERS AND THE ECLIPSE FOUNDATION AISBL MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE @@ -71,13 +68,13 @@

Disclaimers

WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.

-

THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE +

TO THE EXTENT PERMITTED BY APPLICABLE LAW THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION AISBL WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF.

-

The name and trademarks of the copyright holders or the Eclipse - Foundation may NOT be used in advertising or publicity pertaining to +

The name and trademarks of the copyright holders or the Eclipse Foundation AISBL + may NOT be used in advertising or publicity pertaining to this document or its contents without specific, written prior permission. Title to copyright in this document will at all times remain with copyright holders.

diff --git a/spec/src/main/asciidoc/license-efsl.adoc b/spec/src/main/asciidoc/license-efsl.adoc index bbf8ef24..29e3a008 100644 --- a/spec/src/main/asciidoc/license-efsl.adoc +++ b/spec/src/main/asciidoc/license-efsl.adoc @@ -20,12 +20,11 @@ Release: {revdate} Copyright (c) 2019, 2024 Eclipse Foundation. -=== Eclipse Foundation Specification License +== Eclipse Foundation Specification License - v1.1 -By using and/or copying this document, or the Eclipse Foundation -document from which this statement is linked, you (the licensee) agree -that you have read, understood, and will comply with the following -terms and conditions: +By using and/or copying this document, or the Eclipse document from which this statement is linked +or incorporated by reference, you (the licensee) agree that you have read, understood, +and will comply with the following terms and conditions: Permission to copy, and distribute the contents of this document, or the Eclipse Foundation document from which this statement is linked, in @@ -36,10 +35,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) [$date-of-document] Eclipse Foundation, Inc. -> [$url to this license]" + of the form: "Copyright (c) [$date-of-document] Eclipse Foundation AISBL <> " Inclusion of the full text of this NOTICE must be provided. We request that authorship attribution be provided in any software, @@ -58,14 +54,13 @@ 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) [$date-of-document] Eclipse Foundation AISBL. This software or document +includes material copied from or derived from [title and URI of the Eclipse Foundation specification document]." -==== Disclaimers +=== Disclaimers -THIS DOCUMENT IS PROVIDED "AS IS," AND THE COPYRIGHT -HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR +THIS DOCUMENT IS PROVIDED "AS IS," AND TO THE EXTENT PERMITTED BY APPLICABLE LAW THE COPYRIGHT +HOLDERS AND THE ECLIPSE FOUNDATION AISBL MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE @@ -73,13 +68,13 @@ SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. -THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE +TO THE EXTENT PERMITTED BY APPLICABLE LAW THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION AISBL WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE CONTENTS THEREOF. -The name and trademarks of the copyright holders or the Eclipse -Foundation may NOT be used in advertising or publicity pertaining to +The name and trademarks of the copyright holders or the Eclipse Foundation AISBL +may NOT be used in advertising or publicity pertaining to this document or its contents without specific, written prior permission. Title to copyright in this document will at all times remain with copyright holders. \ No newline at end of file