Debugging CI failures.

Author: odrotbohm

pom.xml

@@ -84,7 +84,7 @@
 		<lombok.version>1.18.24</lombok.version>
 		<reactor-bom.version>2022.0.0</reactor-bom.version>
 		<slf4j.version>2.0.3</slf4j.version>
-		<spring.version>6.0.0</spring.version>
+		<spring.version>6.0.0-M6</spring.version>
 		<spring-plugin.version>3.0.0</spring-plugin.version>
 		<kotlin.version>1.7.21</kotlin.version>
 		<kotlinx-coroutines.version>1.6.4</kotlinx-coroutines.version>
@@ -848,6 +848,13 @@
 		</plugins>
 	</build>
 
+	<repositories>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
+		</repository>
+	</repositories>
+
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-plugins-release</id>

src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java

@@ -24,6 +24,8 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
@@ -65,14 +67,21 @@
 @EnablePluginRegistries({ LinkDiscoverer.class })
 public class HateoasConfiguration {
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(HateoasConfiguration.class);
+
 	static String I18N_BASE_NAME = "rest-messages";
 	static String I18N_DEFAULTS_BASE_NAME = "rest-default-messages";
 
 	private @Autowired ApplicationContext context;
 
 	@Bean
 	public MessageResolver messageResolver() {
-		return MessageResolver.of(lookupMessageSource());
+
+		var lookupMessageSource = lookupMessageSource();
+
+		LOGGER.error("MessageSource {}", lookupMessageSource);
+
+		return MessageResolver.of(lookupMessageSource);
 	}
 
 	@Bean
@@ -140,6 +149,8 @@ private final AbstractMessageSource lookupMessageSource() {
 			return null;
 		}
 
+		LOGGER.error("Candidates: {}", candidates);
+
 		ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
 		messageSource.setResourceLoader(context);
 		messageSource.setBasename("classpath:".concat(I18N_BASE_NAME));
@@ -170,9 +181,13 @@ private final Properties loadProperties(List<Resource> sources) {
 
 	private final List<Resource> loadResourceBundleResources(String baseName, boolean withWildcard) {
 
+		var location = String.format("classpath:%s%s.properties", baseName, withWildcard ? "*" : "");
+
+		LOGGER.error("Trying to resolve: {}", location);
+
 		try {
 			return Arrays //
-					.stream(context.getResources(String.format("classpath:%s%s.properties", baseName, withWildcard ? "*" : ""))) //
+					.stream(context.getResources(location)) //
 					.filter(Resource::exists) //
 					.collect(Collectors.toList());
 

src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java

@@ -305,7 +305,7 @@ void registersNoOpMessageResolverIfMessagesBundleMissing() {
 
 		withServletContext(HateoasConfiguration.class, //
 				context -> {
-					assertThat(context.getBean(MessageResolver.class)).isEqualTo(MessageResolver.of(null));
+					assertThat(context.getBean(MessageResolver.class)).isEqualTo(MessageResolver.DEFAULTS_ONLY);
 				});
 	}