Skip to content

Commit fee359f

Browse files
committed
Downgrade to production-ready version of Oracle Database
This reverts commit d2325d1. Closes gh-38943
1 parent b890515 commit fee359f

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/OracleUcpDataSourceConfigurationTests.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
1717
package org.springframework.boot.autoconfigure.jdbc;
1818

1919
import java.sql.Connection;
20-
import java.time.Duration;
2120

2221
import javax.sql.DataSource;
2322

@@ -83,10 +82,10 @@ void testDataSourceDefaultsPreserved() {
8382
this.contextRunner.run((context) -> {
8483
PoolDataSourceImpl ds = context.getBean(PoolDataSourceImpl.class);
8584
assertThat(ds.getInitialPoolSize()).isZero();
86-
assertThat(ds.getMinPoolSize()).isEqualTo(1);
85+
assertThat(ds.getMinPoolSize()).isZero();
8786
assertThat(ds.getMaxPoolSize()).isEqualTo(Integer.MAX_VALUE);
8887
assertThat(ds.getInactiveConnectionTimeout()).isZero();
89-
assertThat(ds.getConnectionWaitDuration()).isEqualTo(Duration.ofSeconds(3));
88+
assertThat(ds.getConnectionWaitTimeout()).isEqualTo(3);
9089
assertThat(ds.getTimeToLiveConnectionTimeout()).isZero();
9190
assertThat(ds.getAbandonedConnectionTimeout()).isZero();
9291
assertThat(ds.getTimeoutCheckInterval()).isEqualTo(30);

spring-boot-project/spring-boot-dependencies/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ bom {
11061106
]
11071107
}
11081108
}
1109-
library("Oracle Database", "23.3.0.23.09") {
1109+
library("Oracle Database", "21.9.0.0") {
11101110
group("com.oracle.database.jdbc") {
11111111
imports = [
11121112
"ojdbc-bom"

0 commit comments

Comments
 (0)