Skip to content

Commit

Permalink
Downgrade to production-ready version of Oracle Database
Browse files Browse the repository at this point in the history
This reverts commit d2325d1.

Closes gh-38943
  • Loading branch information
wilkinsona committed Jan 17, 2024
1 parent b890515 commit fee359f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -17,7 +17,6 @@
package org.springframework.boot.autoconfigure.jdbc;

import java.sql.Connection;
import java.time.Duration;

import javax.sql.DataSource;

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-project/spring-boot-dependencies/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
imports = [
"ojdbc-bom"
Expand Down

0 comments on commit fee359f

Please sign in to comment.