Upgrade to Oracle Database 23.26.2.0.0

Closes gh-50667
This commit is contained in:
Phillip Webb
2026-06-02 14:48:00 -07:00
committed by Dependabot Standalone
parent 3c9af65613
commit 5c88b4453d
4 changed files with 39 additions and 12 deletions
@@ -34,9 +34,11 @@ import com.microsoft.sqlserver.jdbc.SQLServerDataSource;
import com.zaxxer.hikari.HikariDataSource;
import oracle.jdbc.internal.OpaqueString;
import oracle.jdbc.pool.OracleDataSource;
import oracle.ucp.config.PoolPropertiesException;
import oracle.ucp.jdbc.PoolDataSource;
import oracle.ucp.jdbc.PoolDataSourceImpl;
import org.apache.commons.dbcp2.BasicDataSource;
import org.assertj.core.util.introspection.FieldSupport;
import org.h2.Driver;
import org.h2.jdbcx.JdbcDataSource;
import org.jspecify.annotations.Nullable;
@@ -383,8 +385,9 @@ class DataSourceBuilderTests {
.password("secret2")
.build();
assertThat(built.getUser()).isEqualTo("test2");
assertThat(built).extracting("password")
.extracting((opaque) -> ((OpaqueString) opaque).get())
assertThat(built)
.extracting((target) -> FieldSupport.extraction().fieldValue("password", OpaqueString.class, target))
.extracting(OpaqueString::get)
.isEqualTo("secret2");
assertThat(built.getURL()).isEqualTo("example.com");
}
@@ -398,12 +401,19 @@ class DataSourceBuilderTests {
DataSourceBuilder<?> builder = DataSourceBuilder.derivedFrom(dataSource);
PoolDataSource built = (PoolDataSource) builder.username("test2").password("secret2").build();
assertThat(built.getUser()).isEqualTo("test2");
assertThat(built).extracting("password")
.extracting((opaque) -> ((oracle.ucp.util.OpaqueString) opaque).get())
.isEqualTo("secret2");
assertThat(built).extracting(this::getPassword).isEqualTo("secret2");
assertThat(built.getURL()).isEqualTo("example.com");
}
private String getPassword(PoolDataSource target) {
try {
return ((oracle.ucp.util.OpaqueString) target.getPoolProperties().getPoolProperty("password")).get();
}
catch (PoolPropertiesException ex) {
throw new IllegalStateException(ex);
}
}
@Test
void buildWhenDerivedFromEmbeddedDatabase() {
EmbeddedDatabase database = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL).build();
@@ -21,6 +21,7 @@ import java.time.Duration;
import javax.sql.DataSource;
import oracle.ucp.config.PoolPropertiesException;
import oracle.ucp.jdbc.PoolDataSource;
import oracle.ucp.jdbc.PoolDataSourceImpl;
import oracle.ucp.util.OpaqueString;
@@ -123,13 +124,20 @@ class OracleUcpDataSourceConfigurationTests {
assertThat(dataSource).isInstanceOf(PoolDataSourceImpl.class);
PoolDataSourceImpl oracleUcp = (PoolDataSourceImpl) dataSource;
assertThat(oracleUcp.getUser()).isEqualTo("user-1");
assertThat(oracleUcp).extracting("password")
.extracting((o) -> ((OpaqueString) o).get())
.isEqualTo("password-1");
assertThat(oracleUcp).extracting(this::getPassword).isEqualTo("password-1");
assertThat(oracleUcp.getConnectionFactoryClassName())
.isEqualTo(DatabaseDriver.POSTGRESQL.getDriverClassName());
assertThat(oracleUcp.getURL()).isEqualTo("jdbc:customdb://customdb.example.com:12345/database-1");
});
}
private String getPassword(PoolDataSource target) {
try {
return ((OpaqueString) target.getPoolProperties().getPoolProperty("password")).get();
}
catch (PoolPropertiesException ex) {
throw new IllegalStateException(ex);
}
}
}
@@ -18,6 +18,8 @@ package org.springframework.boot.jdbc.autoconfigure;
import java.sql.SQLException;
import oracle.ucp.config.PoolPropertiesException;
import oracle.ucp.jdbc.PoolDataSource;
import oracle.ucp.jdbc.PoolDataSourceImpl;
import oracle.ucp.util.OpaqueString;
import org.junit.jupiter.api.Test;
@@ -49,11 +51,18 @@ class OracleUcpJdbcConnectionDetailsBeanPostProcessorTests {
new TestJdbcConnectionDetails());
assertThat(dataSource.getURL()).isEqualTo("jdbc:customdb://customdb.example.com:12345/database-1");
assertThat(dataSource.getUser()).isEqualTo("user-1");
assertThat(dataSource).extracting("password")
.extracting((password) -> ((OpaqueString) password).get())
.isEqualTo("password-1");
assertThat(dataSource).extracting(this::getPassword).isEqualTo("password-1");
assertThat(dataSource.getConnectionFactoryClassName())
.isEqualTo(DatabaseDriver.POSTGRESQL.getDriverClassName());
}
private String getPassword(PoolDataSource target) {
try {
return ((OpaqueString) target.getPoolProperties().getPoolProperty("password")).get();
}
catch (PoolPropertiesException ex) {
throw new IllegalStateException(ex);
}
}
}
@@ -1791,7 +1791,7 @@ bom {
releaseNotes("https://github.com/open-telemetry/opentelemetry-java/releases/tag/v{version}")
}
}
library("Oracle Database", "23.26.1.0.0") {
library("Oracle Database", "23.26.2.0.0") {
alignWith {
dependencyManagementDeclaredIn("com.oracle.database.jdbc:ojdbc-bom")
}