Skip to content

Commit 45b0f38

Browse files
authored
Merge pull request #644 from Azquelt/efsl-1.1
Update spec license to EFSL v1.1
2 parents 33812a9 + cd1bd3d commit 45b0f38

File tree

2 files changed

+15
-52
lines changed

2 files changed

+15
-52
lines changed

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>org.eclipse.microprofile</groupId>
2121
<artifactId>microprofile-parent</artifactId>
22-
<version>2.10</version>
22+
<version>2.11</version>
2323
</parent>
2424

2525
<groupId>org.eclipse.microprofile.fault-tolerance</groupId>

Diff for: spec/src/main/asciidoc/license-efsl.adoc

+14-51
Original file line numberDiff line numberDiff line change
@@ -13,64 +13,27 @@ Release: {revdate}
1313

1414
Copyright (c) {inceptionYear} , {currentYear} Eclipse Foundation.
1515

16-
=== Eclipse Foundation Specification License
16+
=== Eclipse Foundation Specification License - v1.1
1717

18-
By using and/or copying this document, or the Eclipse Foundation
19-
document from which this statement is linked, you (the licensee) agree
20-
that you have read, understood, and will comply with the following
21-
terms and conditions:
18+
By using and/or copying this document, or the Eclipse Foundation 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:
2219

23-
Permission to copy, and distribute the contents of this document, or
24-
the Eclipse Foundation document from which this statement is linked, in
25-
any medium for any purpose and without fee or royalty is hereby
26-
granted, provided that you include the following on ALL copies of the
27-
document, or portions thereof, that you use:
20+
Permission to copy, and distribute the contents of this document, or the Eclipse Foundation document from which this statement is linked, in any medium for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the document, or portions thereof, that you use:
2821

2922
* link or URL to the original Eclipse Foundation document.
30-
* All existing copyright notices, or if one does not exist, a notice
31-
(hypertext is preferred, but a textual representation is permitted)
32-
of the form: "Copyright (c) [$date-of-document]
33-
Eclipse Foundation, Inc. \<<url to this license>>"
34-
35-
Inclusion of the full text of this NOTICE must be provided. We
36-
request that authorship attribution be provided in any software,
37-
documents, or other items or products that you create pursuant to the
38-
implementation of the contents of this document, or any portion
39-
thereof.
40-
41-
No right to create modifications or derivatives of Eclipse Foundation
42-
documents is granted pursuant to this license, except anyone may
43-
prepare and distribute derivative works and portions of this document
44-
in software that implements the specification, in supporting materials
45-
accompanying such software, and in documentation of such software,
46-
PROVIDED that all such works include the notice below. HOWEVER, the
47-
publication of derivative works of this document for use as a technical
48-
specification is expressly prohibited.
23+
* 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 AISBL +<<url to this license>>+ "
24+
25+
Inclusion of the full text of this NOTICE must be provided. We request that authorship attribution be provided in any software, documents, or other items or products that you create pursuant to the implementation of the contents of this document, or any portion thereof.
26+
27+
No right to create modifications or derivatives of Eclipse Foundation documents is granted pursuant to this license, except anyone may prepare and distribute derivative works and portions of this document in software that implements the specification, in supporting materials accompanying such software, and in documentation of such software, PROVIDED that all such works include the notice below. HOWEVER, the publication of derivative works of this document for use as a technical specification is expressly prohibited.
4928

5029
The notice is:
5130

52-
"Copyright (c) [$date-of-document] Eclipse Foundation. This software or
53-
document includes material copied from or derived from [title and URI
54-
of the Eclipse Foundation specification document]."
31+
"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]."
5532

5633
==== Disclaimers
5734

58-
THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; AND THE COPYRIGHT
59-
HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR
60-
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
61-
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
62-
NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE
63-
SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS
64-
WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR
65-
OTHER RIGHTS.
66-
67-
THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE
68-
FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT
69-
OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE
70-
CONTENTS THEREOF.
71-
72-
The name and trademarks of the copyright holders or the Eclipse
73-
Foundation may NOT be used in advertising or publicity pertaining to
74-
this document or its contents without specific, written prior
75-
permission. Title to copyright in this document will at all times
76-
remain with copyright holders.
35+
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 SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
36+
37+
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.
38+
39+
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.

0 commit comments

Comments
 (0)