Merge branch 'master' into camel41

windup · Oct 27, 2023 · 9de98bc · 9de98bc
2 parents d94cc4b + 99fefd4
commit 9de98bc
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 16 deletions.
diff --git a/rules/rules-reviewed/eap7/eap72/deprecated-singletonpolicy.rhamt.xml b/rules/rules-reviewed/eap7/eap72/deprecated-singletonpolicy.rhamt.xml
@@ -10,7 +10,7 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,8)" />        
+        <targetTechnology id="eap" versionRange="[7.3,8)" />        
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-405 -->

diff --git a/rules/rules-reviewed/eap7/eap72/maven-artemis-jms-client.rhamt.xml b/rules/rules-reviewed/eap7/eap72/maven-artemis-jms-client.rhamt.xml
@@ -10,7 +10,7 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,8)" />    
+        <targetTechnology id="eap" versionRange="[7.3,8)" />    
         <tag>jms</tag>
     </metadata>
     <rules>

diff --git a/rules/rules-reviewed/eap7/eap72/maven-javax-to-jakarta.rhamt.xml b/rules/rules-reviewed/eap7/eap72/maven-javax-to-jakarta.rhamt.xml
@@ -11,7 +11,7 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,9)" />
+        <targetTechnology id="eap" versionRange="[7.3,9)" />
         <targetTechnology id="jakarta-ee" versionRange="[8, 9)" />
         <tag>JakartaEE</tag>
     </metadata>

diff --git a/rules/rules-reviewed/eap7/eap72/maven-jboss-rmi-api_1.0_spec.rhamt.xml b/rules/rules-reviewed/eap7/eap72/maven-jboss-rmi-api_1.0_spec.rhamt.xml
@@ -10,7 +10,7 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,8)" />
+        <targetTechnology id="eap" versionRange="[7.3,8)" />
         <tag>rmi</tag>
     </metadata>
     <rules>

diff --git a/rules/rules-reviewed/eap7/eap72/move-to-microprofile-rest-client-1.3.rhamt.xml b/rules/rules-reviewed/eap7/eap72/move-to-microprofile-rest-client-1.3.rhamt.xml
@@ -10,7 +10,7 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,8)" />        
+        <targetTechnology id="eap" versionRange="[7.3,8)" />        
     </metadata>
     <rules>
         <!-- https://issues.jboss.org/browse/WINDUPRULE-400 -->

diff --git a/rules/rules-reviewed/eap7/eap72/singleton-sessionbean.rhamt.groovy b/rules/rules-reviewed/eap7/eap72/singleton-sessionbean.rhamt.groovy
@@ -12,7 +12,7 @@ import org.ocpsoft.rewrite.context.EvaluationContext
 import org.ocpsoft.rewrite.param.ParameterStore
 
 ruleSet("singleton-sessionbean-groovy")
-    .addTargetTechnology(new TechnologyReference("eap", "[7,8)"))
+    .addTargetTechnology(new TechnologyReference("eap", "[7.3,8)"))
     .addRule()
     .when(Query.fromType(EjbSessionBeanModel.class).withProperty("sessionType", "Singleton"))
     .perform(

diff --git a/rules/rules-reviewed/eap7/eap72/singleton-sessionbean.rhamt.xml b/rules/rules-reviewed/eap7/eap72/singleton-sessionbean.rhamt.xml
@@ -10,7 +10,7 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,8)" />
+        <targetTechnology id="eap" versionRange="[7.3,8)" />
     </metadata>
     <rules>
         <!-- https://issues.redhat.com/browse/WINDUPRULE-403 -->

diff --git a/rules/rules-reviewed/eap7/eap73/microprofile_removed_from_eap.mta.xml b/rules/rules-reviewed/eap7/eap73/microprofile_removed_from_eap.mta.xml
@@ -10,7 +10,7 @@
             <addon id="org.jboss.windup.rules,windup-rules-javaee,3.0.0.Final" />
             <addon id="org.jboss.windup.rules,windup-rules-java,3.0.0.Final" />
         </dependencies>
-        <targetTechnology id="eap" versionRange="[7,8)" />
+        <targetTechnology id="eap" versionRange="[7.4,8)" />
         <tag>EclipseMicroProfile</tag>
     </metadata>
     <rules>

diff --git 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
@@ -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>