diff --git a/api/pom.xml b/api/pom.xml
index 801c609..3131183 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2022 Contributors to Eclipse Foundation. All rights reserved.
+    Copyright (c) 2020, 2023 Contributors to Eclipse Foundation. All rights reserved.
     Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</version>
         <relativePath/>
     </parent>
 
     <groupId>jakarta.authentication</groupId>
     <artifactId>jakarta.authentication-api</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <name>Jakarta Authentication</name>
     <description>
@@ -41,10 +41,10 @@
         Jakarta Authentication consists of several profiles, with each profile telling how a specific container
         (such as Jakarta Servlet) can integrate with- and adapt to this SPI.
     </description>
-    <url>https://github.com/eclipse-ee4j/authentication</url>
+    <url>https://github.com/jakartaee/authentication</url>
     <organization>
         <name>Jakarta Authentication</name>
-        <url>https://github.com/eclipse-ee4j/authentication</url>
+        <url>https://github.com/jakartaee/authentication</url>
     </organization>
     <licenses>
         <license>
@@ -87,21 +87,21 @@
     </contributors>
 
     <scm>
-        <connection>scm:git:ssh://git@github.com/eclipse-ee4j/authentication.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/authentication.git</developerConnection>
-        <url>https://github.com/eclipse-ee4j/authentication</url>
+        <connection>scm:git:ssh://git@github.com/jakartaee/authentication.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com/jakartaee/authentication.git</developerConnection>
+        <url>https://github.com/jakartaee/authentication</url>
     </scm>
     <issueManagement>
         <system>github</system>
-        <url>https://github.com/eclipse-ee4j/authentication/issues</url>
+        <url>https://github.com/jakartaee/authentication/issues</url>
     </issueManagement>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <build>
@@ -141,9 +141,7 @@
         <plugins>
             <!-- Sets minimal Maven version to 3.6.0 -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
@@ -161,13 +159,12 @@
                 </executions>
             </plugin>
         
-            <!-- Restricts the Java version to 11 -->
+            <!-- Restricts the Java version to 21 -->
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <release>21</release>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
                 </configuration>
             </plugin>
@@ -179,7 +176,7 @@
                 <version>2.1</version>
                 <configuration>
                     <spec>
-                        <specVersion>3.0</specVersion>
+                        <specVersion>3.1</specVersion>
                         <specImplVersion>${project.version}</specImplVersion>
                         <apiPackage>jakarta.security.auth.message</apiPackage>
                     </spec>
@@ -198,7 +195,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.6</version>
+                <version>5.1.9</version>
                 <configuration>
                     <supportedProjectTypes>
                         <supportedProjectType>jar</supportedProjectType>
@@ -217,7 +214,7 @@
                         <Implementation-Vendor-Id>org.glassfish</Implementation-Vendor-Id>
                         <_include>-${basedir}/osgi.bundle</_include>
                         <_noimportjava>true</_noimportjava>
-                        <_runee>JavaSE-11</_runee>
+                        <_runee>JavaSE-21</_runee>
                     </instructions>
                 </configuration>
                 <executions>
@@ -233,9 +230,7 @@
             
             <!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.2</version>
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -250,9 +245,7 @@
                Create Javadoc for API jar
             -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>attach-api-javadocs</id>
