Fix Spring IT skipping on JDK 22

Following errors in d526b74
hibernate · Sep 22, 2023 · 78d4cdf · 78d4cdf
1 parent ffa20e9
commit 78d4cdf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/integrationtest/mapper/orm-spring-uberjar/application/pom.xml b/integrationtest/mapper/orm-spring-uberjar/application/pom.xml
@@ -11,6 +11,10 @@
 
     <name>Hibernate Search ITs - Spring Repackaged JAR Application</name>
 
+    <properties>
+        <test.lucene.skip>${failsafe.spring.skip}</test.lucene.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.hibernate.search</groupId>
@@ -94,7 +98,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
-                    <skip>${failsafe.spring.skip}</skip>
+                    <skip>${test.lucene.skip}</skip>
                     <classesDirectory>${project.build.outputDirectory}</classesDirectory>
                     <environmentVariables>
                         <!--
@@ -122,20 +126,5 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>skipLuceneTests</id>
-            <activation>
-                <property>
-                    <name>test.lucene.skip</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <properties>
-                <failsafe.spring.skip>true</failsafe.spring.skip>
-            </properties>
-        </profile>
-    </profiles>
 </project>
 
diff --git a/integrationtest/showcase/library/pom.xml b/integrationtest/showcase/library/pom.xml
@@ -16,6 +16,9 @@
         <test.elasticsearch.run.skip>${test.elasticsearch.run.skip.forRelevantModules}</test.elasticsearch.run.skip>
         <test.database.run.skip>false</test.database.run.skip>
 
+        <test.lucene.skip>${failsafe.spring.skip}</test.lucene.skip>
+        <test.elasticsearch.skip>${failsafe.spring.skip}</test.elasticsearch.skip>
+
         <!--
             Remove Hibernate system properties from parent settings:
             They are supposed to be handled by the spring.datasource subsystem
@@ -155,7 +158,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <configuration>
-                    <skip>${failsafe.spring.skip}</skip>
                     <!--
                         Since we do not pass the Hibernate ORM settings through system properties directly
                         (see the override of the failsafe.jvm.args.hibernate-orm near the top of this file),

diff --git a/pom.xml b/pom.xml
@@ -447,7 +447,7 @@
         <failsafe.jvm.args>${surefire.jvm.args.memory} ${surefire.jvm.args.misc} ${surefire.jvm.args.java-version} ${surefire.jvm.args.module} ${failsafe.jvm.args.jacoco} ${failsafe.jvm.args.hibernate-orm} ${failsafe.jvm.args.jdbc} ${test.launcher.args}</failsafe.jvm.args>
 
         <!-- Disable integration tests selectively. To be set in specific profile, e.g. for a specific JDK version. -->
-        <failsafe.spring.skip>${skipITs}</failsafe.spring.skip>
+        <failsafe.spring.skip>false</failsafe.spring.skip>
 
         <!-- This allows us to distinguish between multiple executions of the same test in test reports. -->
         <surefire.reportNameSuffix>${surefire.module}-${surefire.integration}-${surefire.environment}</surefire.reportNameSuffix>