Merge pull request jakartaee#109 from dblevins/brand-mapping

[WIP] Mapping of Java EE 8 and Jakarta EE 8 brands and versions

specification/src/main/asciidoc/platform/Platform.adoc

@@ -27,6 +27,8 @@ include::FutureDirections.adoc[]
 
 include::PreviousVersionDeploymentDescriptors.adoc[]
 
+include::SpecificationComparison.adoc[]
+
 include::RevisionHistory.adoc[]
 
 include::RelatedDocuments.adoc[]

specification/src/main/asciidoc/platform/PlatformOverview.adoc

@@ -1063,3 +1063,4 @@ event processing and alignment on Java SE 8 features.
 === Changes in Jakarta EE 8
 
 Jakarta EE 8 is the migration of Java EE 8 from the JCP to the Eclipse Foundation.
+Reference the <<specificationComparison, "Specification Comparison">> and <<revisionHistory, “Revision History">> appendices for more information.

specification/src/main/asciidoc/platform/Profiles.adoc

@@ -209,7 +209,7 @@ associated Jakarta Enterprise Beans QL, which have been made optional)
 * Jakarta Security 1.0
 * Jakarta Debugging Support for Other Languages 1.0
 * Jakarta Standard Tag Library 1.2
-* Jakarta Web Services Metadata 1.1
+* Jakarta Web Services Metadata 2.1
 * Jakarta Server Faces 2.3
 * Jakarta Annotations 1.3
 * Jakarta Persistence 2.2

specification/src/main/asciidoc/platform/RelatedDocuments.adoc

@@ -60,7 +60,7 @@ _Jakarta™ Debugging Support for Other Languages Specification, Version 1.0_. A
 
 _Jakarta™ Standard Tag Library Specification, Version 1.2_. Available at: _https://jakarta.ee/specifications/tags/1.2_
 
-_Jakarta™ Web Services Metadata Specification, Version 1.1_. Available at: _https://jakarta.ee/specifications/web-services-metadata/1.1_
+_Jakarta™ Web Services Metadata Specification, Version 2.1_. Available at: _https://jcp.org/aboutJava/communityprocess/mrel/jsr181/index2.html_
 
 _Jakarta™ Server Faces Specification, Version 2.3_. Available at: _https://jakarta.ee/specifications/faces/2.3_
 

specification/src/main/asciidoc/platform/RevisionHistory.adoc

@@ -1,4 +1,5 @@
 [appendix]
+[[revisionHistory]]
 == Revision History
 
 === Changes in Final Release Draft
@@ -7,4 +8,5 @@
 
 * Changed most instances of "Java EE" to "Jakarta EE", except where the previous technology was clearly the target.
 * Modified references to Oracle(TM)-related items per the https://jakarta.ee/legal/acronym_guidelines/[documented guidelines].
-* Updated <<relateddocs, “Related Documents">>.
+* Added <<specificationComparison, "Specification Comparison">> appendix.
+* Updated <<relateddocs, “Related Documents">> appendix.

specification/src/main/asciidoc/platform/SpecificationComparison.adoc

