diff --git a/commons/audit/pom.xml b/commons/audit/pom.xml
index 66dc6f1dc..baf71c323 100644
--- a/commons/audit/pom.xml
+++ b/commons/audit/pom.xml
@@ -13,6 +13,7 @@
   ~ information: "Portions copyright [year] [name of copyright owner]".
   ~
   ~ Copyright 2015-2016 ForgeRock AS.
+  ~ Portions copyright 2020-2025 3A Systems LLC.
   -->
 
 <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/xsd/maven-4.0.0.xsd">
@@ -77,7 +78,7 @@
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
-                <version>${javax.version}</version>
+                <version>${servlet-api.version}</version>
                 <scope>provided</scope>
             </dependency>
         </dependencies>
diff --git a/commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/pom.xml b/commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/pom.xml
index 06fd78936..3f1af418f 100644
--- a/commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/pom.xml
+++ b/commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/pom.xml
@@ -13,6 +13,7 @@
 * information: "Portions copyright [year] [name of copyright owner]".
 *
 * Copyright 2013-2016 ForgeRock AS.
+* Portions copyright 2020-2025 3A Systems LLC.
 -->
 <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/xsd/maven-4.0.0.xsd">
 
@@ -59,7 +60,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.version}</version>
+            <version>${servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/commons/auth-filters/authz-filter/framework-functional-tests/pom.xml b/commons/auth-filters/authz-filter/framework-functional-tests/pom.xml
index 85b81db05..817e8bf86 100644
--- a/commons/auth-filters/authz-filter/framework-functional-tests/pom.xml
+++ b/commons/auth-filters/authz-filter/framework-functional-tests/pom.xml
@@ -13,6 +13,7 @@
 * information: "Portions copyright [year] [name of copyright owner]".
 *
 * Copyright 2014-2016 ForgeRock AS.
+* Portions copyright 2020-2025 3A Systems LLC.
 -->
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -177,7 +178,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.version}</version>
+            <version>${servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/commons/geo/pom.xml b/commons/geo/pom.xml
index 737c0bc7e..e5e643c2f 100644
--- a/commons/geo/pom.xml
+++ b/commons/geo/pom.xml
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2020-2024 3A Systems LLC.
+ * Copyright 2020-2025 3A Systems LLC.
 -->
 <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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>${javax.version}</version>
+			<version>${servlet-api.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/commons/http-framework/examples/servlet-example/pom.xml b/commons/http-framework/examples/servlet-example/pom.xml
index 5fab36b6f..1c0701a87 100644
--- a/commons/http-framework/examples/servlet-example/pom.xml
+++ b/commons/http-framework/examples/servlet-example/pom.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2015-2016 ForgeRock AS.
+  Portions Copyright 2020-2025 3A Systems LLC.
 -->
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -40,7 +41,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>${javax.version}</version>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/commons/http-framework/servlet/pom.xml b/commons/http-framework/servlet/pom.xml
index caebe9d6a..d4579b54c 100644
--- a/commons/http-framework/servlet/pom.xml
+++ b/commons/http-framework/servlet/pom.xml
@@ -13,7 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2014-2016 ForgeRock AS.
-  Portions Copyright 2017-2024 3A Systems, LLC.
+  Portions Copyright 2017-2025 3A Systems, LLC.
 -->
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>${javax.version}</version>
+      <version>${servlet-api.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/commons/httpdump/pom.xml b/commons/httpdump/pom.xml
index b826ebe6d..fd2654d08 100644
--- a/commons/httpdump/pom.xml
+++ b/commons/httpdump/pom.xml
@@ -1,3 +1,19 @@
+<!--
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions copyright [year] [name of copyright owner]".
+ *
+ * Copyright 2020-2025 3A Systems LLC.
+-->
+
 <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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
@@ -16,7 +32,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
-			<version>${javax.version}</version>
+			<version>${servlet-api.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/commons/rest/json-resource-http/pom.xml b/commons/rest/json-resource-http/pom.xml
index 84a454368..40a973b5f 100644
--- a/commons/rest/json-resource-http/pom.xml
+++ b/commons/rest/json-resource-http/pom.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2012-2016 ForgeRock AS.
+  Portions Copyright 2020-2025 3A Systems LLC.
 -->
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -74,7 +75,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.version}</version>
+            <version>${servlet-api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/guice/servlet/pom.xml b/guice/servlet/pom.xml
index 6452cd4d3..f02fe89d6 100644
--- a/guice/servlet/pom.xml
+++ b/guice/servlet/pom.xml
@@ -13,6 +13,7 @@ Header, with the fields enclosed by brackets [] replaced by your own identifying
 information: "Portions Copyrighted [year] [name of copyright owner]".
 
 Copyright 2014 ForgeRock AS.
+Portions Copyrighted 2020-2025 3A Systems LLC.
 -->
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -37,7 +38,7 @@ Copyright 2014 ForgeRock AS.
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.version}</version>
+            <version>${servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 0b0f706eb..ce4d261d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,7 +208,7 @@
         <rhino.version>1.7.14</rhino.version>
         <jetty.version>9.4.57.v20241219</jetty.version>
         <grizzly-framework.version>2.3.35</grizzly-framework.version>
-        <javax.version>3.1.0</javax.version>
+        <servlet-api.version>3.1.0</servlet-api.version>
     </properties>
 
     <prerequisites>
@@ -705,7 +705,7 @@
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
-                <version>${javax.version}</version>
+                <version>${servlet-api.version}</version>
                 <scope>provided</scope>
             </dependency>