Merge pull request jakartaee#481 from starksm64/master

Update specification versions and related documents

specification/src/main/asciidoc/coreprofile/CoreProfileDefinition.adoc

@@ -7,17 +7,13 @@ This chapter defines the contents of the Jakarta™ EE 10.0 Core Profile.
 
 The following technologies are required components of the Core Profile:
 
-* Jakarta RESTful Web Services 4.0
 * Jakarta JSON Processing 2.1
-* Jakarta JSON Binding 2.1
-* Jakarta Annotations 2.0
-* Jakarta Contexts and Dependency Injection Lite 4.0
-* Jakarta Interceptors 2.0
+* Jakarta JSON Binding 3.0
+* Jakarta Annotations 2.1
+* Jakarta Interceptors 2.1
 * Jakarta Dependency Injection 2.0
-* Jakarta Config 1.0 (If available by deadline)
-
-NOTE: This list has not been finalized. Discussions exist in the
-current https://github.com/eclipse-ee4j/jakartaee-platform/issues/353[GitHub] issue and https://docs.google.com/document/d/1tal7dMb6DOHBCwlecViEjPqAMTMEStoZdxTVokIVW94/edit#[GoogleDoc].
+* Jakarta Contexts and Dependency Injection Lite 4.0
+* Jakarta RESTful Web Services 3.1
 
 === Optional Components
 
@@ -28,3 +24,7 @@ There are no optional components in the Core Profile.
 
 There are currently no requirements on the deployment packaging of
 core profile based applications.
+
+Jakarta XML Binding support is not required for Jakarta RESTful Web Services implementations in the Core Profile.
+
+Jakarta Expression Language support is not required in  Jakarta Contexts and Dependency Injection Lite implementations.

specification/src/main/asciidoc/coreprofile/Introduction.adoc

@@ -37,11 +37,11 @@ For the first one, the Jakarta EE Platform
 specification mandates support for Java(TM) Platform, Standard Edition 11 API.  Because of this, all Core Profile 10.0 APIs must support the Java(TM) Platform, Standard Edition 11 API.
 
 In the second category one can point out the
-requirement to support Jakarta EE web application modules ( _.war_ files)
+that Jakarta XML Binding support is not required for Jakarta RESTful Web Services in the Core Profile.
 (<<additional_requirements, see Additional Requirements>>).
 
 The third category is hopefully
-self-explanatory. For example, Core Profile products must implement the Jakarta RESTful Web Services API, which in turn means they need to satisfy all the requirements listed in the Jakarta RESTful Web Services 4.0 specification.
+self-explanatory. For example, Core Profile products must implement the Jakarta RESTful Web Services API, which in turn means they need to satisfy all the requirements listed in the Jakarta RESTful Web Services 3.1 specification.
 
 The fourth category is the most complex. As a
 first example, TBD...

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

@@ -8,16 +8,16 @@ specification are included in parentheses.
 
 _Java™ Platform, Standard Edition, v11 API Specification (Java SE specification)_. Available at: _https://docs.oracle.com/en/java/javase/11/_
 
-_Jakarta™ RESTful Web Services Specification, Version 4.0_. Available at: _https://jakarta.ee/specifications/restful-ws/4.0_
+_Jakarta™ RESTful Web Services Specification, Version 3.1_. Available at: _https://jakarta.ee/specifications/restful-ws/3.1_
 
-_Jakarta™ Annotations Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/annotations/2.0_
+_Jakarta™ Annotations Specification, Version 2.1_. Available at: _https://jakarta.ee/specifications/annotations/2.1_
 
-_Jakarta™ Interceptors Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/interceptors/2.0_
+_Jakarta™ Interceptors Specification, Version 2.1_. Available at: _https://jakarta.ee/specifications/interceptors/2.1_
 
 _Jakarta™ Contexts and Dependency Injection Lite Specification, Version 4.0_. Available at: _https://jakarta.ee/specifications/cdi-lite/4.0_
 
 _Jakarta™ Dependency Injection Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/dependency-injection/2.0_
 
 _Jakarta™ JSON Processing Specification, Version 2.1_. Available at: _https://jakarta.ee/specifications/jsonp/2.1_
 
-_Jakarta™ JSON Binding Specification, Version 2.1_. Available at: _https://jakarta.ee/specifications/jsonb/2.1_
+_Jakarta™ JSON Binding Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/jsonb/3.0_

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