@@ -260,15 +253,14 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <source>11</source>
                             <additionalJOption>-Xdoclint:none</additionalJOption>
                             <description>Jakarta Authentication API documentation</description>
                             <doctitle>Jakarta Authentication API documentation</doctitle>
                             <windowtitle>Jakarta Authentication API documentation</windowtitle>
                             <header><![CDATA[<br>Jakarta Authentication API v${project.version}]]></header>
                             <bottom><![CDATA[
-Comments to: <a href="mailto:jaspic-dev@eclipse.org">jaspic-dev@eclipse.org</a>.<br>
-Copyright &#169; 2020, 2022 Eclipse Foundation. All rights reserved.<br>
+Comments to: <a href="mailto:es-dev@eclipse.org">es-dev@eclipse.org</a>.<br>
+Copyright &#169; 2020, 2023 Eclipse Foundation. All rights reserved.<br>
 Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
                             </bottom>
                             <docfilessubdirs>true</docfilessubdirs>
@@ -287,6 +279,33 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                     </execution>
                 </executions>
             </plugin>
+            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <configuration>
+                    <flattenMode>ossrh</flattenMode>
+                </configuration>
+                <executions>
+                    <!-- enable flattening -->
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <!-- ensure proper cleanup -->
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 7157be7..7a398a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020, 2021 Contributors to Eclipse Foundation. All rights reserved.
+    Copyright (c) 2020, 2023 Contributors to Eclipse Foundation. All rights reserved.
     Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,12 +24,12 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</version>
     </parent>
 
     <groupId>org.eclipse.ee4j.authentication</groupId>
     <artifactId>authentication-parent</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Authentication</name>
@@ -61,9 +61,9 @@
     </modules>
 
     <scm>
-        <connection>scm:git:ssh://git@github.com/eclipse-ee4j/authentication.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/authentication.git</developerConnection>
-        <url>https://github.com/eclipse-ee4j/authentication</url>
+        <connection>scm:git:ssh://git@github.com/jakartaee/authentication.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com/jakartaee/authentication.git</developerConnection>
+        <url>https://github.com/jakartaee/authentication</url>
         <tag>HEAD</tag>
     </scm>
 
@@ -71,8 +71,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
     </properties>
 
     <build>
@@ -81,7 +80,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>enforce-maven</id>
diff --git a/spec/pom.xml b/spec/pom.xml
index a665c84..991cff6 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2022 Contributors to Eclipse Foundation. All rights reserved.
+    Copyright (c) 2019, 2023 Contributors to Eclipse Foundation. 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
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.authentication</groupId>
         <artifactId>authentication-parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>authentication-spec</artifactId>
@@ -31,23 +31,20 @@
     <name>Jakarta Authentication Specification</name>
 
     <scm>
-        <connection>scm:git:git@github.com:eclipse-ee4j/authentication.git</connection>
-        <developerConnection>scm:git:git@github.com:eclipse-ee4j/authentication.git</developerConnection>
-        <url>https://github.com/eclipse-ee4j/authentication</url>
+        <connection>scm:git:git@github.com:jakartaee/authentication.git</connection>
+        <developerConnection>scm:git:git@github.com:jakartaee/authentication.git</developerConnection>
+        <url>https://github.com/jakartaee/authentication</url>
         <tag>HEAD</tag>
     </scm>
     <distributionManagement>
         <site>
-            <url>scm:git:git@github.com:eclipse-ee4j/authentication.git</url>
+            <url>scm:git:git@github.com:jakartaee/authentication.git</url>
         </site>
     </distributionManagement>
 
     <properties>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>
-        <asciidoctorj.version>2.5.4</asciidoctorj.version>
-        <asciidoctorj.pdf.version>2.1.4</asciidoctorj.pdf.version>
-        <jruby.version>9.3.4.0</jruby.version>
         <!-- status: DRAFT, BETA, etc., or blank for final -->
         <status>DRAFT</status>
         <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
@@ -64,22 +61,12 @@
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
-                <version>2.2.2</version>
+                <version>2.2.4</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.jruby</groupId>
-                        <artifactId>jruby-complete</artifactId>
-                        <version>${jruby.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>${asciidoctorj.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctorj-pdf</artifactId>
-                        <version>${asciidoctorj.pdf.version}</version>
+                        <version>2.3.9</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -156,7 +143,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.6.0</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>
diff --git a/tck/async-authentication/pom.xml b/tck/async-authentication/pom.xml
index 6ba49bb..99604a2 100644
--- a/tck/async-authentication/pom.xml
+++ b/tck/async-authentication/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>async-authentication</artifactId>
diff --git a/tck/basic-authentication/pom.xml b/tck/basic-authentication/pom.xml
index 5939b57..d92fde5 100644
--- a/tck/basic-authentication/pom.xml
+++ b/tck/basic-authentication/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>basic-authentication</artifactId>
diff --git a/tck/custom-principal/pom.xml b/tck/custom-principal/pom.xml
index ccc5d97..0b9d96b 100644
--- a/tck/custom-principal/pom.xml
+++ b/tck/custom-principal/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>custom-principal</artifactId>
diff --git a/tck/dispatching-jsf-cdi/pom.xml b/tck/dispatching-jsf-cdi/pom.xml
index 6350a2a..dfe7d3a 100644
--- a/tck/dispatching-jsf-cdi/pom.xml
+++ b/tck/dispatching-jsf-cdi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dispatching-jsf-cdi</artifactId>
diff --git a/tck/dispatching/pom.xml b/tck/dispatching/pom.xml
index 3488900..6acc917 100644
--- a/tck/dispatching/pom.xml
+++ b/tck/dispatching/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dispatching</artifactId>
diff --git a/tck/ejb-propagation/pom.xml b/tck/ejb-propagation/pom.xml
index 1561387..2c2a0aa 100644
--- a/tck/ejb-propagation/pom.xml
+++ b/tck/ejb-propagation/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ejb-propagation</artifactId>
diff --git a/tck/ejb-register-session/pom.xml b/tck/ejb-register-session/pom.xml
index 61c06b4..c0fb82a 100644
--- a/tck/ejb-register-session/pom.xml
+++ b/tck/ejb-register-session/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ejb-register-session</artifactId>
diff --git a/tck/invoke-ejb-cdi/pom.xml b/tck/invoke-ejb-cdi/pom.xml
index 7822ec0..d5ba2ab 100644
--- a/tck/invoke-ejb-cdi/pom.xml
+++ b/tck/invoke-ejb-cdi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>invoke-ejb-cdi</artifactId>
diff --git a/tck/jacc-propagation/pom.xml b/tck/jacc-propagation/pom.xml
index 411f5f8..ab28ff2 100644
--- a/tck/jacc-propagation/pom.xml
+++ b/tck/jacc-propagation/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>authorization-propagation</artifactId>
diff --git a/tck/lifecycle/pom.xml b/tck/lifecycle/pom.xml
index 5f13e91..8dffaef 100644
--- a/tck/lifecycle/pom.xml
+++ b/tck/lifecycle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>lifecycle</artifactId>
diff --git a/tck/old-tck/build/pom.xml b/tck/old-tck/build/pom.xml
index 0eb93f4..516bb5d 100644
--- a/tck/old-tck/build/pom.xml
+++ b/tck/old-tck/build/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.eclipse.ee4j.tck.authentication</groupId>
     <artifactId>old-authentication-tck</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Old Jakarta Authentication TCK - build</name>
diff --git a/tck/old-tck/pom.xml b/tck/old-tck/pom.xml
index 57f9ba8..521495a 100644
--- a/tck/old-tck/pom.xml
+++ b/tck/old-tck/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>old-authentication-tck-parent</artifactId>
diff --git a/tck/old-tck/run/pom.xml b/tck/old-tck/run/pom.xml
index 1283080..fd194b6 100644
--- a/tck/old-tck/run/pom.xml
+++ b/tck/old-tck/run/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>old-authentication-tck-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>glassfish-external-tck-authentication</artifactId>
@@ -189,8 +189,7 @@
                                 <tck-setting key="orb.port" value="${port.orb}"/>
                                 <tck-setting key="wsgen.ant.classname" value="com.sun.tools.ws.ant.WsGen"/>
                                 <tck-setting key="wsimport.ant.classname" value="com.sun.tools.ws.ant.WsImport"/>
-
-                                
+                                <tck-setting key="vendor.authconfig.factory" value="org.omnifaces.eleos.config.factory.file.AuthConfigFileFactory"/>
                                 
                                 <tck-setting key="report.dir" value="${tck.home}/authenticationtckreport/authenticationtck"/>
                                 <tck-setting key="work.dir" value="${tck.home}/authenticationtckwork/authenticationtck"/>
@@ -241,8 +240,8 @@
                                 <jvmarg value="-Djavatest.security.noSecurityManager=true"/>]]></replacevalue>
                                 </replace>
                                 
-                                <replace file="${tck.home}/bin/xml/ts.top.import.xml" if:set="suspend-tck" >
-                                  <replacetoken><![CDATA[<jvmarg value="-Xmx512m"/>]]></replacetoken>
+                                <replace file="${tck.home}/bin/xml/ts.top.import.xml" if:set="tck.suspend" >
+                                  <replacetoken><![CDATA[<jvmarg value="-Xmx512m" />]]></replacetoken>
                                   <replacevalue><![CDATA[<jvmarg value="-Xmx512m"/>
                                 <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=9008"/>]]></replacevalue>
                                 </replace>
@@ -260,7 +259,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <target>
+                            <target xmlns:if="ant:if" xmlns:unless="ant:unless">
                                 <taskdef resource="net/sf/antcontrib/antcontrib.properties"
                                          classpathref="maven.plugin.classpath" />
                                 
@@ -271,20 +270,24 @@
                                     <arg value="enable.jaspic"  />
                                 </exec>
                                 <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
-                                        <arg value="stop-domain"/>
-                                        <arg value="domain1"/>
+                                    <arg value="stop-domain"/>
+                                    <arg value="domain1"/>
                                 </exec>
-                                <limit maxwait="120">
+                                
+                                <!-- Restart GlassFish in debug mode if so requested -->
+                                <sequential>
+                                    <echo message="Starting GlassFish in suspended mode, waiting on port 9009" if:set="glassfish.suspend"/>
                                     <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
                                         <arg value="start-domain"/>
+                                        <arg value="--suspend" if:set="glassfish.suspend"/>
                                     </exec>
-                                </limit>
+                                </sequential>
                             </target>
                         </configuration>
                     </execution>
       
 
-                     <execution>
+                    <execution>
                         <id>run-tck-tests</id>
                         <phase>integration-test</phase>
                         <goals>
diff --git a/tck/pom.xml b/tck/pom.xml
index acdc806..96f5c6f 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</version>
         <relativePath/>
     </parent>
 
     <groupId>org.eclipse.ee4j.tck.authentication</groupId>
     <artifactId>jakarta-authentication-tck</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Authentication TCK - main</name>
@@ -412,7 +412,7 @@
                 <dependency>
                     <groupId>org.omnifaces.arquillian</groupId>
                     <artifactId>arquillian-glassfish-server-managed</artifactId>
-                    <version>1.0</version>
+                    <version>1.4</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
diff --git a/tck/programmatic-authentication/pom.xml b/tck/programmatic-authentication/pom.xml
index 684a51f..89aa7e5 100644
--- a/tck/programmatic-authentication/pom.xml
+++ b/tck/programmatic-authentication/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>programmatic-authentication</artifactId>
diff --git a/tck/register-session/pom.xml b/tck/register-session/pom.xml
index 25bd643..d47b91a 100644
--- a/tck/register-session/pom.xml
+++ b/tck/register-session/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>register-session</artifactId>
diff --git a/tck/status-codes/pom.xml b/tck/status-codes/pom.xml
index 2c66a08..a737bf3 100644
--- a/tck/status-codes/pom.xml
+++ b/tck/status-codes/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>status-codes</artifactId>
diff --git a/tck/wrapping/pom.xml b/tck/wrapping/pom.xml
index 8107adc..a025756 100644
--- a/tck/wrapping/pom.xml
+++ b/tck/wrapping/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.eclipse.ee4j.tck.authentication</groupId>
         <artifactId>jakarta-authentication-tck</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>wrapping</artifactId>
diff --git a/tck/zip.xml b/tck/zip.xml
index 5801d41..82826b2 100644
--- a/tck/zip.xml
+++ b/tck/zip.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2022, 2022 Contributors to Eclipse Foundation. All rights reserved.
+    Copyright (c) 2022, 2023 Contributors to Eclipse Foundation. 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