From e76089b08e5de16646f70408a503dd644f8d2afd Mon Sep 17 00:00:00 2001
From: Eduardo Martins <emartins@redhat.com>
Date: Tue, 17 Oct 2023 11:52:37 +0100
Subject: [PATCH] [WINDUPRULE-1037] Improves EAP 8 JSP rule, clarifying it is
 about Faces removing support for JSP, and make it potential

---
 .../eap8/eap6/eap8-faces.windup.xml           | 22 ++++++++++++++-----
 .../eap6/tests/eap8-faces.windup.test.xml     |  4 ++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/rules/rules-reviewed/eap8/eap6/eap8-faces.windup.xml b/rules/rules-reviewed/eap8/eap6/eap8-faces.windup.xml
index f84c5d00a..4a68780de 100644
--- a/rules/rules-reviewed/eap8/eap6/eap8-faces.windup.xml
+++ b/rules/rules-reviewed/eap8/eap6/eap8-faces.windup.xml
@@ -178,14 +178,24 @@
         </rule>
         <rule id="eap8-faces-00009">
             <when>
-                <or>
-                    <filecontent filename="{*}.jsp" pattern="&lt;jsp"/>
-                    <filecontent filename="{*}.jsp" pattern="&lt;%"/>
-                </or>
+                <and>
+                    <or>
+                        <filecontent filename="{*}.jsp" pattern="&lt;jsp"/>
+                        <filecontent filename="{*}.jsp" pattern="&lt;%"/>
+                    </or>
+                    <or>
+                        <project>
+                            <artifact groupId="org.jboss.spec.javax.faces" artifactId="{*}"/>
+                        </project>
+                        <project>
+                            <artifact groupId="com.sun.faces" artifactId="{*}"/>
+                        </project>
+                    </or>
+                </and>
             </when>
             <perform>
-                <hint title="JSP support has been removed in Jakarta EE 10" effort="5" category-id="mandatory">
-                    <message>JSP support has been removed in Jakarta EE 10. Facelets will remain as the only default view language, and views can also now be created solely using java.</message>
+                <hint title="Jakarta Faces support for JSP has been removed in Jakarta EE 10" effort="5" category-id="potential">
+                    <message>As of Jakarta EE 10, Jakarta Faces does no longer support JSP as a faces view technology. JSP usage within Jakarta Faces must be removed/substituted. Facelets will remain as the only default view language, and views can also now be created solely using java.</message>
                     <link title="Jakarta EE Faces 4.0 Facelets"
                           href="https://jakarta.ee/specifications/faces/4.0/jakarta-faces-4.0.html#a5476"/>
                     <link title="Support for creating views in Java"
diff --git a/rules/rules-reviewed/eap8/eap6/tests/eap8-faces.windup.test.xml b/rules/rules-reviewed/eap8/eap6/tests/eap8-faces.windup.test.xml
index 56c15bec4..fcbf0039a 100644
--- a/rules/rules-reviewed/eap8/eap6/tests/eap8-faces.windup.test.xml
+++ b/rules/rules-reviewed/eap8/eap6/tests/eap8-faces.windup.test.xml
@@ -70,8 +70,8 @@
             <rule id="eap8-faces-00009-test">
                 <when>
                     <not>
-                        <iterable-filter size="1">
-                            <hint-exists message="JSP support has been removed in Jakarta EE 10"/>
+                        <iterable-filter size="2">
+                            <hint-exists message="As of Jakarta EE 10, Jakarta Faces does no longer support JSP as a faces view technology. JSP usage within Jakarta Faces must be removed/substituted. Facelets will remain as the only default view language, and views can also now be created solely using java."/>
                         </iterable-filter>
                     </not>
                 </when>