Downgrade to production-ready version of Oracle Database

This reverts commit d2325d1110.

Closes gh-38943
This commit is contained in:
Andy Wilkinson 2024-01-17 20:11:59 +00:00
parent b890515ce1
commit fee359ff5e
2 changed files with 4 additions and 5 deletions

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,7 +17,6 @@
package org.springframework.boot.autoconfigure.jdbc; package org.springframework.boot.autoconfigure.jdbc;
import java.sql.Connection; import java.sql.Connection;
import java.time.Duration;
import javax.sql.DataSource; import javax.sql.DataSource;
@ -83,10 +82,10 @@ class OracleUcpDataSourceConfigurationTests {
this.contextRunner.run((context) -> { this.contextRunner.run((context) -> {
PoolDataSourceImpl ds = context.getBean(PoolDataSourceImpl.class); PoolDataSourceImpl ds = context.getBean(PoolDataSourceImpl.class);
assertThat(ds.getInitialPoolSize()).isZero(); assertThat(ds.getInitialPoolSize()).isZero();
assertThat(ds.getMinPoolSize()).isEqualTo(1); assertThat(ds.getMinPoolSize()).isZero();
assertThat(ds.getMaxPoolSize()).isEqualTo(Integer.MAX_VALUE); assertThat(ds.getMaxPoolSize()).isEqualTo(Integer.MAX_VALUE);
assertThat(ds.getInactiveConnectionTimeout()).isZero(); assertThat(ds.getInactiveConnectionTimeout()).isZero();
assertThat(ds.getConnectionWaitDuration()).isEqualTo(Duration.ofSeconds(3)); assertThat(ds.getConnectionWaitTimeout()).isEqualTo(3);
assertThat(ds.getTimeToLiveConnectionTimeout()).isZero(); assertThat(ds.getTimeToLiveConnectionTimeout()).isZero();
assertThat(ds.getAbandonedConnectionTimeout()).isZero(); assertThat(ds.getAbandonedConnectionTimeout()).isZero();
assertThat(ds.getTimeoutCheckInterval()).isEqualTo(30); assertThat(ds.getTimeoutCheckInterval()).isEqualTo(30);

View File

@ -1106,7 +1106,7 @@ bom {
] ]
} }
} }
library("Oracle Database", "23.3.0.23.09") { library("Oracle Database", "21.9.0.0") {
group("com.oracle.database.jdbc") { group("com.oracle.database.jdbc") {
imports = [ imports = [
"ojdbc-bom" "ojdbc-bom"