diff --git a/impl/pom.xml b/impl/pom.xml
index 9122480..c185c5d 100755
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +24,7 @@
     <parent>
        <groupId>org.glassfish.soteria</groupId>
        <artifactId>parent</artifactId>
-       <version>3.0.1-SNAPSHOT</version>
+       <version>3.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.security.enterprise</artifactId>
@@ -38,7 +38,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.6</version>
+                <version>5.1.8</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/impl/src/main/java/org/glassfish/soteria/cdi/CdiExtension.java b/impl/src/main/java/org/glassfish/soteria/cdi/CdiExtension.java
index a8fb4f6..5fb62e7 100644
--- a/impl/src/main/java/org/glassfish/soteria/cdi/CdiExtension.java
+++ b/impl/src/main/java/org/glassfish/soteria/cdi/CdiExtension.java
@@ -126,7 +126,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             identityStoreBeans.add(new CdiProducer<IdentityStore>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStore.class)
                     .types(Object.class, IdentityStore.class, EmbeddedIdentityStore.class)
                     .addToId(EmbeddedIdentityStoreDefinition.class)
                     .create(e -> new EmbeddedIdentityStore(embeddedIdentityStoreDefinition))
@@ -139,7 +138,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             identityStoreBeans.add(new CdiProducer<IdentityStore>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStore.class)
                     .types(Object.class, IdentityStore.class, DatabaseIdentityStore.class)
                     .addToId(DatabaseIdentityStoreDefinition.class)
                     .create(e -> new DatabaseIdentityStore(
@@ -154,7 +152,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             identityStoreBeans.add(new CdiProducer<IdentityStore>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStore.class)
                     .types(Object.class, IdentityStore.class, LdapIdentityStore.class)
                     .addToId(LdapIdentityStoreDefinition.class)
                     .create(e -> new LdapIdentityStore(
@@ -169,7 +166,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(BasicAuthenticationMechanism.class)
                     .types(Object.class, HttpAuthenticationMechanism.class, BasicAuthenticationMechanism.class)
                     .addToId(BasicAuthenticationMechanismDefinition.class)
                     .create(e -> new BasicAuthenticationMechanism(
@@ -183,7 +179,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(HttpAuthenticationMechanism.class)
                     .types(Object.class, HttpAuthenticationMechanism.class)
                     .addToId(FormAuthenticationMechanismDefinition.class)
                     .create(e -> {
@@ -202,7 +197,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(HttpAuthenticationMechanism.class)
                     .types(Object.class, HttpAuthenticationMechanism.class)
                     .addToId(CustomFormAuthenticationMechanismDefinition.class)
                     .create(e -> {
@@ -223,14 +217,12 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(HttpAuthenticationMechanism.class)
                     .types(HttpAuthenticationMechanism.class)
                     .addToId(OpenIdAuthenticationMechanism.class)
                     .create(e -> getBeanReference(OpenIdAuthenticationMechanism.class));
 
             identityStoreBeans.add(new CdiProducer<IdentityStore>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStore.class)
                     .types(IdentityStore.class)
                     .addToId(OpenIdIdentityStore.class)
                     .create(e -> getBeanReference(OpenIdIdentityStore.class))
@@ -238,7 +230,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             extraBeans.add(new CdiProducer<OpenIdAuthenticationMechanismDefinition>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(OpenIdAuthenticationMechanismDefinition.class)
                     .types(OpenIdAuthenticationMechanismDefinition.class)
                     .addToId("OpenId Definition")
                     .create(e -> definition)
@@ -272,7 +263,6 @@ public void afterBean(final @Observes AfterBeanDiscovery afterBeanDiscovery, Bea
             if ("basic".equalsIgnoreCase(loginConfig.getAuthMethod())) {
                 authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(BasicAuthenticationMechanism.class)
                     .types(Object.class, HttpAuthenticationMechanism.class, BasicAuthenticationMechanism.class)
                     .addToId(BasicAuthenticationMechanismDefinition.class)
                     .create(e ->
@@ -283,7 +273,6 @@ public void afterBean(final @Observes AfterBeanDiscovery afterBeanDiscovery, Bea
             } else if ("form".equalsIgnoreCase(loginConfig.getAuthMethod())) {
                 authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                         .scope(ApplicationScoped.class)
-                        .beanClass(HttpAuthenticationMechanism.class)
                         .types(Object.class, HttpAuthenticationMechanism.class)
                         .addToId(FormAuthenticationMechanismDefinition.class)
                         .create(e -> {
@@ -319,7 +308,6 @@ public void afterBean(final @Observes AfterBeanDiscovery afterBeanDiscovery, Bea
             // Probably can circumvent this using programmatic lookup or Instance injection
             afterBeanDiscovery.addBean()
                 .scope(Dependent.class)
-                .beanClass(OpenIdAuthenticationMechanismDefinition.class)
                 .types(OpenIdAuthenticationMechanismDefinition.class)
                 .id("Null OpenId Definition")
                 .createWith(cc -> null);
@@ -329,7 +317,6 @@ public void afterBean(final @Observes AfterBeanDiscovery afterBeanDiscovery, Bea
             decorator.decorateBean(
                 new CdiProducer<IdentityStoreHandler>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStoreHandler.class)
                     .types(Object.class, IdentityStoreHandler.class)
                     .addToId(IdentityStoreHandler.class)
                     .create(e -> {
diff --git a/impl/src/main/java/org/glassfish/soteria/cdi/CdiProducer.java b/impl/src/main/java/org/glassfish/soteria/cdi/CdiProducer.java
index 244f8cf..36d1ec6 100644
--- a/impl/src/main/java/org/glassfish/soteria/cdi/CdiProducer.java
+++ b/impl/src/main/java/org/glassfish/soteria/cdi/CdiProducer.java
@@ -40,7 +40,7 @@ public class CdiProducer<T> implements Bean<T>, PassivationCapable {
 
     private String id = this.getClass().getName();
     private String name;
-    private Class<?> beanClass = Object.class;
+    private Class<?> beanClass = CdiExtension.class;
     private Set<Type> types = singleton(Object.class);
     private Set<Annotation> qualifiers = unmodifiableSet(asSet(new DefaultAnnotationLiteral(), new AnyAnnotationLiteral()));
     private Class<? extends Annotation> scope = Dependent.class;
diff --git a/impl/src/main/java/org/glassfish/soteria/mechanisms/openid/domain/AccessTokenImpl.java b/impl/src/main/java/org/glassfish/soteria/mechanisms/openid/domain/AccessTokenImpl.java
index 9f52ed4..0165b98 100644
--- a/impl/src/main/java/org/glassfish/soteria/mechanisms/openid/domain/AccessTokenImpl.java
+++ b/impl/src/main/java/org/glassfish/soteria/mechanisms/openid/domain/AccessTokenImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -61,7 +61,7 @@ public AccessTokenImpl(String tokenType, String token, Long expiresIn, String sc
         try {
             this.tokenJWT = JWTParser.parse(token);
             jwtClaimsSet = tokenJWT.getJWTClaimsSet();
-            this.claims = jwtClaimsSet.getClaims();
+            this.claims = ifPresent(jwtClaimsSet);
         } catch (ParseException ex) {
             // Access token doesn't need to be JWT at all
         }
@@ -72,7 +72,7 @@ public AccessTokenImpl(String tokenType, String token, Long expiresIn, String sc
         this.createdAt = System.currentTimeMillis();
         this.scope = Scope.parse(scopeValue);
     }
-
+    
     @Override
     public boolean isExpired() {
         boolean expired;
@@ -138,5 +138,9 @@ public JwtClaims getJwtClaims() {
     public String toString() {
         return token;
     }
+    
+    private Map<String, Object> ifPresent(JWTClaimsSet claimsSet) {
+        return claimsSet == null ? null : claimsSet.getClaims();
+    }
 
 }
diff --git a/pom.xml b/pom.xml
index 4e84055..eaa2197 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-	Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation.
+	Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -25,15 +25,15 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.8</version>
     </parent>
 
     <groupId>org.glassfish.soteria</groupId>
     <artifactId>parent</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <description>Security Soteria - the Reference Implementation of JSR 375</description>
+    <description>Compatible Implementation for Jakarta Security API</description>
     <inceptionYear>2015</inceptionYear>
     <licenses>
         <license>
@@ -131,7 +131,7 @@
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-api</artifactId>
-            <version>2.1.0</version>
+            <version>2.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -156,7 +156,7 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
-            <version>9.23</version>
+            <version>9.29</version>
         </dependency>
 
         <dependency>
@@ -233,7 +233,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <id>attach-api-javadocs</id>
diff --git a/spi/bean-decorator/pom.xml b/spi/bean-decorator/pom.xml
index ef7d0f0..b13895d 100644
--- a/spi/bean-decorator/pom.xml
+++ b/spi/bean-decorator/pom.xml
@@ -25,7 +25,7 @@
    <parent>
        <groupId>org.glassfish.soteria</groupId>
        <artifactId>spi</artifactId>
-       <version>3.0.1-SNAPSHOT</version>
+       <version>3.0.3-SNAPSHOT</version>
     </parent>
 
    <artifactId>spi-bean-decorator</artifactId>
diff --git a/spi/bean-decorator/weld/pom.xml b/spi/bean-decorator/weld/pom.xml
index b75ce99..f0aec81 100644
--- a/spi/bean-decorator/weld/pom.xml
+++ b/spi/bean-decorator/weld/pom.xml
@@ -2,7 +2,7 @@
 
 <!--
 
-    Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation.
     Copyright (c) 2015, 2020 Payara and/or its affiliates and others. 
     All rights reserved.
 
@@ -26,7 +26,7 @@
 	<parent>
 		<groupId>org.glassfish.soteria</groupId>
 		<artifactId>spi-bean-decorator</artifactId>
-		<version>3.0.1-SNAPSHOT</version>
+		<version>3.0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>soteria.spi.bean.decorator.weld</artifactId>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>org.jboss.weld</groupId>
 			<artifactId>weld-osgi-bundle</artifactId>
-			<version>5.0.1.Final</version>
+			<version>5.1.0.Final</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -56,7 +56,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>5.1.6</version>
+				<version>5.1.8</version>
 				<extensions>true</extensions>
                 <executions>
                     <execution>
@@ -97,7 +97,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-api-javadocs</id>
diff --git a/spi/pom.xml b/spi/pom.xml
index c682cce..1c5fea9 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -24,7 +24,7 @@
    <parent>
        <groupId>org.glassfish.soteria</groupId>
        <artifactId>parent</artifactId>
-       <version>3.0.1-SNAPSHOT</version>
+       <version>3.0.3-SNAPSHOT</version>
     </parent>
 
    <artifactId>spi</artifactId>
diff --git a/test/app-custom-identity-store-handler/pom.xml b/test/app-custom-identity-store-handler/pom.xml
index 4046f91..f799122 100644
--- a/test/app-custom-identity-store-handler/pom.xml
+++ b/test/app-custom-identity-store-handler/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-custom-identity-store-handler</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/test/app-custom-rememberme/pom.xml b/test/app-custom-rememberme/pom.xml
index 2f3fd37..f350107 100644
--- a/test/app-custom-rememberme/pom.xml
+++ b/test/app-custom-rememberme/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-custom-rememberme</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-custom-session/pom.xml b/test/app-custom-session/pom.xml
index 49df05c..cda8290 100644
--- a/test/app-custom-session/pom.xml
+++ b/test/app-custom-session/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-custom-session</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-custom/pom.xml b/test/app-custom/pom.xml
index 18e0f34..896a035 100644
--- a/test/app-custom/pom.xml
+++ b/test/app-custom/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-custom</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-db/pom.xml b/test/app-db/pom.xml
index 14a760b..9987956 100644
--- a/test/app-db/pom.xml
+++ b/test/app-db/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-db</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
         
          <dependency>
diff --git a/test/app-jaxrs/pom.xml b/test/app-jaxrs/pom.xml
index c34764c..3de8d5c 100644
--- a/test/app-jaxrs/pom.xml
+++ b/test/app-jaxrs/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>app-jaxrs</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
diff --git a/test/app-ldap/pom.xml b/test/app-ldap/pom.xml
index 67efc13..c3786dc 100644
--- a/test/app-ldap/pom.xml
+++ b/test/app-ldap/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>app-ldap</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
         
         <dependency>
diff --git a/test/app-ldap2/pom.xml b/test/app-ldap2/pom.xml
index fd07bfd..a3de915 100644
--- a/test/app-ldap2/pom.xml
+++ b/test/app-ldap2/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
         
          <dependency>
diff --git a/test/app-ldap3/pom.xml b/test/app-ldap3/pom.xml
index 7f23b8f..f525722 100644
--- a/test/app-ldap3/pom.xml
+++ b/test/app-ldap3/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
         
          <dependency>
diff --git a/test/app-mem-basic-decorate/pom.xml b/test/app-mem-basic-decorate/pom.xml
index 99d4865..de378b6 100644
--- a/test/app-mem-basic-decorate/pom.xml
+++ b/test/app-mem-basic-decorate/pom.xml
@@ -23,7 +23,7 @@
    <parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
    <artifactId>app-mem-basic-decorate</artifactId>
diff --git a/test/app-mem-basic/pom.xml b/test/app-mem-basic/pom.xml
index 6e47056..a1ef1b3 100644
--- a/test/app-mem-basic/pom.xml
+++ b/test/app-mem-basic/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>app-mem-basic</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-mem-customform/pom.xml b/test/app-mem-customform/pom.xml
index 487afb2..dffb636 100644
--- a/test/app-mem-customform/pom.xml
+++ b/test/app-mem-customform/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-mem-customform</artifactId>
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>org.glassfish.soteria.test</groupId>
                 <artifactId>common</artifactId>
-                <version>3.0.1-SNAPSHOT</version>
+                <version>3.0.3-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.faces</groupId>
diff --git a/test/app-mem-form/pom.xml b/test/app-mem-form/pom.xml
index ce273c2..e5c7212 100644
--- a/test/app-mem-form/pom.xml
+++ b/test/app-mem-form/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-mem-form</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-mem/pom.xml b/test/app-mem/pom.xml
index 4a3a060..7fed0b9 100644
--- a/test/app-mem/pom.xml
+++ b/test/app-mem/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-mem</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-multiple-store-backup/pom.xml b/test/app-multiple-store-backup/pom.xml
index 9fbd41b..d15bd98 100644
--- a/test/app-multiple-store-backup/pom.xml
+++ b/test/app-multiple-store-backup/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-multiple-store-backup</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-multiple-store/pom.xml b/test/app-multiple-store/pom.xml
index e3057aa..c3c23d1 100644
--- a/test/app-multiple-store/pom.xml
+++ b/test/app-multiple-store/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-multiple-store</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-openid/pom.xml b/test/app-openid/pom.xml
index c5eddf8..0dd6960 100644
--- a/test/app-openid/pom.xml
+++ b/test/app-openid/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-openid</artifactId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/test/app-openid2/pom.xml b/test/app-openid2/pom.xml
index e921faf..943ae4f 100644
--- a/test/app-openid2/pom.xml
+++ b/test/app-openid2/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-openid2</artifactId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/test/app-openid3/pom.xml b/test/app-openid3/pom.xml
index 8cff2d1..2feb9ed 100644
--- a/test/app-openid3/pom.xml
+++ b/test/app-openid3/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-openid3</artifactId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/test/app-securitycontext-auth/pom.xml b/test/app-securitycontext-auth/pom.xml
index 1240838..d43c558 100644
--- a/test/app-securitycontext-auth/pom.xml
+++ b/test/app-securitycontext-auth/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-securitycontext-auth</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-securitycontext-customprincipal/pom.xml b/test/app-securitycontext-customprincipal/pom.xml
index f5c45b9..005d122 100644
--- a/test/app-securitycontext-customprincipal/pom.xml
+++ b/test/app-securitycontext-customprincipal/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-securitycontext-customprincipal</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/app-securitycontext/pom.xml b/test/app-securitycontext/pom.xml
index 055ee85..49ab266 100644
--- a/test/app-securitycontext/pom.xml
+++ b/test/app-securitycontext/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
 	<artifactId>app-securitycontext</artifactId>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.glassfish.soteria.test</groupId>
             <artifactId>common</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.0.3-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/test/common/pom.xml b/test/common/pom.xml
index b53dca0..567453a 100644
--- a/test/common/pom.xml
+++ b/test/common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.soteria.test</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>common</artifactId>
diff --git a/test/pom.xml b/test/pom.xml
index 0d40459..95caaaa 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -24,7 +24,7 @@
     <parent>
        <groupId>org.glassfish.soteria</groupId>
        <artifactId>parent</artifactId>
-       <version>3.0.1-SNAPSHOT</version>
+       <version>3.0.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.glassfish.soteria.test</groupId>