HSEARCH-5518 Use Spring Boot 4 and corresponding Narayana starter in ITs

marko-bekhta · marko-bekhta · commit 9d2d05667f40 · 2025-11-11T15:19:27.000+01:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -523,13 +523,13 @@ stage('Non-default environments') {
 					// so we skip them.
 					String mavenBuildAdditionalArgs = ''' \
 							-pl !documentation \
+							-pl !integrationtest/mapper/orm-spring \
 							-pl !integrationtest/v5migrationhelper/orm \
 							-pl !integrationtest/java/modules/orm-lucene \
 							-pl !integrationtest/java/modules/orm-elasticsearch \
 							-pl !integrationtest/java/modules/orm-outbox-polling-elasticsearch \
 							-pl !lucene-next/documentation \
 							-pl !lucene-next/integrationtest/java/modules/orm-lucene \
-							-P !springITs \
 					'''
 					String mavenDockerArgs = ""
 					def startedContainers = false
@@ -600,8 +600,7 @@ stage('Non-default environments') {
 										--fail-fast \
 										-pl ${[
 											'org.hibernate.search:hibernate-search-integrationtest-backend-elasticsearch'
-											// Add back after Spring Boot 4 update:
-											//, 'org.hibernate.search:hibernate-search-integrationtest-showcase-library'
+											, 'org.hibernate.search:hibernate-search-integrationtest-showcase-library'
 											 ].join(',')} \
 										-Dtest.lucene.skip=true \
 										-Dtest.elasticsearch.distribution=$buildEnv.distribution \
@@ -643,11 +642,9 @@ stage('Non-default environments') {
 								// Note that because we expect frequent failure and retries,
 								// we use --fail-fast here, to make sure we don't waste time.
 								retry(count: 3) {
-									// Add back after Spring Boot 4 update:
-									// ,org.hibernate.search:hibernate-search-integrationtest-showcase-library
 									mavenNonDefaultBuild buildEnv, """ \
 										--fail-fast \
-										-pl org.hibernate.search:hibernate-search-integrationtest-backend-elasticsearch \
+										-pl org.hibernate.search:hibernate-search-integrationtest-backend-elasticsearch,org.hibernate.search:hibernate-search-integrationtest-showcase-library \
 										-Dtest.lucene.skip=true \
 										-Dtest.elasticsearch.distribution=$buildEnv.distribution \
 										-Dtest.elasticsearch.version=$buildEnv.version \
diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
@@ -178,11 +178,10 @@
         <version.org.wildfly.security.wildfly-security-manager>1.1.2.Final</version.org.wildfly.security.wildfly-security-manager>
 
         <!-- >>> Spring integration tests -->
-        <!-- When updating Spring Boot check if it supports JDK24 and enable testing with it if so (see testWithJdk24 profile). -->
-        <!-- When updating to SB 4 make sure to update the main Jenkinsfile to include the showcase ITs in the non-default builds -->
-        <version.org.springframework.boot>3.5.0</version.org.springframework.boot>
-        <!-- Spring Boot 3 JTA starter and related libs version: -->
-        <version.dev.snowdrop>3.5.0</version.dev.snowdrop>
+        <!-- When updating Spring Boot check if it supports JDK26 and enable testing with it if so (see testWithJdk26 profile). -->
+        <version.org.springframework.boot>4.0.0-RC2</version.org.springframework.boot>
+        <!-- Spring Boot JTA starter and related libs version: -->
+        <version.dev.snowdrop>4.0.0.Beta1</version.dev.snowdrop>
 
         <version.jsoup>1.21.2</version.jsoup>
         <version.snakeyaml>2.5</version.snakeyaml>
diff --git a/build/reports/pom.xml b/build/reports/pom.xml
@@ -284,7 +284,7 @@
             <id>springITs</id>
             <activation>
                 <!-- Hack to activate by default, except when explicitly disabled -->
-                <jdk>[17,25)</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <dependencies>
                 <dependency>
diff --git a/integrationtest/mapper/orm-spring-uberjar/application/src/main/java/org/hibernate/search/integrationtest/spring/repackaged/application/Application.java b/integrationtest/mapper/orm-spring-uberjar/application/src/main/java/org/hibernate/search/integrationtest/spring/repackaged/application/Application.java
@@ -6,7 +6,7 @@
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 
diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/beanresolution/SpringBeanResolutionIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/beanresolution/SpringBeanResolutionIT.java
@@ -37,10 +37,10 @@
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.boot.hibernate.autoconfigure.HibernatePropertiesCustomizer;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringApplicationConfiguration.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/JtaAndSpringApplicationConfiguration.java
@@ -7,8 +7,8 @@
 import org.hibernate.search.integrationtest.spring.testsupport.AbstractSpringITConfig;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
+import org.springframework.boot.transaction.jta.autoconfigure.JtaAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/outbox/TransactionOutboxIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/outbox/TransactionOutboxIT.java
@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Service;
diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/sessionproxy/SessionProxyIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/sessionproxy/SessionProxyIT.java
@@ -31,7 +31,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Service;
diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/testsupport/AbstractSpringITConfig.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/testsupport/AbstractSpringITConfig.java
@@ -13,9 +13,9 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer;
-import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.boot.hibernate.autoconfigure.HibernatePropertiesCustomizer;
+import org.springframework.boot.transaction.jta.autoconfigure.JtaAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.EventListener;
diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/transaction/TransactionIT.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/transaction/TransactionIT.java
@@ -18,7 +18,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
@@ -48,7 +48,7 @@
             <id>springITs</id>
             <activation>
                 <!-- Hack to activate by default, except when explicitly disabled -->
-                <jdk>[17,25)</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <modules>
                 <module>mapper/orm-spring</module>
diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchLibraryRepositoryImpl.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/repository/indexsearch/IndexSearchLibraryRepositoryImpl.java
@@ -58,23 +58,12 @@ public List<LibrarySimpleProjection> searchAndProject(String terms, int offset,
 
 	@Override
 	public List<LibrarySimpleProjection> searchAndProjectToMethodLocalClass(String terms, int offset, int limit) {
-		@ProjectionConstructor
-		class LocalClass {
-			public final String name;
-			public final List<LibraryServiceOption> services;
-
-			public LocalClass(String name, List<LibraryServiceOption> services) {
-				this.name = name;
-				this.services = services;
-			}
-		}
-
 		if ( terms == null || terms.isEmpty() ) {
 			return Collections.emptyList();
 		}
 		return Search.session( entityManager )
 				.search( Library.class )
-				.select( LocalClass.class )
+				.select( SearchAndProjectToMethodLocalClass.class )
 				.where( f -> f.match().field( "name" ).matching( terms ) )
 				.sort( f -> f.field( "collectionSize" ).desc()
 						.then().field( "name_sort" ) )
@@ -84,6 +73,17 @@ public LocalClass(String name, List<LibraryServiceOption> services) {
 				.collect( Collectors.toList() );
 	}
 
+	@ProjectionConstructor
+	static class SearchAndProjectToMethodLocalClass {
+		public final String name;
+		public final List<LibraryServiceOption> services;
+
+		public SearchAndProjectToMethodLocalClass(String name, List<LibraryServiceOption> services) {
+			this.name = name;
+			this.services = services;
+		}
+	}
+
 	@Override
 	public LibraryFacetedSearchResult searchFaceted(String terms, Integer minCollectionSize,
 			List<LibraryServiceOption> libraryServices, int offset, int limit) {
diff --git a/lucene-next/integrationtest/pom.xml b/lucene-next/integrationtest/pom.xml
@@ -25,7 +25,7 @@
             <id>springITs</id>
             <activation>
                 <!-- Hack to activate by default, except when explicitly disabled -->
-                <jdk>[17,25)</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <modules>
                 <module>showcase/library</module>
diff --git a/pom.xml b/pom.xml
@@ -1348,18 +1348,6 @@
             </properties>
         </profile>
 
-        <profile>
-            <id>testWithJdk25</id>
-            <activation>
-                <!-- Hack to activate by default, except when explicitly disabled -->
-                <jdk>[25,)</jdk>
-            </activation>
-            <properties>
-                <!-- Spring Boot 3 isn't ready for JDK25 yet -->
-                <failsafe.spring.skip>true</failsafe.spring.skip>
-            </properties>
-        </profile>
-
         <profile>
             <id>testWithJdk26</id>
             <activation>
