fix(deps): update managed.ojdbc to v23 (major) (#949)

* fix(deps): update managed.ojdbc to v23 * DataSource. connectionWaitTimeout is deprecated, use connectionWaitDuration * Removed comment as latest ojdbc version is not causing errors anymore * Trigger build --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: radovanradic <[email protected]>
micronaut-projects · Dec 6, 2023 · 8acfda9 · 8acfda9
1 parent da5d4c0
commit 8acfda9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -30,7 +30,7 @@ managed-jdbi = "3.42.0"
 
 # JDBC Drivers
 
-managed-ojdbc = "21.11.0.0" # Don't change until the issue described on the following link gets fixed: https://github.com/spring-projects/spring-boot/issues/35006
+managed-ojdbc = "23.3.0.23.09"
 managed-ojdbcdms = "21.11.0.0"
 managed-postgres-driver = "42.7.0"
 managed-mariadb-driver = "3.3.1"

diff --git a/...cp/src/test/groovy/io/micronaut/configuration/jdbc/ucp/DatasourceConfigurationSpec.groovy b/...cp/src/test/groovy/io/micronaut/configuration/jdbc/ucp/DatasourceConfigurationSpec.groovy
@@ -24,6 +24,8 @@ import oracle.ucp.jdbc.PoolDataSource
 import spock.lang.Specification
 
 import javax.sql.DataSource
+import java.time.Duration
+import java.time.temporal.ChronoUnit
 
 class DatasourceConfigurationSpec extends Specification {
 
@@ -113,7 +115,7 @@ class DatasourceConfigurationSpec extends Specification {
                         'datasources.default.maxPoolSize'              : 20,
                         'datasources.default.timeoutCheckInterval'     : 5,
                         'datasources.default.inactiveConnectionTimeout': 10,
-                        'datasources.default.connectionWaitTimeout'    : 10,
+                        'datasources.default.connectionWaitDuration'   : '10s',
                         'datasources.default.loginTimeout'             : 20,
                 ]
         ))
@@ -133,7 +135,7 @@ class DatasourceConfigurationSpec extends Specification {
         dataSource.getMaxPoolSize() == 20
         dataSource.getTimeoutCheckInterval() == 5
         dataSource.getInactiveConnectionTimeout() == 10
-        dataSource.getConnectionWaitTimeout() == 10
+        dataSource.getConnectionWaitDuration() == Duration.of(10, ChronoUnit.SECONDS)
         dataSource.getLoginTimeout() == 20
 
         cleanup:
@@ -194,15 +196,15 @@ class DatasourceConfigurationSpec extends Specification {
                         'datasources.default.maxPoolSize'              : 20,
                         'datasources.default.timeoutCheckInterval'     : 5,
                         'datasources.default.inactiveConnectionTimeout': 10,
-                        'datasources.default.connectionWaitTimeout'    : 10,
+                        'datasources.default.connectionWaitDuration'   : '10s',
                         'datasources.default.loginTimeout'             : 20,
 
                         'datasources.person.initialPoolSize'           : 5,
                         'datasources.person.minPoolSize'               : 5,
                         'datasources.person.maxPoolSize'               : 20,
                         'datasources.person.timeoutCheckInterval'      : 5,
                         'datasources.person.inactiveConnectionTimeout' : 10,
-                        'datasources.person.connectionWaitTimeout'     : 10,
+                        'datasources.person.connectionWaitDuration'    : '10s',
                         'datasources.person.loginTimeout'              : 20,
                 ]
         ))
@@ -222,7 +224,7 @@ class DatasourceConfigurationSpec extends Specification {
         dataSource.getMaxPoolSize() == 20
         dataSource.getTimeoutCheckInterval() == 5
         dataSource.getInactiveConnectionTimeout() == 10
-        dataSource.getConnectionWaitTimeout() == 10
+        dataSource.getConnectionWaitDuration() == Duration.of(10, ChronoUnit.SECONDS)
         dataSource.getLoginTimeout() == 20
 
         when:
@@ -234,7 +236,7 @@ class DatasourceConfigurationSpec extends Specification {
         dataSource.getMaxPoolSize() == 20
         dataSource.getTimeoutCheckInterval() == 5
         dataSource.getInactiveConnectionTimeout() == 10
-        dataSource.getConnectionWaitTimeout() == 10
+        dataSource.getConnectionWaitDuration() == Duration.of(10, ChronoUnit.SECONDS)
         dataSource.getLoginTimeout() == 20
 
         cleanup:
@@ -253,15 +255,15 @@ class DatasourceConfigurationSpec extends Specification {
                         'datasources.default.maxPoolSize'              : 20,
                         'datasources.default.timeoutCheckInterval'     : 5,
                         'datasources.default.inactiveConnectionTimeout': 10,
-                        'datasources.default.connectionWaitTimeout'    : 10,
+                        'datasources.default.connectionWaitDuration'   : '10s',
                         'datasources.default.loginTimeout'             : 20,
 
                         'datasources.person.initialPoolSize'           : 5,
                         'datasources.person.minPoolSize'               : 5,
                         'datasources.person.maxPoolSize'               : 20,
                         'datasources.person.timeoutCheckInterval'      : 5,
                         'datasources.person.inactiveConnectionTimeout' : 10,
-                        'datasources.person.connectionWaitTimeout'     : 10,
+                        'datasources.person.connectionWaitDuration'    : '10s',
                         'datasources.person.loginTimeout'              : 20,
                 ]
         ))
@@ -290,15 +292,15 @@ class DatasourceConfigurationSpec extends Specification {
                         'datasources.default.maxPoolSize'              : 20,
                         'datasources.default.timeoutCheckInterval'     : 5,
                         'datasources.default.inactiveConnectionTimeout': 10,
-                        'datasources.default.connectionWaitTimeout'    : 10,
+                        'datasources.default.connectionWaitDuration'   : '10s',
                         'datasources.default.loginTimeout'             : 20,
 
                         'datasources.person.initialPoolSize'           : 5,
                         'datasources.person.minPoolSize'               : 5,
                         'datasources.person.maxPoolSize'               : 20,
                         'datasources.person.timeoutCheckInterval'      : 5,
                         'datasources.person.inactiveConnectionTimeout' : 10,
-                        'datasources.person.connectionWaitTimeout'     : 10,
+                        'datasources.person.connectionWaitDuration'    : '10s',
                         'datasources.person.loginTimeout'              : 20,
                 ]
         ))