HSEARCH-5094 Upgrade to hibernate-search-develocity-extension 1.0.7.F…

…inal Correct handling of the "container" directory holding dockerfiles. Caching of Spring repackaged ITs.
hibernate · Mar 1, 2024 · 34644be · 34644be
1 parent f221b40
commit 34644be
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -12,6 +12,6 @@
     <extension>
         <groupId>org.hibernate.search.develocity</groupId>
         <artifactId>hibernate-search-develocity-extension</artifactId>
-        <version>1.0.6.Final</version>
+        <version>1.0.7.Final</version>
     </extension>
 </extensions>
diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml
@@ -1229,7 +1229,7 @@
                             <org.hibernate.search.integrationtest.backend.elasticsearch.distribution>${test.elasticsearch.distribution}</org.hibernate.search.integrationtest.backend.elasticsearch.distribution>
                             <org.hibernate.search.integrationtest.backend.elasticsearch.version>${test.elasticsearch.version}</org.hibernate.search.integrationtest.backend.elasticsearch.version>
                             <org.hibernate.search.integrationtest.orm.database.kind>${test.database.run.kind}</org.hibernate.search.integrationtest.orm.database.kind>
-                            <org.hibernate.search.integrationtest.project.root.directory>${rootProject.directory}</org.hibernate.search.integrationtest.project.root.directory>
+                            <org.hibernate.search.integrationtest.container.directory>${rootProject.directory}/build/container</org.hibernate.search.integrationtest.container.directory>
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>

diff --git a/integrationtest/mapper/orm-spring-uberjar/application/pom.xml b/integrationtest/mapper/orm-spring-uberjar/application/pom.xml
@@ -91,6 +91,9 @@
                     <mainClass>
                         org.hibernate.search.integrationtest.spring.repackaged.application.Application
                     </mainClass>
+                    <!-- Not critical here as it's just for tests.
+                         This hardcoded value allows us to cache integration tests in Develocity. -->
+                    <outputTimestamp>2017-11-06T19:19:00+01:00</outputTimestamp>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/...ernate/search/util/impl/integrationtest/backend/elasticsearch/SearchBackendContainer.java b/...ernate/search/util/impl/integrationtest/backend/elasticsearch/SearchBackendContainer.java
@@ -31,11 +31,11 @@ private SearchBackendContainer() {
 		ElasticsearchDistributionName distributionName = ElasticsearchDistributionName
 				.of( System.getProperty( "org.hibernate.search.integrationtest.backend.elasticsearch.distribution", "" ) );
 		String tag = System.getProperty( "org.hibernate.search.integrationtest.backend.elasticsearch.version" );
-		Path root = Path.of( System.getProperty( "org.hibernate.search.integrationtest.project.root.directory", "" ) );
+		Path containers = Path.of( System.getProperty( "org.hibernate.search.integrationtest.container.directory", "" ) );
 
 		try {
-			DockerImageName dockerImageName = parseDockerImageName( root.resolve( "build" ).resolve( "container" )
-					.resolve( "search-backend" ).resolve( distributionName.externalRepresentation() + ".Dockerfile" ), tag );
+			DockerImageName dockerImageName = parseDockerImageName( containers.resolve( "search-backend" )
+					.resolve( distributionName.externalRepresentation() + ".Dockerfile" ), tag );
 			switch ( distributionName ) {
 				case ELASTIC:
 					SEARCH_CONTAINER = elasticsearch( dockerImageName );
@@ -50,7 +50,9 @@ private SearchBackendContainer() {
 		}
 		catch (IOException e) {
 			throw new IllegalStateException(
-					"Unable to initialize a Search Engine container [" + distributionName + ", " + tag + ", " + root + "]", e );
+					"Unable to initialize a Search Engine container [" + distributionName + ", " + tag + ", " + containers
+							+ "]",
+					e );
 		}
 	}
 

diff --git a/...ain/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/DatabaseContainer.java b/...ain/java/org/hibernate/search/util/impl/integrationtest/mapper/orm/DatabaseContainer.java
@@ -46,11 +46,11 @@ private DatabaseContainer() {
 
 	static {
 		String name = System.getProperty( "org.hibernate.search.integrationtest.orm.database.kind", "" );
-		Path root = Path.of( System.getProperty( "org.hibernate.search.integrationtest.project.root.directory", "" ) );
+		Path containers = Path.of( System.getProperty( "org.hibernate.search.integrationtest.container.directory", "" ) );
 		DATABASE = SupportedDatabase.from( name );
 
 		DATABASE_CONTAINER = DATABASE.container(
-				root.resolve( "build" ).resolve( "container" ).resolve( "database" ).resolve( name + ".Dockerfile" ),
+				containers.resolve( "database" ).resolve( name + ".Dockerfile" ),
 				name
 		);
 	}