@@ -0,0 +1,179 @@
+[appendix]
+[[specificationComparison]]
+== Java EE 8 and Jakarta EE 8 Comparison
+=== Java EE 8 and Jakarta EE 8 Specification Comparisons
+The intent of this section is to explain any differences in specification names and versions between those referenced in the last Java EE 8 Platform specification, dated July 31st, 2017 and the Jakarta EE 8 Platform specification.
+
+In some cases the versions changed in preparation for contribution and therefore the official JCP versions changed over those referenced in the July 31st, 2017 Platform specification.  In other cases the versions were changed after the contribution.  This section explains both sets of changes and encompasses all specifications contributed.
+
+It is important to understand that despite any name or version changes, Java EE 8 and Jakarta EE 8 are functionally equivalent.
+
+[cols=2, options=header]
+.Java EE 8 and Jakarta EE 8 Specification References
+|===
+|Java EE 8 Specification
+|Jakarta EE 8 Specification
+
+|Java™ Platform, Enterprise Edition 8
+|Jakarta™ EE Platform 8
+
+|Enterprise JavaBeans™ 3.2
+|Jakarta™ Enterprise Beans 3.2
+
+|Common Annotations for the Java Platform 1.3
+|Jakarta™ Annotations 1.3
+
+|Java™ Servlet 4.0
+|Jakarta™ Servlet 4.0
+
+|Java API for WebSocket 1.1
+|Jakarta™ WebSocket 1.1
+
+|JavaServer Faces 2.3
+|Jakarta™ Server Faces 2.3
+
+|JavaServer Pages™ 2.3
+|Jakarta™ Server Pages 2.3
+
+|Standard Tag Library for JavaServer Pages 1.2
+|Jakarta™ Standard Tag Library 1.2
+
+|Expression Language 3.0
+|Jakarta™ Expression Language 3.0
+
+|Debugging Support for Other Languages 1.0
+|Jakarta™ Debugging Support for Other Languages 1.0
+
+|Java™ Message Service 2.0
+|Jakarta™ Messaging 2.0
+
+|Java™ Transaction API 1.2
+|Jakarta™ Transaction 1.3
+
+|JavaMail™ API 1.6
+|Jakarta™ Mail 1.6
+
+|Java EE™ Connector Architecture 1.7
+|Jakarta™ Connectors 1.7
+
+|Web Services for Java EE 1.4
+|Jakarta™ Enterprise Web Services 1.4
+
+|Java™ API for XML-based RPC 1.1
+|Jakarta™ XML RPC 1.1
+
+|Java™ API for XML Registries 1.0
+|Jakarta™ XML Registries 1.0
+
+|Java™ API for RESTful Web Services 2.1
+|Jakarta™ RESTful Web Services 2.1
+
+|Java API for JSON Processing 1.1
+|Jakarta™ JSON Processing 1.1
+
+|Java API for JSON Binding 1.0
+|Jakarta™ JSON Binding 1.0
+
+|Java™ Platform, Enterprise Edition Management 1.1
+|Jakarta™ Management 1.1
+
+|Java™ Platform, Enterprise Edition Deployment 1.2
+|Jakarta™ Deployment 1.7
+
+|Java™ Authorization Service Provider Contract for Containers 1.5
+|Jakarta™ Authorization 1.5
+
+|Java™ Authentication Service Provider Interface for Containers 1.1
+|Jakarta™ Authentication 1.1
+
+|Java™ EE Security API 1.0
+|Jakarta™ Security 1.0
+
+|Java Persistence 2.2
+|Jakarta™ Persistence 2.2
+
+|Bean Validation 2.0
+|Jakarta™ Bean Validation 2.0
+
+|Managed Beans 1.0
+|Jakarta™ Managed Beans 1.0
+
+|Interceptors 1.2 rev A
+|Jakarta™ Interceptors 1.2
+
+|Contexts and Dependency Injection for the Java EE Platform 2.0
+|Jakarta™ Contexts and Dependency Injection 2.0
+
+|Dependency Injection for Java 1.0
+|Jakarta™ Dependency Injection 1.0
+
+|Concurrency Utilities for Java EE 1.0
+|Jakarta™ Concurrency 1.1
+
+|Batch Applications for the Java Platform 1.0 rev A
+|Jakarta™ Batch 1.0
+|===
+
+==== Transaction 1.2 vs 1.3
+
+To address cleanly separating the `javax.transaction` package in Java™ SE from the classes being contributed, a Maintenance Release of the Java™ Transaction API (JTA) was created in the JCP and released as https://jcp.org/aboutJava/communityprocess/maintenance/jsr907/JTA1.3MR-November2017.pdf[version 1.3].  The official Jakarta version is therefore 1.3 and not 1.2.
+
+No API changes were made in this Maintenance Release or after contribution and Java™ Transaction API 1.2, Java™ Transaction API 1.3 and Jakarta Transaction 1.3 are functionally equivalent.
+
+==== Deployment 1.2 vs 1.7
+
+The last Maintenance Release of JSR-88 Java™ EE Application Deployment in the JCP is version 1.2.  After contribution and before completion of the Jakarta EE Specification Process a version 1.7 was released under the `jakarta` groupId in efforts to ship a Java EE 8 certified version of Eclipse GlassFish.
+
+The mistaken change from 1.2 to 1.7 was discovered while following the completed Jakarta EE Specification Process.  The Specification Committee decided to leave the version as 1.7 to avoid any potential future version conflicts.
+
+Java™ EE Application Deployment 1.2 and Jakarta™ Deployment 1.7 are functionally equivalent.
+
+==== Concurrency 1.0 vs 1.1
+
+The last official release of JSR 236: Concurrency Utilities for JavaTM EE was 1.0.  A version 1.1 was published under the `javax` groupId in Feb 2018 and again as 1.1 under the `jakarta` groupId in Jan 2019 for the previously mentioned Java EE 8 certified version of Eclipse GlassFish.
+
+The mistaken change from 1.0 to 1.1 was discovered while following the Jakarta EE Specification Process and, as with Deployment, the Specification Committee decided to leave the version 1.1 to avoid future version conflicts.
+
+Concurrency Utilities for Java EE 1.0 and Jakarta Concurrency 1.1 are functionally equivalent.
+
+=== Java EE 8 Specification References
+
+The following table lists specifications contributed to Eclipse but not included in Jakarta EE 8.
+These specifications are a part of Java SE 8 but are being removed from later versions of
+Java SE as described in https://openjdk.java.net/jeps/320[JEP 320]. These specifications are an important part of the Jakarta EE
+platform and will be considered for inclusion in a version of Jakarta EE that targets versions of
+Java SE where they have been removed.
+
+[cols=2, options=header]
+.Additional Java EE 8 Specification References
+|===
+|Java EE 8 Specification
+|Jakarta EE Specification (future)
+
+|JavaBeans™ Activation Framework 1.1
+|Jakarta Activation 1.2
+
+|Java™ Architecture for XML Binding 2.3
+|Jakarta XML Binding 2.3
+
+|Java™ API for XML Web Services 2.3
+|Jakarta XML Web Services 2.3
+
+|SOAP with Attachments API for Java™ 1.3
+|Jakarta SOAP with Attachments 1.4
+
+|Web Services Metadata for the Java Platform 2.1
+|Jakarta Web Services Metadata 2.1
+|===
+
+====  Activation 1.1 vs 1.2
+
+The Java EE 8 Platform specification, dated July 31st, 2017, references JavaBeans™ Activation Framework Specification Version 1.1 in appendix EE.C Related Documents.
+A Maintenance Release of the JavaBeans™ Activation Framework was created and released in the JCP as version 1.2 dated July 2017.
+JavaBeans Activation Framework 1.2 adds support for, and is included in, Java SE 9, and is the version contributed to Eclipse.
+
+====  SOAP with Attachments 1.3 vs 1.4
+
+The Java EE 8 Platform specification, dated July 31st, 2017, references SOAP with Attachments API for Java™ Version 1.3 in appendix EE.C Related Documents.
+A Maintenance Release of the SOAP with Attachments API for Java™ was created and released as version 1.4 dated July 2017.
+The reference to SOAP with Attachments API for Java™ Version 1.3 in the Java EE 8 Platform specification, released at the same time was simply an error, and it should have referenced version 1.4.