Skip to content

Commit 92e598e

Browse files
beikovbeikov
committed
HHH-18877 Switch to ojdbc17 version 23.6.0.24.10
1 parent 1fe23ae commit 92e598e

File tree

10 files changed

+18
-15
lines changed

10 files changed

+18
-15
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,9 @@ jobs:
216216
RUNID: ${{ github.run_number }}
217217
# These runners have no HOME variable set by default, we need to explicitly set it to make the build work
218218
HOME: /root
219+
# Needed fot TFO (TCP fast open)
220+
LD_PRELOAD: /home/opc/libtfojdbc1.so
221+
LD_LIBRARY_PATH: /home/opc
219222
run: ./ci/build-github.sh
220223
shell: bash
221224
# Upload build scan data.

‎databases/oracle/matrix.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
66
*/
77
// Do not forget to update settings.gradle as well
8-
jdbcDependency 'com.oracle.database.jdbc:ojdbc11:23.3.0.23.09'
8+
jdbcDependency 'com.oracle.database.jdbc:ojdbc17:23.6.0.24.10'

‎docker_db.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ oracle_atps() {
675675
export SERVICE=$(echo $INFO | jq -r '.database' | jq -r '.service')
676676
export PASSWORD=$(echo $INFO | jq -r '.database' | jq -r '.password')
677677

678-
curl -k -s -X POST "https://${HOST}.oraclevcn.com:8443/ords/admin/_/sql" -H 'content-type: application/sql' -H 'accept: application/json' -basic -u admin:${PASSWORD} --data-ascii "create user hibernate_orm_test_$RUNID identified by \"Oracle_19_Password\" DEFAULT TABLESPACE DATA TEMPORARY TABLESPACE TEMP;alter user hibernate_orm_test_$RUNID quota unlimited on data;grant CREATE SESSION, RESOURCE, CREATE VIEW, CREATE SYNONYM, CREATE ANY INDEX, EXECUTE ANY TYPE to hibernate_orm_test_$RUNID;"
678+
curl -k -s -X POST "https://${HOST}.oraclecloudapps.com/ords/admin/_/sql" -H 'content-type: application/sql' -H 'accept: application/json' -basic -u admin:${PASSWORD} --data-ascii "create user hibernate_orm_test_$RUNID identified by \"Oracle_19_Password\" DEFAULT TABLESPACE DATA TEMPORARY TABLESPACE TEMP;alter user hibernate_orm_test_$RUNID quota unlimited on data;grant CREATE SESSION, RESOURCE, CREATE VIEW, CREATE SYNONYM, CREATE ANY INDEX, EXECUTE ANY TYPE to hibernate_orm_test_$RUNID;"
679679
}
680680

