Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update license for Jakarta EE 11 #483

Merged
merged 1 commit into from
May 2, 2024
Merged

Update license for Jakarta EE 11 #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions api/src/main/javadoc/doc-files/speclicense.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<html>
<head>
<title>Eclipse Foundation Specification License - v1.0</title>
<title>Eclipse Foundation Specification License - v1.1</title>
</head>
<body>
<h1>Eclipse Foundation Specification License - v1.0</h1>
<h1>Eclipse Foundation Specification License - v1.1</h1>
<p>By using and/or copying this document, or the Eclipse Foundation
document from which this statement is linked, you (the licensee) agree
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:</p>

Expand All @@ -19,9 +19,9 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
<li> link or URL to the original Eclipse Foundation document.</li>
<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;https://www.eclipse.org/legal/efsl.php&gt;&gt;
&quot;
of the form: "Copyright © [$date-of-document]
Eclipse Foundation AISBL &lt;&lt;url to this license&gt;&gt;
"
</li>
</ul>

Expand All @@ -42,27 +42,27 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>

<p>The notice is:</p>

<p>&quot;Copyright &copy; 2018,2020 Eclipse Foundation. This software or
document includes material copied from or derived from Jakarta Concurrency and https://jakarta.ee/specifications/concurrency/2.0/.&quot;</p>
<p>"Copyright © 2018, 2024 Eclipse Foundation AISBL. This software or
document includes material copied from or derived from Jakarta Concurrency and https://jakarta.ee/specifications/concurrency/2.0/."</p>

<h2>Disclaimers</h2>

<p>THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; AND THE COPYRIGHT
HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR
<p>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.</p>

<p>THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE
<p>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.</p>

<p>The name and trademarks of the copyright holders or the Eclipse
Foundation may NOT be used in advertising or publicity pertaining to
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.</p>
Expand Down
16 changes: 8 additions & 8 deletions specification/src/main/asciidoc/license-efsl.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ Release: {revdate}

Copyright (c) 2018,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
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:

Expand All @@ -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. https://www.eclipse.org/legal/efsl.php"
Eclipse Foundation AISBL 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,
Expand All @@ -47,28 +47,28 @@ specification is expressly prohibited.

The notice is:

"Copyright (c) 2021 Eclipse Foundation. This software or
"Copyright (c) 2018, 2024 Eclipse Foundation AISBL.This software or
document includes material copied from or derived from Jakarta Concurrency and
https://jakarta.ee/specifications/concurrency/3.0/."

==== Disclaimers

THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; 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
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
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.
Expand Down