Merge branch '3.2.x'

Closes gh-39225
spring-projects · Jan 17, 2024 · 257df22 · 257df22
2 parents eeb5081 + fee359f
commit 257df22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...va/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java b/...va/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package org.springframework.boot.autoconfigure.jdbc;
 
 import java.sql.Connection;
-import java.time.Duration;
 
 import javax.sql.DataSource;
 
@@ -83,10 +82,10 @@ void testDataSourceDefaultsPreserved() {
 		this.contextRunner.run((context) -> {
 			PoolDataSourceImpl ds = context.getBean(PoolDataSourceImpl.class);
 			assertThat(ds.getInitialPoolSize()).isZero();
-			assertThat(ds.getMinPoolSize()).isEqualTo(1);
+			assertThat(ds.getMinPoolSize()).isZero();
 			assertThat(ds.getMaxPoolSize()).isEqualTo(Integer.MAX_VALUE);
 			assertThat(ds.getInactiveConnectionTimeout()).isZero();
-			assertThat(ds.getConnectionWaitDuration()).isEqualTo(Duration.ofSeconds(3));
+			assertThat(ds.getConnectionWaitTimeout()).isEqualTo(3);
 			assertThat(ds.getTimeToLiveConnectionTimeout()).isZero();
 			assertThat(ds.getAbandonedConnectionTimeout()).isZero();
 			assertThat(ds.getTimeoutCheckInterval()).isEqualTo(30);

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1107,7 +1107,7 @@ bom {
 			]
 		}
 	}
-	library("Oracle Database", "23.3.0.23.09") {
+	library("Oracle Database", "21.9.0.0") {
 		group("com.oracle.database.jdbc") {
 			imports = [
 				"ojdbc-bom"