diff --git a/tck/docs/tck-runner/pom.xml b/tck/docs/tck-runner/pom.xml
index 855f44c..968b9d4 100644
--- a/tck/docs/tck-runner/pom.xml
+++ b/tck/docs/tck-runner/pom.xml
@@ -5,29 +5,30 @@
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
     http://www.eclipse.org/legal/epl-2.0.
-    
+
     This Source Code may also be made available under the following Secondary
     Licenses when the conditions for such availability set forth in the
     Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
     version 2 with the GNU Classpath Exception, which is available at
     https://www.gnu.org/software/classpath/license.html.
-    
+
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    
-    <groupId>jakarta</groupId>
-    <artifactId>glassfish.annotations-tck</artifactId>
-    <version>11.0.0</version>
+
+    <groupId>jakarta.annotation</groupId>
+    <artifactId>jakarta.annotation-tck-impl</artifactId>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <properties>
         <glassfish.container.version>8.0.0-M1</glassfish.container.version>
         <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
-        <junit.jupiter.version>5.9.1</junit.jupiter.version>
+        <junit.jupiter.version>5.10.2</junit.jupiter.version>
         <tck.artifactId>jakarta-annotations-tck</tck.artifactId>
         <tck.version>3.0.0</tck.version>
+        <jimage.dir>${project.build.directory}/jdk-bundle</jimage.dir>
     </properties>
 
     <dependencyManagement>
