Add Spring Boot 3.4 Support

This commit will conditionally use DynamicPropertyRegistrar so as to
support Spring Boot 3.4

See https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes#dynamic-properties-with-testcontainers

Closes gh-49

Author: rwinch

samples/oauth2-login-custom-config/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.2.2'
+    id 'org.springframework.boot' version '3.4.0'
     id 'io.spring.dependency-management' version '1.1.2'
 }
 

samples/oauth2-login/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.2.2'
+    id 'org.springframework.boot' version '3.4.0'
     id 'io.spring.dependency-management' version '1.1.2'
 }
 

spring-boot-testjars/build.gradle

@@ -39,7 +39,7 @@ dependencies {
 	mavenImplementation "org.apache.maven.resolver:maven-resolver-transport-file:${mavenResolverVersion}"
 	mavenImplementation "org.apache.maven.resolver:maven-resolver-transport-http:${mavenResolverVersion}"
 	mavenImplementation "org.apache.maven.resolver:maven-resolver-supplier:${mavenResolverVersion}"
-	implementation platform('org.springframework.boot:spring-boot-dependencies:3.2.2')
+	implementation platform('org.springframework.boot:spring-boot-dependencies:3.4.0')
 	implementation 'org.apache.commons:commons-exec:1.3'
 	implementation 'org.springframework:spring-test'
 	implementation 'org.springframework.boot:spring-boot-testcontainers'

spring-boot-testjars/src/main/java/org/springframework/experimental/boot/test/context/DynamicPropertyDefinitionRegistrar.java

@@ -16,18 +16,24 @@
 
 package org.springframework.experimental.boot.test.context;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.boot.testcontainers.properties.TestcontainersPropertySource;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.MethodMetadata;
+import org.springframework.test.context.DynamicPropertyRegistrar;
 import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.util.ClassUtils;
 
 /**
  * Finds beans annotated with {@link DynamicProperty} and adds the properties to the
@@ -52,11 +58,39 @@ class DynamicPropertyDefinitionRegistrar implements ImportBeanDefinitionRegistra
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 		if (this.beanFactory instanceof ConfigurableListableBeanFactory listableBeanFactory) {
-			registerBeanDefinitions(listableBeanFactory, registry);
+			if (ClassUtils.isPresent("org.springframework.test.context.DynamicPropertyRegistrar",
+					getClass().getClassLoader())) {
+				registerDynamicPropertyRegistrar(listableBeanFactory, registry);
+			}
+			else {
+				registerTestcontainersPropertySource(listableBeanFactory, registry);
+			}
+		}
+	}
+
+	private void registerDynamicPropertyRegistrar(ConfigurableListableBeanFactory beanFactory,
+			BeanDefinitionRegistry registry) {
+		List<DynamicPropertyRegistryProperty> properties = new ArrayList<>();
+		for (String dynamicPropertyBeanName : beanFactory.getBeanNamesForAnnotation(DynamicProperty.class)) {
+			BeanDefinition dynamicPropertyBeanDefinition = registry.getBeanDefinition(dynamicPropertyBeanName);
+			DynamicPropertyRegistryProperty property = createRegistryProperty(dynamicPropertyBeanDefinition,
+					dynamicPropertyBeanName);
+			if (property == null) {
+				throw new IllegalStateException(
+						"Missing @DynamicProperty annotation on BeanDefinition of " + dynamicPropertyBeanName);
+			}
+			properties.add(property);
 		}
+
+		BeanDefinitionBuilder registrarBdb = BeanDefinitionBuilder
+				.rootBeanDefinition(DynamicPropertyRegistryPropertyRegistrar.class);
+		registrarBdb.addConstructorArgValue(properties);
+		registry.registerBeanDefinition("testjarsDynamicPropertyRegistryPropertyRegistrar",
+				registrarBdb.getBeanDefinition());
 	}
 
-	private void registerBeanDefinitions(ConfigurableListableBeanFactory beanFactory, BeanDefinitionRegistry registry) {
+	private void registerTestcontainersPropertySource(ConfigurableListableBeanFactory beanFactory,
+			BeanDefinitionRegistry registry) {
 		DynamicPropertyRegistry properties = TestcontainersPropertySource.attach(this.environment);
 		for (String dynamicPropertyBeanName : beanFactory.getBeanNamesForAnnotation(DynamicProperty.class)) {
 			BeanDefinition dynamicPropertyBeanDefinition = registry.getBeanDefinition(dynamicPropertyBeanName);
@@ -82,4 +116,21 @@ private DynamicPropertyRegistryProperty createRegistryProperty(BeanDefinition dy
 		return null;
 	}
 
+	static class DynamicPropertyRegistryPropertyRegistrar implements DynamicPropertyRegistrar {
+
+		private final List<DynamicPropertyRegistryProperty> properties;
+
+		DynamicPropertyRegistryPropertyRegistrar(List<DynamicPropertyRegistryProperty> properties) {
+			this.properties = properties;
+		}
+
+		@Override
+		public void accept(DynamicPropertyRegistry registry) {
+			for (DynamicPropertyRegistryProperty property : this.properties) {
+				registry.add(property.name(), property.value());
+			}
+		}
+
+	}
+
 }