remove _se11 from api versions and file names

docker/scripts/tcks/saajtck.sh

@@ -45,7 +45,7 @@ sed -i "s#^local.classes=.*#local.classes=$TCK_HOME/glassfish7/glassfish/modules
 sed -i "s#^endorsed.dirs=.*#endorsed.dirs=$TCK_HOME/glassfish7/glassfish/modules/endorsed#g" ts.jte
 
 if [ "$profile" == "web" ]; then
-  sed -i "s#1\.4#1.3#g" $TS_HOME/bin/sig-test_se11.map
+  sed -i "s#1\.4#1.3#g" $TS_HOME/bin/sig-test.map
 fi
 
 sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/saajtckreport#g" ts.jte

install/caj/bin/sig-test_se11.map → install/caj/bin/sig-test.map

@@ -13,4 +13,4 @@
 #
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
-jakarta.annotation=2.1_se11
+jakarta.annotation=2.1

install/concurrency/bin/sig-test_se11.map → install/concurrency/bin/sig-test.map

@@ -29,14 +29,12 @@
 #
 # The resultant signature file name has a name that complies
 # with the following format:
-# <package>.sig_<technology_version>_<JavaSE_version_these_work_with>
+# <package>.sig_<technology_version>
 # Given this format, the following example breaks down as follows:
-#    jakarta.enterprise.concurrent.sig_1.0_se11:
+#    jakarta.enterprise.concurrent.sig_1.0:
 #      <package> = jakarta.enterprise.concurrent
 #      <technology_version> = 1.0  (for CONCURRENCY)
-#      <JavaSE_version_these_work_with> = se11
 #
-# This sig-test.map file is designed to be run using JDK 11+ only.
 #
 ###############################################################
-jakarta.enterprise.concurrent=3.0_se11
+jakarta.enterprise.concurrent=3.0

install/connector/bin/sig-test_se11.map → install/connector/bin/sig-test.map

@@ -53,4 +53,4 @@
 ###############################################################
 
 # Connector (JSR-322)
-jakarta.resource=2.1_se11
+jakarta.resource=2.1

install/el/bin/sig-test_se11.map → install/el/bin/sig-test.map

@@ -22,4 +22,4 @@
 # package that should be tested by the signature tests.
 ###############################################################
 
-jakarta.el=5.0_se11
+jakarta.el=5.0

install/jacc/bin/sig-test_se11.map → install/jacc/bin/sig-test.map

@@ -46,6 +46,6 @@
 ###############################################################
 
 # Authorization 
-jakarta.security.jacc=3.0_se11
+jakarta.security.jacc=3.0
 
 

install/jakartaee/bin/sig-test_se11.map → install/jakartaee/bin/sig-test.map

@@ -26,16 +26,12 @@
 #
 # The resultant signature file name has a name that complies
 # with the following format:
-# <package>.sig_<technology_version><JavaSE_version_these_work_with>
+# <package>.sig_<technology_version>
 # Given this format, the following example breaks down as follows:
-#    jakarta.servlet=4.0_se11
+#    jakarta.servlet=4.0
 #      <package> = jakarta.servlet
 #      <technology_version> = 4.0  (for Servlet)
-#      <JavaSE_version_these_work_with> = JDK 8
 #
-# For this release valid versions are:  "_se11"
-# This sig-test.map file is designed to be run using JDK 11+ so any
-# signature file that ends with "_se11" will be valid.
 #
 # For updates to this file when the JavaEE spec gets updated,
 # as a good rule of thumb, we pull out any packages that end
@@ -66,70 +62,70 @@
 
 # EJB 4.0 
 # (This is JSR-345)
-jakarta.ejb=4.0_se11
+jakarta.ejb=4.0
 
 # Interceptors 2.0  
 # (This is JSR-318)
-jakarta.interceptor=2.0_se11
+jakarta.interceptor=2.0
 
 # Servlet 6.0 
 # (This is JSR-369)
-jakarta.servlet=6.0_se11
+jakarta.servlet=6.0
 
 # JSP 3.1 
 # (This is JSR-245)
-jakarta.servlet.jsp=3.1_se11
+jakarta.servlet.jsp=3.1
 
 # EL 5.0
 # (This is JSR-341)
-jakarta.el=5.0_se11
+jakarta.el=5.0
 
 # Faces 4.0 
 # (This is JSR-372)
-jakarta.faces=4.0_se11
+jakarta.faces=4.0
 
 # Tags 3.0
 # (This is JSR-52)
-jakarta.servlet.jsp.jstl=3.0_se11
+jakarta.servlet.jsp.jstl=3.0
 
 # Messaging 3.1 
 # (This is JSR-343)
-jakarta.jms=3.1_se11
+jakarta.jms=3.1
 
 # Transactions 2.0 
 # (This is JSR-907)
-jakarta.transaction=2.0_se11
+jakarta.transaction=2.0
 
 # Mail 2.1 
 # (This is JSR-919)
