Update EFSL references per guidance from platform-dev list

Signed-off-by: Mark Thomas <markt@apache.org>
jakartaee · May 26, 2020 · fb26bad · fb26bad
1 parent 18fb8ed
commit fb26bad
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 23 deletions.
diff --git a/api/client/src/main/javadoc/doc-files/EFSL.html b/api/client/src/main/javadoc/doc-files/EFSL.html
@@ -16,12 +16,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;
+      of the form: &quot;Copyright &copy; [$date-of-document] Eclipse
+      Foundation, Inc. &lt;&lt;url to this license&gt;&gt;&quot;
   </li>
 </ul>
 
@@ -42,9 +41,10 @@ <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>&quot;Copyright &copy; 2018, 2020 Eclipse Foundation. This software or
+  document includes material copied from or derived from
+  Jakarta ® WebSocket
+  https://jakarta.ee/specifications/websocket/2.0/&quot;</p>
 
 <h2>Disclaimers</h2>
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -196,9 +196,10 @@
                     <windowtitle>Jakarta WebSocket API documentation</windowtitle>
                     <header><![CDATA[Jakarta WebSocket API v${project.version}]]></header>
                     <bottom><![CDATA[
-                        Copyright &#169; ${project.inceptionYear}&#x2013;{currentYear} Oracle and/or its affiliates. All rights reserved.<br>
-                        Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license terms</a>.
-                    ]]></bottom>
+Comments to: <a href="mailto:websocket-dev@eclipse.org">websocket-dev@eclipse.org</a>.<br>
+Copyright &#169; 2018, 2020 Eclipse Foundation. All rights reserved.<br>
+Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license terms</a>.]]>
+                    </bottom>
                     <includeDependencySources>true</includeDependencySources>
                     <source>8</source>
                 </configuration>

diff --git a/api/server/src/main/javadoc/doc-files/EFSL.html b/api/server/src/main/javadoc/doc-files/EFSL.html
@@ -16,12 +16,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;
+      of the form: &quot;Copyright &copy; [$date-of-document] Eclipse
+      Foundation, Inc. &lt;&lt;url to this license&gt;&gt;&quot;
   </li>
 </ul>
 
@@ -42,9 +41,10 @@ <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>&quot;Copyright &copy; 2018, 2020 Eclipse Foundation. This software or
+  document includes material copied from or derived from
+  Jakarta ® WebSocket
+  https://jakarta.ee/specifications/websocket/2.0/&quot;</p>
 
 <h2>Disclaimers</h2>
 

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -51,6 +51,25 @@
     <build>
         <defaultGoal>package</defaultGoal>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>timestamp-property</id>
+                        <goals>
+                            <goal>timestamp-property</goal>
+                        </goals>
+                        <phase>validate</phase>
+                        <configuration>
+                            <name>current.year</name>
+                            <pattern>yyyy</pattern>
+                            <locale>en_US</locale>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -152,6 +171,7 @@
                         <revnumber>${project.version}</revnumber>
                         <revremark>${status}</revremark>
                         <revdate>${revisiondate}</revdate>
+                        <revyear>${current.year}</revyear>
                     </attributes>
                 </configuration>
             </plugin>

diff --git a/spec/src/main/asciidoc/license-efsl.adoc b/spec/src/main/asciidoc/license-efsl.adoc
@@ -14,7 +14,7 @@ endif::[]
 Release: {revdate}
 ....
 
-Copyright (c) 2020 Eclipse Foundation.
+Copyright (c) 2018, {revyear} Eclipse Foundation.
 
 === Eclipse Foundation Specification License
 
@@ -32,8 +32,8 @@ 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 © [$date-of-document] Eclipse Foundation, Inc.
+  \<<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,
@@ -52,9 +52,10 @@ specification is expressly prohibited.
 
 The notice is:
 
-"Copyright (c) 2020 Eclipse Foundation. This software or document
-includes material copied from or derived from {doctitle} {revnumber}
-{revremark} [URI of the Eclipse Foundation specification document]."
+"Copyright © 2018, 2020 Eclipse Foundation. This software or document
+includes material copied from or derived from
+Jakarta ® WebSocket
+https://jakarta.ee/specifications/websocket/2.0/[https://jakarta.ee/specifications/websocket/2.0/]"
 
 ==== Disclaimers