Skip to content

Commit

Permalink
update spec license to 1.1
Browse files Browse the repository at this point in the history 
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
@lukasj
lukasj committed Mar 28, 2024
1 parent a5f9aa2 commit 16e386c
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 38 deletions.
37 changes: 17 additions & 20 deletions api/src/main/javadoc/doc-files/speclicense.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<head>
<!--
Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2019, 2024 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
Expand All @@ -14,14 +14,13 @@
-->

<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>
<p>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:</p>
<h1>Eclipse Foundation Specification License - v1.1</h1>
<p>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:</p>

<p>Permission to copy, and distribute the contents of this document, or
the Eclipse Foundation document from which this statement is linked, in
Expand All @@ -30,12 +29,11 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
document, or portions thereof, that you use:</p>

<ul>
<li> link or URL to the original Eclipse Foundation document.</li>
<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;url to this license&gt;&gt;
&quot;
(hypertext is preferred, but a textual representation is permitted)
of the form:
"Copyright (c) [$date-of-document] Eclipse Foundation AISBL <a href="#url to this license">[url to this license]</a>"
</li>
</ul>

Expand All @@ -56,28 +54,27 @@ <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>"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]."</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
<p>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.</p>
Expand Down
31 changes: 13 additions & 18 deletions spec/src/main/asciidoc/license-efsl.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 <<url to this license>> "

Inclusion of the full text of this NOTICE must be provided. We
request that authorship attribution be provided in any software,
Expand All @@ -58,28 +54,27 @@ 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 &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
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 comments on commit 16e386c

Please sign in to comment.