Skip to content

Commit a32ff94

Browse files
authored
Merge pull request #1916 from arjantijms/efsl11
Update EFSL from 1.0 to 1.1
2 parents 1a8b23e + 735ea8d commit a32ff94

File tree

4 files changed

+59
-73
lines changed

4 files changed

+59
-73
lines changed

api/src/main/javadoc/doc-files/speclicense.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<html>
22
<head>
3-
<title>Eclipse Foundation Specification License - v1.0</title>
3+
<title>Eclipse Foundation Specification License - v1.1</title>
44
</head>
55
<body>
6-
<h1>Eclipse Foundation Specification License - v1.0</h1>
6+
<h1>Eclipse Foundation Specification License - v1.1</h1>
77
<p>By using and/or copying this document, or the Eclipse Foundation
8-
document from which this statement is linked, you (the licensee) agree
8+
document from which this statement is linked or incorporated by reference, you (the licensee) agree
99
that you have read, understood, and will comply with the following
1010
terms and conditions:</p>
1111

@@ -18,10 +18,10 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
1818
<ul>
1919
<li> link or URL to the original Eclipse Foundation document.</li>
2020
<li>All existing copyright notices, or if one does not exist, a notice
21-
(hypertext is preferred, but a textual representation is permitted)
22-
of the form: &quot;Copyright &copy; [$date-of-document]
23-
&ldquo;Eclipse Foundation, Inc. &lt;&lt;url to this license&gt;&gt;
24-
&quot;
21+
(hypertext is preferred, but a textual representation is permitted)
22+
of the form: &quot;Copyright &copy; [$date-of-document]
23+
Eclipse Foundation AISBL &lt;&lt;url to this license&gt;&gt;
24+
&quot;
2525
</li>
2626
</ul>
2727

@@ -42,28 +42,28 @@ <h1>Eclipse Foundation Specification License - v1.0</h1>
4242

4343
<p>The notice is:</p>
4444

45-
<p>&quot;Copyright &copy; 2018 Eclipse Foundation. This software or
45+
<p>&quot;Copyright &copy; [$date-of-document] Eclipse Foundation AISBL. This software or
4646
document includes material copied from or derived from [title and URI
4747
of the Eclipse Foundation specification document].&quot;</p>
4848

4949
<h2>Disclaimers</h2>
5050

51-
<p>THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; AND THE COPYRIGHT
52-
HOLDERS AND THE ECLIPSE FOUNDATION MAKE NO REPRESENTATIONS OR
51+
<p>THIS DOCUMENT IS PROVIDED &quot;AS IS,&quot; AND TO THE EXTENT PERMITTED BY APPLICABLE LAW THE COPYRIGHT
52+
HOLDERS AND THE ECLIPSE FOUNDATION AISBL MAKE NO REPRESENTATIONS OR
5353
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
5454
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
5555
NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE DOCUMENT ARE
5656
SUITABLE FOR ANY PURPOSE; NOR THAT THE IMPLEMENTATION OF SUCH CONTENTS
5757
WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR
5858
OTHER RIGHTS.</p>
5959

60-
<p>THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION WILL NOT BE LIABLE
60+
<p>TO THE EXTENT PERMITTED BY APPLICABLE LAW THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION AISBL WILL NOT BE LIABLE
6161
FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT
6262
OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE OR IMPLEMENTATION OF THE
6363
CONTENTS THEREOF.</p>
6464

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

spec/pom.xml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2019, 2021 Contributors to the Eclipse Foundation.
4+
Copyright (c) 2019, 2024 Contributors to the Eclipse Foundation.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.eclipse.ee4j</groupId>
2424
<artifactId>project</artifactId>
25-
<version>1.0.6</version>
25+
<version>1.0.9</version>
2626
<relativePath/>
2727
</parent>
2828

@@ -71,6 +71,26 @@
7171
</executions>
7272
</plugin>
7373

74+
<plugin>
75+
<groupId>org.codehaus.mojo</groupId>
76+
<artifactId>build-helper-maven-plugin</artifactId>
77+
<version>3.5.0</version>
78+
<executions>
79+
<execution>
80+
<id>timestamp-property</id>
81+
<goals>
82+
<goal>timestamp-property</goal>
83+
</goals>
84+
<phase>validate</phase>
85+
<configuration>
86+
<name>current.year</name>
87+
<pattern>yyyy</pattern>
88+
<locale>en_US</locale>
89+
</configuration>
90+
</execution>
91+
</executions>
92+
</plugin>
93+
7494
<plugin>
7595
<groupId>org.asciidoctor</groupId>
7696
<artifactId>asciidoctor-maven-plugin</artifactId>
@@ -146,6 +166,7 @@
146166
<revnumber>${spec.version}</revnumber>
147167
<revremark>${status}</revremark>
148168
<revdate>${revisiondate}</revdate>
169+
<revyear>${current.year}</revyear>
149170
</attributes>
150171
</configuration>
151172
</plugin>

spec/src/main/asciidoc/faces-spec.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:email: https://accounts.eclipse.org/mailing-list/faces-dev
88
:version-label!:
99
:doctype: book
10-
:license: Eclipse Foundation Specification License v1.0
10+
:license: Eclipse Foundation Specification License v1.1
1111
:source-highlighter: coderay
1212
:toc: left
1313
:toclevels: 4

spec/src/main/asciidoc/license-efsl.adoc

Lines changed: 23 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4,74 +4,39 @@ Specification: {doctitle}
44
55
Version: {revnumber}
66
7+
ifeval::["{revremark}" != ""]
78
Status: {revremark}
9+
endif::[]
10+
ifeval::["{revremark}" == ""]
11+
Status: Final Release
12+
endif::[]
813
914
Release: {revdate}
1015
....
1116

12-
== Copyright
17+
Copyright (c) 2018, {revyear} Eclipse Foundation.
1318

14-
Copyright (C) 2019, {docyear} Eclipse Foundation.
15-
https://www.eclipse.org/legal/efsl.php[]
19+
= Eclipse Foundation Specification License - v1.1
1620

17-
=== Eclipse Foundation Specification License – v1.0
21+
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:
1822

19-
By using and/or copying this document, or the Eclipse Foundation
20-
document from which this statement is linked, you (the licensee) agree
21-
that you have read, understood, and will comply with the following
22-
terms and conditions:
23-
24-
Permission to copy, and distribute the contents of this document, or
25-
the Eclipse Foundation document from which this statement is linked, in
26-
any medium for any purpose and without fee or royalty is hereby
27-
granted, provided that you include the following on ALL copies of the
28-
document, or portions thereof, that you use:
23+
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:
2924

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

5132
The notice is:
5233

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