From d2325d111091122478200436a8b9e9dc98eeec59 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 30 Oct 2023 18:16:12 +0000 Subject: [PATCH] Upgrade to Oracle Database 23.3.0.23.09 Closes gh-38121 --- .../jdbc/OracleUcpDataSourceConfigurationTests.java | 5 +++-- spring-boot-project/spring-boot-dependencies/build.gradle | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java index 2343745409..971ab21d37 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java @@ -17,6 +17,7 @@ package org.springframework.boot.autoconfigure.jdbc; import java.sql.Connection; +import java.time.Duration; import javax.sql.DataSource; @@ -82,10 +83,10 @@ class OracleUcpDataSourceConfigurationTests { this.contextRunner.run((context) -> { PoolDataSourceImpl ds = context.getBean(PoolDataSourceImpl.class); assertThat(ds.getInitialPoolSize()).isZero(); - assertThat(ds.getMinPoolSize()).isZero(); + assertThat(ds.getMinPoolSize()).isEqualTo(1); assertThat(ds.getMaxPoolSize()).isEqualTo(Integer.MAX_VALUE); assertThat(ds.getInactiveConnectionTimeout()).isZero(); - assertThat(ds.getConnectionWaitTimeout()).isEqualTo(3); + assertThat(ds.getConnectionWaitDuration()).isEqualTo(Duration.ofSeconds(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 index 2ec3c3e862..d3fda6d3b6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1093,10 +1093,7 @@ bom { ] } } - library("Oracle Database", "21.9.0.0") { - prohibit { - versionRange "23.2.0.0" - } + library("Oracle Database", "23.3.0.23.09") { group("com.oracle.database.jdbc") { imports = [ "ojdbc-bom"