-jakarta.mail=2.1_se11
+jakarta.mail=2.1
 
 # Connector 2.1 
 # (This is JSR-322)
-jakarta.resource=2.1_se11
+jakarta.resource=2.1
 
 # Authorization 3.0
 # (This is JSR-115)
-jakarta.security.jacc=3.0_se11
+jakarta.security.jacc=3.0
 
 # Persistence 3.1
-jakarta.persistence=3.1_se11
+jakarta.persistence=3.1
 
 # Annotations 2.1
 # This is JSR-250
-jakarta.annotation=2.1_se11
+jakarta.annotation=2.1
 
 # Authentication 3.0
 # (This is JSR-196)
-jakarta.security.auth.message=3.0_se11
+jakarta.security.auth.message=3.0
 
 # JAX-RS 3.1
 # (This is JSR-370)
-jakarta.ws.rs=3.1_se11
+jakarta.ws.rs=3.1
 
 # Bean Validation 3.0
 # (This is JSR-380)
-jakarta.validation=3.0_se11
+jakarta.validation=3.0
 
 # Managed Beans 1.0 - no API to test
 # (This is listed along w/ EE spec at JSR-316)
@@ -139,36 +135,36 @@ jakarta.validation=3.0_se11
 
 # Dependency Injection for Java 2.0
 # (This is JSR-330)
-jakarta.inject=2.0_se11
+jakarta.inject=2.0
 
 # Contexts and Dependency Injection (CDI) 
 # (This is JSR-365)
-jakarta.enterprise=4.0_se11
-jakarta.decorator=4.0_se11
+jakarta.enterprise=4.0
+jakarta.decorator=4.0
 
 # Concurrency (JSR 236)
-jakarta.enterprise.concurrent=3.0_se11
+jakarta.enterprise.concurrent=3.0
 
 # JSON-P 2.1
 # (This is JSR-374)
-jakarta.json=2.1_se11
+jakarta.json=2.1
 
 # JSON-B
 # (This is JSR-367)
-jakarta.json.bind=2.1_se11
+jakarta.json.bind=2.1
 
 # WebSocket 2.1
 # (This is JSR-356)
-jakarta.websocket=2.1_se11
+jakarta.websocket=2.1
 
 # Batch 2.1 
 # (This is JSR-352)
-jakarta.batch=2.1_se11
+jakarta.batch=2.1
 
 # Security API 3.0
 # (This is JSR-375)
-jakarta.security.enterprise=3.0_se11
+jakarta.security.enterprise=3.0
 
 # javax.rmi
-javax.rmi=1.0_se11
+javax.rmi=1.0
 

install/jaspic/bin/sig-test_se11.map → install/jaspic/bin/sig-test.map

@@ -54,4 +54,4 @@
 
 
 # Authentication
-jakarta.security.auth.message=3.0_se11
+jakarta.security.auth.message=3.0

install/jaxrs/bin/sig-test_se11.map → install/jaxrs/bin/sig-test.map

@@ -17,4 +17,4 @@
 ###############################################################
 # The signature test mapping file for the JAX-RS TCK.
 ###############################################################
-jakarta.ws.rs=3.1_se11
+jakarta.ws.rs=3.1

install/jaxws/bin/sig-test_se11.map → install/jaxws/bin/sig-test.map

@@ -26,16 +26,12 @@
 #
 # The resultant signature file name has a name that complies
 # with the following format:
-# <package>.sig_<technology_version>_<JavaSE_version_these_work_with>
+# <package>.sig_<technology_version>
 # Given this format, the following example breaks down as follows:
-#    jakarta.xml.jaxws.sig_2.2_se11:
+#    jakarta.xml.jaxws.sig_2.2:
 #      <package> = jakarta.xml.ws
 #      <technology_version> = 2.2  (for JAX-WS) 
-#      <JavaSE_version_these_work_with> = JDK 11+
 #
-# For this release valid versions are:  "_se11"
-# This sig-test.map file is designed to be run using JDK 11+ so any
-# signature file that has "_se11"  in its name will be valid.
 #
 ###############################################################
-jakarta.xml.ws=4.0_se11
+jakarta.xml.ws=4.0

install/jms/bin/sig-test_se11.map → install/jms/bin/sig-test.map

@@ -29,13 +29,10 @@
 #
 # The resultant signature file name has a name that complies
 # with the following format:
-# <package>.sig_<technology_version><JavaSE_version_these_work_with>
+# <package>.sig_<technology_version>
 # Given this format, the following example breaks down as follows:
-#    jakarta.jms.sig_2.0_se11:
+#    jakarta.jms.sig_2.0:
 #      <package> = jakarta.jms
 #      <technology_version> = 2.0  (for JMS) 
-#      <JavaSE_version_these_work_with> = JDK 11 and above
-#
-# For this release valid versions are:  "_se11".
 ###############################################################