@@ -1,6 +1,6 @@
 [appendix]
 
 == Revision History
-=== Changes in Final Release EE10
-==== Editorial Changes
-* TBD
+
+=== Changes in Final Release EE 10
+* Initial version

specification/src/main/asciidoc/webprofile/Introduction.adoc

@@ -75,8 +75,7 @@ It will also be seen as a starting point for understanding how the requirements
 To help with this process, this section attempts to shed light on how one should go from the definition of the Web Profile to figuring out the exact set of requirements that apply to it, and consequently to any product that implements it.
 
 As dictated by the general rules for Jakarta EE
-profiles in the Platform specification, products that implement the Web
-Profile must honor:
+profiles in the Platform specification, products that implement the Web Profile must honor:
 
 . all requirements of the Jakarta EE Platform
 specification that apply to all profiles;
@@ -91,9 +90,7 @@ Let’s look at some examples of requirements
 from each grouping.
 
 For the first one, the Jakarta EE Platform
-specification mandates support for the “ _java:_ ” naming context in all
-profiles. Consequently, Web Profile products must support it. For a
-similar reason, all Web Profile 9.1 APIs must support the Java(TM) Platform, Standard Edition 8 API.
+specification mandates support for the Java(TM) Platform, Standard Edition 11 API.
 
 In the second category one can point out the
 requirement to support Jakarta EE web application modules ( _.war_ files)
@@ -215,4 +212,7 @@ Specification Project with guidance provided by the Jakarta EE Working Group
 
 
 === Acknowledgements for Jakarta EE 10.0
