From eea3890a885386d0994eeab6a9a0ac70016705ef Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Thu, 3 Sep 2026 19:58:05 +0300
Subject: [PATCH] [#1114] Fix precompile-jsps profile for the Jakarta EE 9
 webapp

jetty-jspc-maven-plugin 9.4.0.M0 carries the Jetty 9 Jasper (Tomcat 8.5,
javax.servlet), so it could not compile a single page of the migrated
jakarta.servlet webapp. The build aborted on ssoadm.jsp, the first JSP in
the list, and never reached the federation pages under saml2/jsp,
wsfederation/jsp and config/federation.

Move the plugin to 11.0.24, which matches the module's Servlet 5.0 /
JSP 3.0 / JSTL 2.0 level, and configure the goal for validation only:

- useProvidedScope=true. Both jakarta.servlet-api and
  jakarta.servlet.jsp-api resolve as provided, so without this the
  Servlet and JSP APIs are absent from the JspC classpath and every page
  fails regardless of the plugin version.
- generatedClasses under target/jspc and mergeFragment=false, so neither
  a generated servlet nor a web.xml fragment can reach the war. Their
  defaults are target/classes and true, which would have changed the
  <jsp-file> servlet mappings.
- sourceVersion/targetVersion taken from maven.compiler.*.
- The exclude list narrowed to the two com_sun_web_ui/jsp/version pages
  that bind JATO view beans from openam-console, which is not on this
  module's classpath. The other files the old wildcards covered -
  WEB-INF/jsp/Version.jsp and the help/help2 Mastheads - compile fine,
  and userconsole.jsp does not exist in this module.

121 of the module's 123 JSPs now compile, in under 4 seconds.
---
 openam-server-only/pom.xml | 14 +++++++++++---
 pom.xml                    |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/openam-server-only/pom.xml b/openam-server-only/pom.xml
index b5edd68dd0..23d14131a8 100644
--- a/openam-server-only/pom.xml
+++ b/openam-server-only/pom.xml
@@ -523,9 +523,17 @@
                                     <goal>jspc</goal>
                                 </goals>
                                 <configuration>
-                                    <!-- Exclude JSPs with known compilation issues: -->
-                                    <excludes>**/ButtonFrame.jsp,**/Masthead.jsp,**/Version.jsp,
-                                        **/userconsole.jsp</excludes>
+                                    <!-- Validation only: never let generated servlets reach the war. -->
+                                    <useProvidedScope>true</useProvidedScope>
+                                    <mergeFragment>false</mergeFragment>
+                                    <keepSources>true</keepSources>
+                                    <generatedClasses>${project.build.directory}/jspc</generatedClasses>
+                                    <sourceVersion>${maven.compiler.source}</sourceVersion>
+                                    <targetVersion>${maven.compiler.target}</targetVersion>
+                                    <!-- These two pages bind JATO view beans that live in
+                                         openam-console, which is not on this module's classpath. -->
+                                    <excludes>**/com_sun_web_ui/jsp/version/ButtonFrame.jsp,
+                                        **/com_sun_web_ui/jsp/version/Masthead.jsp</excludes>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/pom.xml b/pom.xml
index 41f04be494..890c6be1c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
     <h2database.version>2.2.220</h2database.version>
     <activemq.version>5.16.8</activemq.version>
     <jakarta.inject.version>2.0.1</jakarta.inject.version>
-    <jetty.jspc.version>9.4.0.M0</jetty.jspc.version>
+    <jetty.jspc.version>11.0.24</jetty.jspc.version>
     <amazon.sns.version>1.10.72</amazon.sns.version>
     <jakarta.websocket-api.version>2.0.0</jakarta.websocket-api.version>
     <openam.version>OpenAM ${project.version}</openam.version>