-jakarta.jms=3.1_se11
+jakarta.jms=3.1

install/jpa/bin/sig-test_se11.map → install/jpa/bin/sig-test.map

@@ -38,5 +38,5 @@
 ###############################################################
 
 # Persistence packages
-jakarta.persistence=3.1_se11
+jakarta.persistence=3.1
 

install/jsf/bin/sig-test_se11.map → install/jsf/bin/sig-test.map

@@ -21,4 +21,4 @@
 # package that should be tested by the signature tests.
 ###############################################################
 
-jakarta.faces=4.0_se11
+jakarta.faces=4.0

install/jsonb/bin/sig-test_se11.map → install/jsonb/bin/sig-test.map

@@ -30,16 +30,12 @@
 #
 # The resultant signature file name has a name that complies
 # with the following format:
-# <package>.sig_<technology_version>_<JavaSE_version_these_work_with>
+# <package>.sig_<technology_version>
 # Given this format, the following example breaks down as follows:
-#    jakarta.json.bind.sig_1.0_se11:
+#    jakarta.json.bind.sig_1.0:
 #      <package> = jakarta.json.bind
 #      <technology_version> = 1.1  (for JSON-B) 
-#      <JavaSE_version_these_work_with> = se11
 #
-# For this release valid versions are:  "_se11"
-# This sig-test.map file is designed to be run using JDK 11 so any
-# signature file that ends with "_se11" will be valid.
 #
 ###############################################################
-jakarta.json.bind=3.0_se11
+jakarta.json.bind=3.0

install/jsonp/bin/sig-test_se11.map → install/jsonp/bin/sig-test.map

@@ -30,16 +30,12 @@
 #
 # The resultant signature file name has a name that complies
 # with the following format:
-# <package>.sig_<technology_version>_<JavaSE_version_these_work_with>
+# <package>.sig_<technology_version>
 # Given this format, the following example breaks down as follows:
 #    jakarta.json.sig_2.0.0_se11:
 #      <package> = jakarta.json
 #      <technology_version> = 2.0.0  (for JSON-P) 
-#      <JavaSE_version_these_work_with> = se11
 #
-# For this release valid versions are:  "_se11"
-# This sig-test.map file is designed to be run using JDK 11 so any
-# signature file that ends with "_se11"  will be valid.
 #
 ###############################################################
-jakarta.json=2.1_se11
+jakarta.json=2.1

install/jsp/bin/sig-test_se11.map → install/jsp/bin/sig-test.map

@@ -25,4 +25,4 @@
 
 # JSP
 =======
-jakarta.servlet.jsp=3.1_se11
+jakarta.servlet.jsp=3.1

install/jstl/bin/sig-test_se11.map → install/jstl/bin/sig-test.map

@@ -25,4 +25,4 @@
 ###############################################################
 
 # JSTL packages
-jakarta.servlet.jsp.jstl=3.0_se11
+jakarta.servlet.jsp.jstl=3.0

install/jta/bin/sig-test_se11.map → install/jta/bin/sig-test.map

@@ -23,4 +23,4 @@
 ###############################################################
 
 # JTA packages
-jakarta.transaction=2.0_se11
+jakarta.transaction=2.0

install/saaj/bin/sig-test_se11.map → install/saaj/bin/sig-test.map

@@ -13,4 +13,4 @@
 #
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
-jakarta.xml.soap=3.0_se11
+jakarta.xml.soap=3.0

install/securityapi/bin/sig-test_se11.map → install/securityapi/bin/sig-test.map

@@ -46,4 +46,4 @@
 ###############################################################
 
 # Security API Specification (JSR-375)
-jakarta.security.enterprise=3.0_se11
+jakarta.security.enterprise=3.0

install/servlet/bin/sig-test_se11.map → install/servlet/bin/sig-test.map

@@ -17,4 +17,4 @@
 ###############################################################
 # The signature test mapping file for the Servlet TCK.
 ###############################################################
-jakarta.servlet=6.0_se11
+jakarta.servlet=6.0

install/websocket/bin/sig-test_se11.map → install/websocket/bin/sig-test.map

@@ -17,4 +17,4 @@
 ###############################################################
 # The signature test mapping file for the Websocket TCK.
 ###############################################################
-jakarta.websocket=2.1_se11
+jakarta.websocket=2.1

src/com/sun/ts/tests/signaturetest/README

@@ -53,8 +53,8 @@ The file should then be copied to $TS_HOME/install/<deliverable>/bin and
 source controlled in that directory.  The sig-test.map file should be
 copied to $TS_HOME/bin during the install process for a deliverable.
 
-Additionally, different sig-test.map is created specific to the JDK version.
-sig-test_se11.map for Java SE 11.
+Additionally, different sig-test.map is created with the version of the API tested.
+
 If the JDK specific map file does not exist by default sig-test.map will be used 
 to run the signature tests.