diff --git a/pom.xml b/pom.xml
index 7b57b20b..abab40e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
 
   Copyright 2010-2011 ApexIdentity Inc.
   Portions Copyright 2011-2016 ForgeRock AS.
+  Portions Copyright 2018-2024 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>
@@ -31,14 +32,12 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- 2.9.1 includes security fix for Security vulnerability CVE-2013-1571 -->
-    <javadocPluginVersion>2.9.1</javadocPluginVersion>
 
     <!-- For a release build, update this to https://backstage.forgerock.com/#!/docs/openig/${project.version} -->
     <welcomeDocUrl>https://github.com/OpenIdentityPlatform/OpenIG/wiki</welcomeDocUrl>
     <maven.min.version>3.1.0</maven.min.version>
-	<maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
+	<maven.compiler.target>8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
     
     <!--  ForgeRock build tools and Checkstyle versions (to avoid many checkstyle errors with ForgeRock Parent 2.0.10) -->
     <forgerockBuildToolsVersion>1.0.3</forgerockBuildToolsVersion>
@@ -909,10 +908,8 @@
 			<inherited>true</inherited>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-compiler-plugin</artifactId>
-			<version>3.10.1</version>
+			<version>3.13.0</version>
 			<configuration>
-				<source>${maven.compiler.source}</source>
-				<target>${maven.compiler.target}</target>
 				<fork>true</fork>
 				<compilerArgs>
 					<arg>-XDignore.symbol.file</arg>
@@ -965,7 +962,7 @@
 		<plugin>
 			<groupId>org.apache.maven.plugins</groupId>
 			<artifactId>maven-javadoc-plugin</artifactId>
-			<version>3.1.1</version>
+			<version>3.10.1</version>
 			<configuration>
 			</configuration>
 		</plugin>
@@ -1060,6 +1057,30 @@
             </plugins>
         </build>
     </profile>
+	  <profile>
+		  <id>set-compiler-release</id>
+		  <activation>
+			  <jdk>[9,)</jdk>
+		  </activation>
+		  <build>
+			  <pluginManagement>
+				  <plugins>
+					  <plugin>
+						  <groupId>org.apache.maven.plugins</groupId>
+						  <artifactId>maven-compiler-plugin</artifactId>
+						  <configuration>
+							  <fork>true</fork>
+							  <release>8</release>
+							  <compilerArgs>
+								  <arg>-XDignore.symbol.file</arg>
+								  <arg>-Xlint:unchecked</arg>
+							  </compilerArgs>
+						  </configuration>
+					  </plugin>
+				  </plugins>
+			  </pluginManagement>
+		  </build>
+	  </profile>
     <profile>
 	  <id>jdk11.options</id>
 	  <activation>