@@ -39,6 +40,16 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>jakarta.tck</groupId>
+                <artifactId>sigtest-maven-plugin</artifactId>
+                <version>2.2</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>${tck.artifactId}</artifactId>
+                <version>${tck.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -46,26 +57,37 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${junit.jupiter.version}</version>
         </dependency>
         <dependency>
-            <groupId>jakarta.tck</groupId>
+            <groupId>jakarta.annotation</groupId>
             <artifactId>${tck.artifactId}</artifactId>
-            <version>${tck.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>2.1</version>
         </dependency>
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>3.2.5</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>unpack</id>
@@ -76,7 +98,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>jakartatck</groupId>
+                                    <groupId>jakarta.annotation</groupId>
                                     <artifactId>${tck.artifactId}</artifactId>
                                     <version>${tck.version}</version>
                                     <type>zip</type>
@@ -86,16 +108,8 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
                     <execution>
-                        <id>unpack</id>
+                        <id>unpack-server</id>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
@@ -116,30 +130,9 @@
                 </executions>
             </plugin>
 
-            <!-- <plugin>
-                <groupId>org.netbeans.tools</groupId>
-                <artifactId>sigtest-maven-plugin</artifactId>
-                <version>1.5</version>
-                <configuration>
-                    <sigfile>target/annotations-tck/jakarta.annotation.sig</sigfile>
-                    <packages>jakarta.annotation,jakarta.annotation.security,jakarta.annotation.sql,akarta.annotation.Generated,jakarta.annotation.ManagedBean,jakarta.annotation.PostConstruct,jakarta.annotation.PreDestroy,jakarta.annotation.Priority,jakarta.annotation.Resource,jakarta.annotation.Resource$AuthenticationType,jakarta.annotation.Resources,jakarta.annotation.security.DeclareRoles,jakarta.annotation.security.DenyAll,jakarta.annotation.security.PermitAll,jakarta.annotation.security.RolesAllowed,jakarta.annotation.security.RunAs,jakarta.annotation.sql.DataSourceDefinition,jakarta.annotation.sql.DataSourceDefinitions</packages>
-                    <classes>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.annotation-api.jar</classes>
-                    <report>target/sig-report.txt</report>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>sigtest</id>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <phase>verify</phase>
-                    </execution>
-                </executions>
-            </plugin> -->
-
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.0.0-M5</version>
                 <executions>
                     <execution>
                         <id>sig-test</id>
@@ -148,10 +141,10 @@
                             <goal>verify</goal>
                         </goals>
                         <configuration>
-                            <dependenciesToScan>jakarta.tck:${tck.artifactId}</dependenciesToScan>
+                            <dependenciesToScan>jakarta.annotation:${tck.artifactId}</dependenciesToScan>
                             <systemPropertyVariables>
-                                <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>
+                                <jimage.dir>${jimage.dir}</jimage.dir>
+                                <sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.annotation-api.jar:${jimage.dir}/java.base:${jimage.dir}/java.rmi:${jimage.dir}/java.sql:${jimage.dir}/java.naming</sigTestClasspath>
                                 <ca.sig.generated>true</ca.sig.generated>
                                 <ca.sig.postconstruct>true</ca.sig.postconstruct>
                                 <ca.sig.priority>true</ca.sig.priority>
diff --git a/tck/docs/userguide/pom.xml b/tck/docs/userguide/pom.xml
index 8186506..b777181 100644
--- a/tck/docs/userguide/pom.xml
+++ b/tck/docs/userguide/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2024 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
@@ -17,243 +17,250 @@
 
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.eclipse.ee4j</groupId>
-    <artifactId>project</artifactId>
-    <version>1.0.5</version>
-  </parent>
-  <groupId>org.glassfish</groupId>
-  <artifactId>tck_caj</artifactId>
-  <packaging>pom</packaging>
-  <version>3.0.0</version>
-  <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Annotations Release 3.0</name>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.9</version>
+    </parent>
+    <groupId>jakarta.annotations</groupId>
+    <artifactId>jakarta.annotations-tck-ug</artifactId>
+    <packaging>pom</packaging>
+    <version>3.0.0</version>
+    <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Annotations Release 3.0</name>
 
-  <properties>
-    <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.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.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 -->
-    <status></status>
-    <doc.pdf>Common-Annotations-TCK-Users-Guide.pdf</doc.pdf>
-    <maven.deploy.skip>true</maven.deploy.skip>
-  </properties>
+    <properties>
+        <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.5.11</asciidoctorj.version>
+        <asciidoctorj.diagram.version>2.3.0</asciidoctorj.diagram.version>
+        <asciidoctorj.maven.plugin.version>3.0.0</asciidoctorj.maven.plugin.version>
+        <asciidoctorj.pdf.version>2.3.13</asciidoctorj.pdf.version>
+        <jbake.maven.plugin.version>2.7.0-rc.7</jbake.maven.plugin.version>
+        <freemarker.version>2.3.32</freemarker.version>
+        <!-- status: DRAFT, BETA, etc., or blank for final -->
+        <status></status>
+        <doc.pdf>Jakarta-Annotations-TCK-Users-Guide.pdf</doc.pdf>
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
 
-  <distributionManagement>
-    <site>
-      <url>scm:git:git@github.com:eclipse-ee4j/jakartaee-tck.git</url>
-    </site>
-  </distributionManagement>
+    <distributionManagement>
+        <site>
+            <url>scm:git:git@github.com:jakartaee/common-annotations-api.git</url>
+        </site>
+    </distributionManagement>
 
-  <build>
-    <defaultGoal>package</defaultGoal>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>src/main/jbake/content</directory>
-              <includes>
-                <include>toc.adoc</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-versions</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireJavaVersion>
-                  <version>[17,)</version>
-                  <message>You need JDK17 or newer</message>
-                </requireJavaVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.glassfish.doc</groupId>
-        <artifactId>glassfish-doc-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>generate-toc</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>toc</goal>
-            </goals>
-            <configuration>
-              <chapterPatterns>
-                [0-9]+\s.*,Preface.*,Part\s.*
-              </chapterPatterns>
-            </configuration>
-          </execution>
-          <execution>
-            <id>generate-book</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>book</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jbake</groupId>
-        <artifactId>jbake-maven-plugin</artifactId>
-        <configuration>
-          <outputDirectory>${site.output.dir}</outputDirectory>
-          <properties>
-            <status>${status}</status>
-          </properties>
-        </configuration>
-        <executions>
-          <execution>
-            <id>build-site</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.asciidoctor</groupId>
-        <artifactId>asciidoctor-maven-plugin</artifactId>
-        <configuration>
-          <sourceDirectory>${project.build.directory}/book</sourceDirectory>
-          <sourceDocumentName>book.adoc</sourceDocumentName>
-          <!-- XXX - below depends on running jbake first -->
-          <imagesDir>${project.build.directory}/staging/</imagesDir>
-          <backend>pdf</backend>
-          <outputFile>${doc.pdf}</outputFile>
-          <attributes>
-            <pdf-stylesdir>${project.basedir}/src/theme</pdf-stylesdir>
-            <pdf-style>jakartaee</pdf-style>
-            <doctype>book</doctype>
-            <status>${status}</status>
-            <compat-mode/>
-            <data-uri/>
-            <icons>font</icons>
-            <pagenums/>
-            <toc/>
-            <icons>font</icons>
-            <sectanchors>true</sectanchors>
-            <idprefix/>
-            <idseparator>-</idseparator>
-            <docinfo1>true</docinfo1>
-            <embedAssets>true</embedAssets>
-          </attributes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>generate-pdf-doc</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-scm-publish-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>deploy-site</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>publish-scm</goal>
-            </goals>
-            <configuration>
-              <scmBranch>gh-pages</scmBranch>
-              <skipDeletedFiles>false</skipDeletedFiles>
-              <checkinComment>Update site</checkinComment>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
+    <scm>
+        <connection>scm:git:https://github.com/jakartaee/common-annotations-api.git</connection>
+        <developerConnection>scm:git:git@github.com:jakartaee/common-annotations-api.git</developerConnection>
+        <url>https://github.com/jakartaee/common-annotations-api</url>
+        <tag>HEAD</tag>
+    </scm>
 
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>3.1.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.glassfish.doc</groupId>
-          <artifactId>glassfish-doc-maven-plugin</artifactId>
-          <version>1.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0-M3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.3.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-publish-plugin</artifactId>
-          <version>3.1.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.jbake</groupId>
-          <artifactId>jbake-maven-plugin</artifactId>
-          <version>${jbake.maven.plugin.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.asciidoctor</groupId>
-              <artifactId>asciidoctorj</artifactId>
-              <version>${asciidoctorj.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.asciidoctor</groupId>
-              <artifactId>asciidoctorj-diagram</artifactId>
-              <version>${asciidoctorj.diagram.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.freemarker</groupId>
-              <artifactId>freemarker</artifactId>
-              <version>${freemarker.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <plugin>
-          <groupId>org.asciidoctor</groupId>
-          <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>${asciidoctorj.maven.plugin.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.asciidoctor</groupId>
-              <artifactId>asciidoctorj-pdf</artifactId>
-              <version>${asciidoctorj.pdf.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+    <build>
+        <defaultGoal>package</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>src/main/jbake/content</directory>
+                            <includes>
+                                <include>toc.adoc</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>[17,)</version>
+                                    <message>You need JDK17 or newer</message>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.glassfish.doc</groupId>
+                <artifactId>glassfish-doc-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-toc</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>toc</goal>
+                        </goals>
+                        <configuration>
+                            <chapterPatterns>
+                                [A-C0-9]+\s.*,Preface.*,Part\s.*
+                            </chapterPatterns>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-book</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>book</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.jbake</groupId>
+                <artifactId>jbake-maven-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>${site.output.dir}</outputDirectory>
+                    <properties>
+                        <status>${status}</status>
+                    </properties>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>build-site</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctor-maven-plugin</artifactId>
+                <configuration>
+                    <sourceDirectory>${project.build.directory}/book</sourceDirectory>
+                    <sourceDocumentName>book.adoc</sourceDocumentName>
+                    <!-- XXX - below depends on running jbake first -->
+                    <imagesDir>${project.build.directory}/staging/</imagesDir>
+                    <backend>pdf</backend>
+                    <outputFile>${doc.pdf}</outputFile>
+                    <attributes>
+                        <pdf-stylesdir>${project.basedir}/src/theme</pdf-stylesdir>
+                        <pdf-style>jakartaee</pdf-style>
+                        <doctype>book</doctype>
+                        <status>${status}</status>
+                        <compat-mode/>
+                        <data-uri/>
+                        <icons>font</icons>
+                        <pagenums/>
+                        <toc/>
+                        <icons>font</icons>
+                        <sectanchors>true</sectanchors>
+                        <idprefix/>
+                        <idseparator>-</idseparator>
+                        <docinfo1>true</docinfo1>
+                        <embedAssets>true</embedAssets>
+                    </attributes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-pdf-doc</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>process-asciidoc</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-publish-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>deploy-site</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>publish-scm</goal>
+                        </goals>
+                        <configuration>
+                            <scmBranch>gh-pages</scmBranch>
+                            <skipDeletedFiles>false</skipDeletedFiles>
+                            <checkinComment>Update site</checkinComment>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.glassfish.doc</groupId>
+                    <artifactId>glassfish-doc-maven-plugin</artifactId>
+                    <version>1.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.4.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.6.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-scm-publish-plugin</artifactId>
+                    <version>3.2.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.jbake</groupId>
+                    <artifactId>jbake-maven-plugin</artifactId>
+                    <version>${jbake.maven.plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.asciidoctor</groupId>
+                            <artifactId>asciidoctorj</artifactId>
+                            <version>${asciidoctorj.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.asciidoctor</groupId>
+                            <artifactId>asciidoctorj-diagram</artifactId>
+                            <version>${asciidoctorj.diagram.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.freemarker</groupId>
+                            <artifactId>freemarker</artifactId>
+                            <version>${freemarker.version}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+                <plugin>
+                    <groupId>org.asciidoctor</groupId>
+                    <artifactId>asciidoctor-maven-plugin</artifactId>
+                    <version>${asciidoctorj.maven.plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.asciidoctor</groupId>
+                            <artifactId>asciidoctorj-pdf</artifactId>
+                            <version>${asciidoctorj.pdf.version}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
diff --git a/tck/docs/userguide/src/main/jbake/assets/_config.yml b/tck/docs/userguide/src/main/jbake/assets/_config.yml
index 606e072..9eebe62 100644
--- a/tck/docs/userguide/src/main/jbake/assets/_config.yml
+++ b/tck/docs/userguide/src/main/jbake/assets/_config.yml
@@ -5,8 +5,8 @@ description: [Jakarta EE Technology Compatibility Kit User's Guide for Jakarta A
 
 # sidebar links url
 links:
-  source: https://github.com/eclipse-ee4j/common-annotations-api
-  download: https://github.com/eclipse-ee4j/common-annotations-api/releases
+  source: https://github.com/jakartaee/common-annotations-api
+  download: https://github.com/jakartaee/common-annotations-api/releases
   #mailinglist: https://javaee.groups.io/g/tck_coa_v1_3
   #javadocs:
   docs: https://jakarta.ee/specifications/annotations/3.0
diff --git a/tck/docs/userguide/src/main/jbake/content/config.inc b/tck/docs/userguide/src/main/jbake/content/config.inc
index 3d9b3ba..d5e39b2 100644
--- a/tck/docs/userguide/src/main/jbake/content/config.inc
+++ b/tck/docs/userguide/src/main/jbake/content/config.inc
@@ -91,10 +91,10 @@ ca.sig.sqldatasourcedefinition=true
 #jakarta.annotation.sql.DataSourceDefinitions
 ca.sig.sqldatasourcedefinitions=true
 ----
-3. Set the below jars to the classpath 
+3. Set the below jars to the classpath
   a. JAR file for the {TechnologyShortName} {TechnologyVersion} API. +
   eg.  `${web.home}/modules/jakarta.annotations-api.jar`.
-  b. JUnit 5 jars (5.9.1+)
+  b. JUnit 5 jars (5.10.2+)
   Maven cordinates :
 +
 [source,oac_no_warn]
@@ -102,13 +102,13 @@ ca.sig.sqldatasourcedefinitions=true
        <dependency>
           <groupId>org.junit</groupId>
           <artifactId>junit-bom</artifactId>
-          <version>5.9.1</version>
+          <version>5.10.2</version>
           <type>pom</type>
           <scope>import</scope>
        </dependency>
 ----
 +
- c. sigtest-maven-plugin (2.1) to run the signature tests.
+ c. sigtest-maven-plugin (2.2) to run the signature tests.
   Maven cordinates :
 +
 [source,oac_no_warn]
@@ -116,7 +116,7 @@ ca.sig.sqldatasourcedefinitions=true
       <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>2.1</version>
+            <version>2.2</version>
         </dependency>
 ----
 
diff --git a/tck/pom.xml b/tck/pom.xml
index ce90fcb..fd57063 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2024  Contributors to the Eclipse Foundation
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
     All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -26,7 +26,7 @@
         <version>1.0.9</version>
     </parent>
 
-    <groupId>jakarta.tck</groupId>
+    <groupId>jakarta.annotation</groupId>
     <artifactId>jakarta-annotations-tck</artifactId>
     <version>3.0.0</version>
     <packaging>jar</packaging>
@@ -35,8 +35,11 @@
     <description>Common Annotations TCK</description>
 
     <properties>
-        <jakarta.annotations-api.version>3.0.0-M1</jakarta.annotations-api.version>
-        <junit.jupiter.version>5.9.1</junit.jupiter.version>
+        <jakarta.annotations-api.version>3.0.0</jakarta.annotations-api.version>
+        <junit.jupiter.version>5.10.2</junit.jupiter.version>
+
+        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.testRelease>${maven.compiler.release}</maven.compiler.testRelease>
     </properties>
 
     <dependencies>
@@ -54,6 +57,36 @@
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.6.3</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.12.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.6.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>jakarta.annotation</groupId>
+                    <artifactId>sigtest-maven-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <finalName>${bundle-name}-${project.version}</finalName>
         <resources>
             <resource>
@@ -61,11 +94,13 @@
                 <includes>
                     <include>LICENSE_${license}.md</include>
                     <include>com/</include>
+                    <include>**/*sig*/**</include>
                 </includes>
             </resource>
         </resources>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <doclint>none</doclint>
@@ -86,7 +121,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>distribution</id>
@@ -105,13 +139,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
-                <configuration>
-                    <release>17</release>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -145,9 +172,8 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>jakarta.tck</groupId>
+                        <groupId>jakarta.annotation</groupId>
                         <artifactId>sigtest-maven-plugin</artifactId>
-                        <version>2.1</version>
                         <configuration>
                             <sigfile>${project.build.directory}/jakarta.annotation.sig_${project.parent.version}</sigfile>
                             <packages>jakarta.annotation,jakarta.annotation.security,jakarta.annotation.sql</packages>
@@ -163,7 +189,5 @@
                 </plugins>
             </build>
         </profile>
-
     </profiles>
-
 </project>
diff --git a/tck/src/main/java/ee/jakarta/tck/annotations/signaturetest/CAJSigTestIT.java b/tck/src/main/java/ee/jakarta/tck/annotations/signaturetest/CAJSigTestIT.java
index 7521cd1..2eeea4b 100644
--- a/tck/src/main/java/ee/jakarta/tck/annotations/signaturetest/CAJSigTestIT.java
+++ b/tck/src/main/java/ee/jakarta/tck/annotations/signaturetest/CAJSigTestIT.java
@@ -244,12 +244,12 @@ public void signatureTest() throws Exception {
   
     try {
   
-      InputStream inStreamMapfile = CAJSigTestIT.class.getClassLoader().getResourceAsStream("com/sun/ts/tests/annotations/sig-test.map");
+      InputStream inStreamMapfile = CAJSigTestIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/annotations/signaturetest/sig-test.map");
       File mFile = writeStreamToTempFile(inStreamMapfile, "sig-test", ".map");
       mapFile = mFile.getCanonicalPath();
       logger.log(Logger.Level.INFO, "mapFile location is :"+mapFile);
   
-      InputStream inStreamPackageFile = CAJSigTestIT.class.getClassLoader().getResourceAsStream("com/sun/ts/tests/annotations/sig-test-pkg-list.txt");
+      InputStream inStreamPackageFile = CAJSigTestIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/annotations/signaturetest/sig-test-pkg-list.txt");
       File pFile = writeStreamToTempFile(inStreamPackageFile, "sig-test-pkg-list", ".txt");
       packageFile = pFile.getCanonicalPath();
       logger.log(Logger.Level.INFO, "packageFile location is :"+packageFile);
@@ -258,7 +258,7 @@ public void signatureTest() throws Exception {
       String packageVersion = mapFileAsProps.getProperty(apiPackage);
       logger.log(Logger.Level.INFO, "Package version from mapfile :"+packageVersion);
   
-      InputStream inStreamSigFile = CAJSigTestIT.class.getClassLoader().getResourceAsStream("com/sun/ts/tests/annotations/jakarta.annotation.sig_"+packageVersion);
+      InputStream inStreamSigFile = CAJSigTestIT.class.getClassLoader().getResourceAsStream("ee/jakarta/tck/annotations/signaturetest/jakarta.annotation.sig_"+packageVersion);
       File sigFile = writeStreamToSigFile(inStreamSigFile, apiPackage, packageVersion);
       logger.log(Logger.Level.INFO, "signature File location is :"+sigFile.getCanonicalPath());