diff --git a/openam-server-only/pom.xml b/openam-server-only/pom.xml
index 5786f8d5c0..49bbe08e10 100644
--- a/openam-server-only/pom.xml
+++ b/openam-server-only/pom.xml
@@ -13,7 +13,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
- * Portions copyright 2017-2025 3A Systems, LLC
+ * Portions copyright 2017-2026 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/maven-v4_0_0.xsd">
@@ -255,6 +255,10 @@
                         <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
                         <nonFilteredFileExtension>woff</nonFilteredFileExtension>
                         <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+    					<nonFilteredFileExtension>eot</nonFilteredFileExtension>
+    					<nonFilteredFileExtension>svg</nonFilteredFileExtension>
+						<nonFilteredFileExtension>otf</nonFilteredFileExtension>
+						<nonFilteredFileExtension>db</nonFilteredFileExtension>
                         <!-- See: http://en.wikipedia.org/wiki/List_of_file_formats -->
                     </nonFilteredFileExtensions>
                     <webResources>
@@ -291,6 +295,8 @@
                                 <exclude>META-INF</exclude>
                                 <exclude>WEB-INF</exclude>
                                 <exclude>com_sun_web_ui/images</exclude>
+								<!-- JavaHelp search index files are binary; do not filter -->
+        						<exclude>**/JavaHelpSearch/**</exclude>
                             </excludes>
                             <targetPath />
                             <filtering>true</filtering>
@@ -303,6 +309,15 @@
                             <targetPath>com_sun_web_ui/images</targetPath>
                             <filtering>false</filtering>
                         </webResource>
+						<!-- New: copy JavaHelp search indexes WITHOUT filtering -->
+						<webResource>
+						    <directory>${basedir}/src/main/webapp</directory>
+						    <includes>
+						        <include>**/JavaHelpSearch/**</include>
+						    </includes>
+						    <targetPath />
+						    <filtering>false</filtering>
+						</webResource>
                         <webResource>
                             <directory>${project.basedir}/src/main/webapp/WEB-INF</directory>
                             <includes>
diff --git a/pom.xml b/pom.xml
index f787311334..54c999da5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2165,7 +2165,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.5.1</version>
 			</plugin>
 
 			<plugin>