Fix final version copyright and license (#409)

* Swtich to Jakarta EE parent pom (#398) * A structure to test release staging Signed-off-by: Scott M Stark <starksm64@gmail.com> * New structure for release testing Signed-off-by: Scott M Stark <starksm64@gmail.com> * New structure to test releases on CI (#401) * New structure for release testing Signed-off-by: Scott M Stark <starksm64@gmail.com> * Fix changes lost with merge Signed-off-by: Scott M Stark <starksm64@gmail.com> * Add -Xdoclint:none to avoid current javadoc errors Signed-off-by: Scott M Stark <starksm64@gmail.com> * Fix the javadoc errors Signed-off-by: Scott M Stark <starksm64@gmail.com> * A structure to test release staging Signed-off-by: Scott M Stark <starksm64@gmail.com> * New structure for release testing Signed-off-by: Scott M Stark <starksm64@gmail.com> * Fix changes lost with merge Signed-off-by: Scott M Stark <starksm64@gmail.com> * Add -Xdoclint:none to avoid current javadoc errors Signed-off-by: Scott M Stark <starksm64@gmail.com> * Fix the javadoc errors Signed-off-by: Scott M Stark <starksm64@gmail.com> * Update el version to 3.0.3 and interceptor version to 1.2.5 to match the Jakarta EE 8 staging releases Signed-off-by: starksm64 <starksm64@gmail.com> * Update to use Jakarta EE names Signed-off-by: starksm64 <starksm64@gmail.com> * Update to use Jakarta names Signed-off-by: starksm64 <starksm64@gmail.com> * Try overriding the nexus-staging-maven-plugin stating url Signed-off-by: Scott M Stark <starksm64@gmail.com> * Update the javadoc copyright footer Update the developer related info Signed-off-by: Scott M Stark <starksm64@gmail.com> * Fix java EE usage Signed-off-by: Scott M Stark <starksm64@gmail.com> * Fix the final version copyright and license Signed-off-by: Scott M Stark <starksm64@gmail.com>
jakartaee · Aug 10, 2019 · e3a8c99 · e3a8c99
1 parent 0cd6afa
commit e3a8c99
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 8 deletions.
diff --git a/spec/pom.xml b/spec/pom.xml
@@ -17,7 +17,8 @@
 	<properties>
 		<asciidoctor-maven.version>1.5.6</asciidoctor-maven.version>
 		<asciidoctorj-pdf.version>1.5.0-alpha.14</asciidoctorj-pdf.version>
-		<license-file>asl2</license-file>
+		<!-- asl2 for non-final releases, or final for EFSL -->
+		<license-file>final</license-file>
 		<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
 		<revisiondate>${maven.build.timestamp}</revisiondate>
 	</properties>

diff --git a/spec/src/main/asciidoc/cdi-spec.asciidoc b/spec/src/main/asciidoc/cdi-spec.asciidoc
@@ -1,8 +1,8 @@
-= Jakarta Contexts and Dependency Injection for Java 2.0
+= Jakarta Contexts and Dependency Injection
 :author: Jakarta Contexts and Dependency Injection Spec Project lead by Antoine Sabot-Durand
 :email: cdi-dev@eclipse.org
-:revnumber: 2.0.2
-:revdate: July 26 2019
+:revnumber: 2.0
+:revdate: Aug 10 2019
 :revremark: Final
 :version-label!:
 :sectanchors:

diff --git a/spec/src/main/asciidoc/javaee/scopescontext_ee.asciidoc b/spec/src/main/asciidoc/javaee/scopescontext_ee.asciidoc
@@ -55,7 +55,7 @@ Portable extensions that integrate with the container via Unified EL should also
 
 [[passivation_capable_dependency_ee]]
 
-==== Passivation capable dependencies in java EE
+==== Passivation capable dependencies in Jakarta EE
 
 When running in Jakarta EE, the container must extend the rules defined in <<passivation_capable_dependency>>, and must also guarantee that:
 

diff --git a/spec/src/main/asciidoc/license-asl2.asciidoc b/spec/src/main/asciidoc/license-asl2.asciidoc
@@ -11,7 +11,9 @@ Specification Lead:  Red Hat, Inc.
 
 Release: {revdate}
 
-Copyright 2017 Red Hat, Inc.
+=== Evaluation license
+
+Copyright 2017-2019 Red Hat, Inc.
 100 East Davie Street, Raleigh, NC 27601, U.S.A.
 
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/spec/src/main/asciidoc/license-final.asciidoc b/spec/src/main/asciidoc/license-final.asciidoc
@@ -0,0 +1,52 @@
+// Jakarta Bean Validation
+//
+// License: Apache License, Version 2.0
+// See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+
+:numbered!:
+["preface",sectnum="0"]
+
+[subs="normal"]
+....
+Specification: {doctitle}
+
+Version: {revnumber}
+
+Status: {revremark}
+
+Release: {revdate}
+....
+
+=== Final license
+
+Copyright 2019 Eclipse Foundation.
+
+This specification is licensed under the Eclipse Foundation Specification License 1.0; this specification is based on material that is licensed under the Apache License, version 2.0.
+
+
+=== Eclipse Foundation Specification License - v1.0
+
+(Copy of the EFSL license link:https://www.eclipse.org/legal/efsl.php[here])
+
+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:
+
+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:
+
+* 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 © [$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, documents, or other items or products that you create pursuant to the implementation of the contents of this document, or any portion thereof.
+
+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.
+
+The notice is:
+
+Copyright © 2019 Eclipse Foundation. This software or document includes material copied from or derived from Jakarta Bean Validation https://projects.eclipse.org/projects/ee4j.bean-validation
+
+Disclaimers
+
+THIS DOCUMENT IS PROVIDED "AS IS," AND THE COPYRIGHT HOLDERS AND THE ECLIPSE FOUNDATION 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 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 this document or its contents without specific, written prior permission. Title to copyright in this document will at all times remain with copyright holders.
diff --git a/spec/src/main/asciidoc/preface.asciidoc b/spec/src/main/asciidoc/preface.asciidoc
@@ -3,8 +3,6 @@
 
 == Preface
 
-=== Evaluation license
-
 include::license-{license}.asciidoc[]
 
 === Foreword