Merge pull request #1231 from jim-krueger/1127-Clarify-JAVASE-support

fast-track: Clarify the JavaSE support in Jakarta Rest Specification
jakartaee · Mar 28, 2024 · 8820386 · 8820386
2 parents 0cc7896 + 467bcdd
commit 8820386
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/jaxrs-spec/src/main/asciidoc/chapters/appendix/_changes-since-3.1-release.adoc b/jaxrs-spec/src/main/asciidoc/chapters/appendix/_changes-since-3.1-release.adoc
@@ -12,4 +12,6 @@
 === Changes Since 3.1 Release
 
 * <<javaee>>: Removal of `@ManagedBean`
-annotation support.  Managed bean support is now part of CDI.
+annotation support.  Managed bean support is now part of CDI.
+* <<java-se>>: Clarified when the two alternative ways of publishing on 
+Java SE must be supported.
diff --git a/jaxrs-spec/src/main/asciidoc/chapters/applications/_publication.adoc b/jaxrs-spec/src/main/asciidoc/chapters/applications/_publication.adoc
@@ -15,14 +15,13 @@ Applications are published in different ways depending on whether the
 application is run in a Java SE environment or within a container. This
 section describes the alternate means of publication.
 
-A compliant implementation MUST support both alternatives on Java SE.
-
 [[java-se]]
 ==== Java SE
 
 There are two alternative ways of publishing on Java SE:
 Creating SE endpoints directly or using the SE bootstrap API.
-Both are described in this section.
+Both are described in this section. Any compliant implementation that 
+supports either of these alternatives on Java SE MUST support both.
 
 [[se-endpoint]]
 ===== Java SE Endpoint

diff --git a/jaxrs-tck/docs/assertions/JAXRSSpecAssertions_3.1.0.html b/jaxrs-tck/docs/assertions/JAXRSSpecAssertions_3.1.0.html
@@ -1216,7 +1216,7 @@ <h2>  Jakarta RESTful Web Services - 3.1<br>
 </TR>
 
 <TR>
-<TD align="center" valign="center"><a name="JAXRS:SPEC:131"></a><font size="1PT">JAXRS:SPEC:131</font></TD><TD align="center" valign="center"><font size="1PT">2</font></TD><TD align="center" valign="center"><font size="1PT">3.1</font></TD><TD align="left" valign="center"><font size="1PT">There are two alternative ways of publishing on Java SE: Creating SE endpoints directly or using the SE bootstrap API. A compliant implementation MUST support both alternatives on Java SE. </font></TD><TD align="center" valign="center"><font size="1PT">true</font></TD><TD align="center" valign="center"><font size="1PT">
+<TD align="center" valign="center"><a name="JAXRS:SPEC:131"></a><font size="1PT">JAXRS:SPEC:131</font></TD><TD align="center" valign="center"><font size="1PT">2</font></TD><TD align="center" valign="center"><font size="1PT">3.1</font></TD><TD align="left" valign="center"><font size="1PT">There are two alternative ways of publishing on Java SE: Creating SE endpoints directly or using the SE bootstrap API. Any compliant implementation that supports either of these alternatives on Java SE MUST support both. </font></TD><TD align="center" valign="center"><font size="1PT">true</font></TD><TD align="center" valign="center"><font size="1PT">
 <br>
 </font></TD><TD align="center" valign="center"><font size="1PT">false</font></TD><TD align="center" valign="center"><font size="1PT">technology</font></TD><TD align="center" valign="center"><font size="1PT">active</font></TD><TD align="center" valign="center"><font size="1PT">false</font></TD>
 </TR>

diff --git a/jaxrs-tck/docs/assertions/JAXRSSpecAssertions_3.1.0.xml b/jaxrs-tck/docs/assertions/JAXRSSpecAssertions_3.1.0.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE spec SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/spec_assertions.dtd">
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -1399,7 +1399,7 @@
         <!-- JAXRS 3.1-->
         <assertion required="true" impl-spec="false" defined-by="technology" status="active" testable="true">
             <id>JAXRS:SPEC:131</id>
-            <description>There are two alternative ways of publishing on Java SE: Creating SE endpoints directly or using the SE bootstrap API. A compliant implementation MUST support both alternatives on Java SE.</description>
+            <description>There are two alternative ways of publishing on Java SE: Creating SE endpoints directly or using the SE bootstrap API. Any compliant implementation that supports either of these alternatives on Java SE MUST support both.</description>
             <location chapter="2" section="3.1"/>
         </assertion>
         <assertion required="true" impl-spec="false" defined-by="technology" status="active" testable="true">