-TBD
+TBD
+
+The Jakarta EE 10 specification was created by the Jakarta EE Platform Specification Project with guidance provided by the Jakarta EE Working Group
+(_https://jakarta.ee/_).

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

@@ -6,48 +6,50 @@ This specification refers to the following
 documents. The terms used to refer to the documents in this
 specification are included in parentheses.
 
-_Jakarta™ EE Platform Specification Version 9.1_. Available at: _https://jakarta.ee/specifications/platform/9.1_
+_Jakarta™ EE Platform Specification Version 10.0_. Available at: _https://jakarta.ee/specifications/platform/10.0_
 
 _Java™ Platform, Standard Edition, v11 API Specification (Java SE specification)_. Available at: _https://docs.oracle.com/en/java/javase/11/_
 
 _Jakarta™ Enterprise Beans Specification, Version 4.0_. Available at: _https://jakarta.ee/specifications/enterprise-beans/4.0_
 
-_Jakarta™ Server Pages Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/pages/3.0_
+_Jakarta™ Server Pages Specification, Version 3.1_. Available at: _https://jakarta.ee/specifications/pages/3.1_
 
-_Jakarta™ Expression Language Specification, Version 4.0_. Available at: _https://jakarta.ee/specifications/expression-language/4.0_
+_Jakarta™ Expression Language Specification, Version 5.0_. Available at: _https://jakarta.ee/specifications/expression-language/5.0_
 
-_Jakarta™ Servlet Specification, Version 5.0_. Available at: _https://jakarta.ee/specifications/servlet/5.0_
+_Jakarta™ Servlet Specification, Version 6.0_. Available at: _https://jakarta.ee/specifications/servlet/6.0_
 
 _Jakarta™ Transaction Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/transactions/2.0_
 
-_Jakarta™ RESTful Web Services Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/restful-ws/3.0_
+_Jakarta™ RESTful Web Services Specification, Version 3.1_. Available at: _https://jakarta.ee/specifications/restful-ws/3.1_
 
-_Jakarta™ Annotations Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/annotations/2.0_
+_Jakarta™ Annotations Specification, Version 2.1_. Available at: _https://jakarta.ee/specifications/annotations/2.1_
 
 _Jakarta™ Debugging Support for Other Languages Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/debugging/2.0_
 
-_Jakarta™ Standard Tag Library Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/tags/2.0_
+_Jakarta™ Standard Tag Library Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/tags/3.0_
 
-_Jakarta™ Server Faces Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/faces/3.0_
+_Jakarta™ Server Faces Specification, Version 4.0_. Available at: _https://jakarta.ee/specifications/faces/4.0_
 
-_Jakarta™ Persistence Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/persistence/3.0_
+_Jakarta™ Persistence Specification, Version 3.1_. Available at: _https://jakarta.ee/specifications/persistence/3.1_
 
 _Jakarta™ Bean Validation Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/bean-validation/3.0_
 
 _Jakarta™ Managed Beans Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/managedbeans/2.0_
 
-_Jakarta™ Interceptors Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/interceptors/2.0_
+_Jakarta™ Interceptors Specification, Version 2.1_. Available at: _https://jakarta.ee/specifications/interceptors/2.1_
 
-_Jakarta™ Contexts and Dependency Injection Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/cdi/3.0_
+_Jakarta™ Contexts and Dependency Injection Specification, Version 4.0_. Available at: _https://jakarta.ee/specifications/cdi/4.0_
 
 _Jakarta™ Dependency Injection Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/dependency-injection/2.0_
 
-_Jakarta™ WebSocket Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/websocket/2.0_
+_Jakarta™ WebSocket Specification, Version 2.1_. Available at: _https://jakarta.ee/specifications/websocket/2.1_
 
-_Jakarta™ JSON Processing Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/jsonp/2.0_
+_Jakarta™ JSON Processing Specification, Version 2.1_. Available at: _https://jakarta.ee/specifications/jsonp/2.1_
 
-_Jakarta™ JSON Binding Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/jsonb/2.0_
+_Jakarta™ JSON Binding Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/jsonb/3.0_
 
-_Jakarta™ Security Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/security/2.0_
+_Jakarta™ Security Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/security/3.0_
 
-_Jakarta™ Authentication Specification, Version 2.0_. Available at: _https://jakarta.ee/specifications/authentication/2.0_
+_Jakarta™ Authentication Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/authentication/3.0_
+
+_Jakarta™ Concurrency Specification, Version 3.0_. Available at: _https://jakarta.ee/specifications/concurrency/3.0_

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

@@ -4,6 +4,9 @@
 === Changes in Final Release for EE10
 TBD
 
+==== Editorial Changes
+* Updated <<relateddocs, “Related Documents">> for the updated Specifications in Jakarta EE 10.
+
 === Changes in Final Release for EE9.1
 ==== Editorial Changes
 * Updated <<relateddocs, “Related Documents">> for the updated Specifications in Jakarta EE 9.1.

specification/src/main/asciidoc/webprofile/WebProfileDefinition.adoc

@@ -9,27 +9,30 @@ Jakarta™ EE 9.1 Web Profile.
 The following technologies are required
 components of the Web Profile:
 
-* Jakarta Servlet 5.0
-* Jakarta Server Pages 3.0
-* Jakarta Expression Language  4.0
+* Jakarta Servlet 6.0*
+* Jakarta Server Pages 3.1*
+* Jakarta Expression Language  5.0*
 * Jakarta Debugging Support for Other Languages 2.0
-* Jakarta Standard Tag Library  2.0
-* Jakarta Server Faces  3.0
-* Jakarta RESTful Web Services 3.0
-* Jakarta WebSocket  2.0
-* Jakarta JSON Processing  2.0
-* Jakarta JSON Binding  2.0
-* Jakarta Annotations  2.0
-* Jakarta Enterprise Beans  4.0 Lite
+* Jakarta Standard Tag Library 3.0*
+* Jakarta Server Faces 4.0*
+* Jakarta RESTful Web Services 3.1*
+* Jakarta WebSocket 2.1*
+* Jakarta JSON Processing 2.1*
+* Jakarta JSON Binding 3.0*
+* Jakarta Annotations  2.1*
+* Jakarta Enterprise Beans 4.0 Lite
 * Jakarta Transactions 2.0
-* Jakarta Persistence  3.0
+* Jakarta Persistence  3.1*
 * Jakarta Bean Validation 3.0
 * Jakarta Managed Beans 2.0
-* Jakarta Interceptors 2.0
-* Jakarta Contexts and Dependency Injection  3.0
+* Jakarta Interceptors 2.1*
+* Jakarta Contexts and Dependency Injection 4.0*
 * Jakarta Dependency Injection  2.0
-* Jakarta Security  2.0
-* Jakarta Authentication 2.0
+* Jakarta Security  3.0*
+* Jakarta Authentication 3.0*
+* Jakarta Concurrency 3.0*
+
+*Note:* technologies with an asterik after them represent updated versions.
 
 === Optional Components