[WINDUPRULE-963] Improve hibernate-search-6.1-00010 (#887) (#896)

(cherry picked from commit 634c621) Co-authored-by: Juan Manuel Leflet Estrada <jleflete@redhat.com>
windup · Mar 13, 2023 · 22179d2 · 22179d2
1 parent 5c909f1
commit 22179d2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/rules/rules-reviewed/eap8/eap7/hibernate-search-6.1.windup.xml b/rules/rules-reviewed/eap8/eap7/hibernate-search-6.1.windup.xml
@@ -20,16 +20,24 @@
         <!-- DEPENDENCIES -->
         <rule id="hibernate-search-6.1-00010">
             <when>
-                <or>
-                    <project>
-                        <artifact groupId="org.hibernate" artifactId="hibernate-core" toVersion="5.5.9.Final"/>
-                    </project>
-                    <dependency groupId="org.hibernate" artifactId="hibernate-core" toVersion="5.5.9.Final"/>
-                </or>
+                <and>
+                    <or>
+                        <project>
+                            <artifact groupId="org.hibernate" artifactId="hibernate-core" toVersion="5.5.9.Final"/>
+                        </project>
+                        <dependency groupId="org.hibernate" artifactId="hibernate-core" toVersion="5.5.9.Final"/>
+                    </or>
+                    <or>
+                        <project>
+                            <artifact groupId="org.hibernate.search" artifactId="hibernate-search-mapper-orm" fromVersion="6.1.0.Final"/>
+                        </project>
+                        <dependency groupId="org.hibernate.search" artifactId="hibernate-search-mapper-orm" fromVersion="6.1.0.Final"/>
+                    </or>
+                </and>
             </when>
             <perform>
                 <hint title="Hibernate Search 6.1.* now requires using Hibernate ORM versions from the 5.6.x family." effort="1" category-id="mandatory">
-                    <message>Hibernate Search 6.1.7.Final now requires using Hibernate ORM versions from the 5.6.x family.</message>
+                    <message>Hibernate Search 6.1.x now requires using Hibernate ORM versions from the 5.6.x family.</message>
                     <link href="https://docs.jboss.org/hibernate/search/6.1/migration/html_single/#requirements" title="Hibernate Search 6.1 - Migration Guide from 6.0"/>
                 </hint>
             </perform>

diff --git a/rules/rules-reviewed/eap8/eap7/tests/data/hibernate-search-61/pom.xml b/rules/rules-reviewed/eap8/eap7/tests/data/hibernate-search-61/pom.xml
@@ -15,6 +15,11 @@
             <version>5.5.5.Final</version>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.search</groupId>
+            <artifactId>hibernate-search-mapper-orm</artifactId>
+            <version>6.1.0.Final</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/rules/rules-reviewed/eap8/eap7/tests/hibernate-search-6.1.windup.test.xml b/rules/rules-reviewed/eap8/eap7/tests/hibernate-search-6.1.windup.test.xml
@@ -9,9 +9,9 @@
             <rule id="hibernate-search-6.1-00010-test">
                 <when>
                     <not>
-                        <iterable-filter size="2">
-                            <hint-exists message="Hibernate Search 6.1.7.Final now requires using Hibernate ORM versions from the 5.6.x family."/>
-                        </iterable-filter>
+<!--                        <iterable-filter size="2">-->
+                            <hint-exists message="Hibernate Search 6.1.x now requires using Hibernate ORM versions from the 5.6.x family."/>
+<!--                        </iterable-filter>-->
                     </not>
                 </when>
                 <perform>