Sample TCK runner with Glassfish moved to bundle and Userguide changes

tck/docs/CAJ3.0-ReleaseNotes.html

@@ -58,8 +58,8 @@ <h2><a name="platform">Platform Notes</a></h2>
     <hr>
     <h2><a name="install_setup_run">Installing, Setting Up, and Running the
         Jakarta Annotations TCK</a></h2>
-    <p>Refer to the <cite>Jakarta Annotations for Jakarta EE TCK 3.0 User's
-        Guide</cite> for complete instructions on installing, setting up, and
+    <p>Refer to the <a href="html-usersguide/toc.html">Jakarta Annotations for Jakarta EE TCK 3.0 User's
+        Guide</a>  for complete instructions on installing, setting up, and
       running the Jakarta Annotations TCK.
     <hr>
     <p><cite><small></small></cite></p>

tck/docs/TCK-Exclude-List.txt

@@ -16,4 +16,4 @@
 
 # This file lists the excluded tests from Jakarta Annotations TCK. 
 # This is intended only for documentation purpose and is not used to exclude any tests.
-#
+# No tests are excluded in this version

tck/docs/index.html

@@ -47,7 +47,7 @@ <h2>Guide to Jakarta Annotations TCK 3.0 Documentation</h2>
     </ul>
     <hr>
     <p><cite><small></small></cite></p>
-    <address><small> Copyright (c) 2016, 2021 Oracle and/or its affiliates. All
+    <address><small> Copyright (c) 2016, 2024 Oracle and/or its affiliates. All
         rights reserved. </small></address>
     <cite>
       <p></p>

tck-runner/README → tck/docs/tck-runner/README

@@ -11,14 +11,13 @@ Below are the instructions to run the Jakarta Annotations TCK
 3. SET PATH : add M2_HOME/bin, JAVA_HOME/bin
 eg: export PATH=$ANT_HOME/bin:$M2_HOME/bin:$JAVA_HOME/bin:
 
-4. Install the tck jar jakarta-annotations-tck-<version>.jar available inside \
-jakarta-annotations-tck-<version>.zip built from jakartaee/common-annotations-api project
-in this repository using below mvn install command:
+4. Install the tck jar jakarta-annotations-tck-<version>.jar available at artifacts folder in \
+jakarta-annotations-tck-<version>.zip using below mvn install command:
 `mvn install:install-file -DcreateChecksum=true -Dpackaging=jar 
--Dfile=jakarta-annotations-tck-<version>.jar -DgroupId=jakarta.3tck 
+-Dfile=jakarta-annotations-tck-<version>.jar -DgroupId=jakarta.tck 
 -DartifactId=jakarta-annotations-tck -Dversion=<version>`
 
 
-5. Use the sample tck-runner/pom.xml available in jakartaee/common-annotations-api project, 
+5. Use the sample tck-runner/pom.xml available in the annotations-tck/, 
 to run the test with Glassfish, verify the system properties set.
 Run `mvn clean verify` from the current directory.

tck-runner/pom.xml → tck/docs/tck-runner/pom.xml

@@ -153,7 +153,6 @@
                                 <jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
                                 <sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.annotation-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</sigTestClasspath>
                                 <ca.sig.generated>true</ca.sig.generated>
-                                <ca.sig.managedbean>false</ca.sig.managedbean>
                                 <ca.sig.postconstruct>true</ca.sig.postconstruct>
                                 <ca.sig.priority>true</ca.sig.priority>
                                 <ca.sig.predestroy>true</ca.sig.predestroy>

tck/docs/userguide/pom.xml

@@ -35,10 +35,10 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <site.output.dir>${project.build.directory}/staging</site.output.dir>
     <maven.site.skip>true</maven.site.skip>
-    <asciidoctorj.version>2.4.2</asciidoctorj.version>
-    <asciidoctorj.diagram.version>2.1.0</asciidoctorj.diagram.version>
+    <asciidoctorj.version>2.5.6</asciidoctorj.version>
+    <asciidoctorj.diagram.version>2.2.1</asciidoctorj.diagram.version>
     <asciidoctorj.maven.plugin.version>2.2.4</asciidoctorj.maven.plugin.version>
-    <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version>
+    <asciidoctorj.pdf.version>1.6.2</asciidoctorj.pdf.version>
     <jbake.maven.plugin.version>2.7.0-rc.7</jbake.maven.plugin.version>
     <freemarker.version>2.3.30</freemarker.version>
     <!-- status: DRAFT, BETA, etc., or blank for final -->

tck/docs/userguide/src/main/jbake/content/attributes.conf

@@ -7,7 +7,7 @@
 :CopyrightDates: 2018, 2024
 :TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.ca
 :SpecificationURL: https://jakarta.ee/specifications/annotations/3.0/
-:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
+:TCKInquiryList: mailto:ca-dev@eclipse.org[ca-dev@eclipse.org]
 :SpecificationInquiryList: mailto:ca-dev@eclipse.org[ca-dev@eclipse.org]
 :techID: Annotations
 // Define this attribute (uncomment it) if the TCK includes no API tests.  (Rare.)
@@ -22,16 +22,16 @@
 // for the technology.  Used in config.inc.
 :TechnologyHomeEnv: CAJ_HOME
 // Java SE version required.
-:SEversion: 17 
-:AntVersion: 1.10+
+:SEversion: 17+
+:MavenVersion: 3.6.3+
 :JakartaEEVersion: 11
 :JavaTestVersion: 5.0
-:jteFileName: <TS_HOME>/bin/ts.jte
-:jtxFileName: <TS_HOME>/bin/ts.jtx
-:TCKPackageName: jakarta-annotations-tck-3.0.0.zip
+
+:excludeListFileName: TCK-Exclude-List.txt
+:TCKPackageName: jakarta-annotations-tck-x.y.z.zip
 // Directory names used in examples in using.adoc.
-:sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/caj
-:singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/caj/api/client
-:subsetTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/caj/api
+:sigTestDirectoryExample: ee.jakarta.tck.annotations.signaturetest
+:singleTestDirectoryExample: ee.jakarta.tck.annotations.signaturetest
+:subsetTestDirectoryExample: ee.jakarta.tck.annotations.signaturetest
 // Define this attribute (uncomment it) if the TCK needs the rebuild appendix.
 // :rebuild: