Merge branch 'main' into 4.0.x

Author: philwebb

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilder.java

@@ -46,7 +46,7 @@ public class ConnectionFactoryOptionsBuilder {
 
 	/**
 	 * Create a new {@link ConnectionFactoryOptionsBuilder} instance.
-	 * @param driver the driver protocol
+	 * @param driver the driver
 	 * @param containerPort the source container port
 	 */
 	public ConnectionFactoryOptionsBuilder(String driver, int containerPort) {

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilderTests.java

@@ -45,7 +45,11 @@ class ConnectionFactoryOptionsBuilderTests {
 	@Test
 	void createWhenDriverProtocolIsNullThrowsException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ConnectionFactoryOptionsBuilder(null, 123))
+<<<<<<< HEAD
 			.withMessage("'driverProtocol' must not be null");
+=======
+			.withMessage("Driver must not be null");
+>>>>>>> 3.4.x
 	}
 
 	@Test