681681
oracle_atps_tls() {

‎documentation/src/main/asciidoc/introduction/Configuration.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ driver for your database.
6969
| MariaDB | `org.mariadb.jdbc:mariadb-java-client:{version}`
7070
| DB2 | `com.ibm.db2:jcc:{version}`
7171
| SQL Server | `com.microsoft.sqlserver:mssql-jdbc:{version}`
72-
| Oracle | `com.oracle.database.jdbc:ojdbc11:{version}`
72+
| Oracle | `com.oracle.database.jdbc:ojdbc17:{version}`
7373
| H2 | `com.h2database:h2:{version}`
7474
| HSQLDB | `org.hsqldb:hsqldb:{version}`
7575
|===

‎documentation/src/main/asciidoc/repositories/Configuration.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ And we'll need to pick a JDBC driver:
3333
| MariaDB | `org.mariadb.jdbc:mariadb-java-client`
3434
| DB2 | `com.ibm.db2:jcc`
3535
| SQL Server | `com.microsoft.sqlserver:mssql-jdbc`
36-
| Oracle | `com.oracle.database.jdbc:ojdbc11`
36+
| Oracle | `com.oracle.database.jdbc:ojdbc17`
3737
| H2 | `com.h2database:h2`
3838
| HSQLDB | `org.hsqldb:hsqldb`
3939
|===

‎gradle/databases.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ ext {
210210
//
211211
// To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
212212
// https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
213-
'jdbc.url' : 'jdbc:oracle:thin:@(description=(retry_count=5)(retry_delay=1)(address=(protocol=tcps)(port=1521)(host=' + dbHost + '.oraclecloud.com))(connect_data=(service_name=' + dbService + '_tp.adb.oraclecloud.com))(security=(ssl_server_dn_match=no)))?oracle.jdbc.enableQueryResultCache=false&oracle.jdbc.thinForceDNSLoadBalancing=true&tcp.nodelay=yes',
213+
'jdbc.url' : 'jdbc:oracle:thin:@(description=(retry_count=5)(retry_delay=1)(address=(protocol=tcps)(port=1521)(host=' + dbHost + '.oraclecloud.com))(connect_data=(USE_TCP_FAST_OPEN=ON)(service_name=' + dbService + '_tp.adb.oraclecloud.com))(security=(ssl_server_dn_match=no)))?oracle.jdbc.enableQueryResultCache=false&oracle.jdbc.thinForceDNSLoadBalancing=true&tcp.nodelay=yes',
214214
'jdbc.datasource' : 'oracle.jdbc.OracleDriver',
215215
// 'jdbc.datasource' : 'oracle.jdbc.datasource.impl.OracleDataSource',
216216
'connection.init_sql' : ''
@@ -223,7 +223,7 @@ ext {
223223
// Requires dbHost (pointing to the right cloud region) AND dbService (unique database name).
224224
// To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
225225
// https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
226-
'jdbc.url' : 'jdbc:oracle:thin:@(description=(retry_count=5)(retry_delay=1)(address=(protocol=tcp)(port=1521)(host=' + dbHost + '.oraclevcn.com))(connect_data=(service_name=' + dbService + '_tp.adb.oraclecloud.com))(security=(ssl_server_dn_match=no)))?oracle.jdbc.enableQueryResultCache=false&oracle.jdbc.thinForceDNSLoadBalancing=true&tcp.nodelay=yes',
226+
'jdbc.url' : 'jdbc:oracle:thin:@(description=(retry_count=5)(retry_delay=1)(address=(protocol=tcp)(port=1521)(host=' + dbHost + '.oraclevcn.com))(connect_data=(USE_TCP_FAST_OPEN=ON)(service_name=' + dbService + '_tp.adb.oraclecloud.com))(security=(ssl_server_dn_match=no)))?oracle.jdbc.enableQueryResultCache=false&oracle.jdbc.thinForceDNSLoadBalancing=true&tcp.nodelay=yes',
227227
'jdbc.datasource' : 'oracle.jdbc.OracleDriver',
228228
// 'jdbc.datasource' : 'oracle.jdbc.datasource.impl.OracleDataSource',
229229
'connection.init_sql' : ''

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ public class OracleLegacyDialect extends Dialect {
179179
@Override
180180
protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
181181
final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
182-
if ( dialect.getVersion().isBefore( 23, 6 ) && jdbcType.isXml() ) {
183-
// ORA-00600 when selecting XML columns that have a check constraint was fixed in 23.6
182+
if ( dialect.getVersion().isBefore( 23, 7 ) && jdbcType.isXml() ) {
183+
// ORA-00600 when selecting XML columns that have a check constraint was fixed in 23.7
184184
return;
185185
}
186186
super.applyAggregateColumnCheck( buf, aggregateColumn );

‎hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ public class OracleDialect extends Dialect {
188188
@Override
189189
protected void applyAggregateColumnCheck(StringBuilder buf, AggregateColumn aggregateColumn) {
190190
final JdbcType jdbcType = aggregateColumn.getType().getJdbcType();
191-
if ( dialect.getVersion().isBefore( 23, 6 ) && jdbcType.isXml() ) {
192-
// ORA-00600 when selecting XML columns that have a check constraint was fixed in 23.6
191+
if ( dialect.getVersion().isBefore( 23, 7 ) && jdbcType.isXml() ) {
192+
// ORA-00600 when selecting XML columns that have a check constraint was fixed in 23.7
193193
return;
194194
}
195195
super.applyAggregateColumnCheck( buf, aggregateColumn );

‎hibernate-ucp/hibernate-ucp.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ apply from: rootProject.file( 'gradle/relocated-published-java-module.gradle' )
1212
dependencies {
1313
implementation project( ':hibernate-core' )
1414
implementation libs.ucp
15-
implementation libs.ojdbc11
15+
implementation libs.ojdbc17
1616

1717
testImplementation project( ':hibernate-testing' )
1818
}

‎settings.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ dependencyResolutionManagement {
8989
def hikaricpVersion = version "hikaricp", "3.2.0"
9090
def proxoolVersion = version "proxool", "0.8.3"
9191
def viburVersion = version "vibur", "25.0"
92-
def ucpVersion = version "ucp", "23.4.0.24.05"
92+
def ucpVersion = version "ucp", "23.6.0.24.10"
9393

9494
def jcacheVersion = version "jcache", "1.0.0"
9595
def ehcache3Version = version "ehcache3", "3.10.8"
@@ -126,7 +126,7 @@ dependencyResolutionManagement {
126126
library( "vibur", "org.vibur", "vibur-dbcp" ).versionRef( viburVersion )
127127
library( "ucp", "com.oracle.database.jdbc", "ucp11" ).versionRef( ucpVersion )
128128

129-
library( "ojdbc11", "com.oracle.database.jdbc", "ojdbc11" ).versionRef( ucpVersion )
129+
library( "ojdbc17", "com.oracle.database.jdbc", "ojdbc17" ).versionRef( ucpVersion )
130130

131131
library( "geolatte", "org.geolatte", "geolatte-geom" ).versionRef( geolatteVersion )
132132

@@ -240,7 +240,7 @@ dependencyResolutionManagement {
240240
def mariadbVersion = version "mariadb", "3.4.0"
241241
def mssqlVersion = version "mssql", "12.4.2.jre11"
242242
def mysqlVersion = version "mysql", "8.2.0"
243-
def oracleVersion = version "oracle", "23.4.0.24.05"
243+
def oracleVersion = version "oracle", "23.6.0.24.10"
244244
def oracleLegacyVersion = version "oracleLegacy", "11.2.0.4"
245245
def pgsqlVersion = version "pgsql", "42.7.1"
246246
def sybaseVersion = version "sybase", "1.3.1"
@@ -257,7 +257,7 @@ dependencyResolutionManagement {
257257
library( "mysql", "com.mysql", "mysql-connector-j" ).versionRef( mysqlVersion )
258258
library( "tidb", "com.mysql", "mysql-connector-j" ).versionRef( tidbVersion )
259259
library( "mariadb", "org.mariadb.jdbc", "mariadb-java-client" ).versionRef( mariadbVersion )
260-
library( "oracle", "com.oracle.database.jdbc", "ojdbc11" ).versionRef( oracleVersion )
260+
library( "oracle", "com.oracle.database.jdbc", "ojdbc17" ).versionRef( oracleVersion )
261261
library( "oracleXml", "com.oracle.database.xml", "xdb" ).versionRef( oracleVersion )
262262
library( "oracleXmlParser", "com.oracle.database.xml", "xmlparserv2" ).versionRef( oracleVersion )
263263
library( "mssql", "com.microsoft.sqlserver", "mssql-jdbc" ).versionRef( mssqlVersion )

0 commit comments

Comments
 (0)