Skip to content

Commit de118b4

Browse files
aaronchung-bitquillaaronchung-bitquill
committed
add latest updates from 6.2.22 to hibernate test files
1 parent 8d1b11a commit de118b4

File tree

4 files changed

+174
-120
lines changed

4 files changed

+174
-120
lines changed

‎wrapper/src/test/java/integration/host/TestEnvironment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class TestEnvironment implements AutoCloseable {
6868
private static final String PROXIED_DOMAIN_NAME_SUFFIX = ".proxied";
6969
protected static final int PROXY_CONTROL_PORT = 8474;
7070
protected static final int PROXY_PORT = 8666;
71-
private static final String HIBERNATE_VERSION = "6.2.0.CR2";
71+
private static final String HIBERNATE_VERSION = "6.2.22";
7272

7373
private static final TestEnvironmentConfiguration config = new TestEnvironmentConfiguration();
7474
private static final boolean USE_OTLP_CONTAINER_FOR_TRACES = true;

‎wrapper/src/test/resources/hibernate_files/databases.gradle

+72-12
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ ext {
1212
db = project.hasProperty('db') ? project.getProperty('db') : 'h2'
1313
dbHost = System.getProperty( 'dbHost', 'localhost' )
1414
dbService = System.getProperty( 'dbService', '' )
15-
dbUser = System.getProperty( 'dbUser', 'hibernate_orm_test' )
16-
dbPass = System.getProperty( 'dbPass', 'hibernate_orm_test' )
17-
dbName = System.getProperty( 'dbName', 'hibernate_orm_test' )
15+
runID = System.getProperty( 'runID', '' )
1816
dbBundle = [
1917
amazon_ci : [
2018
'db.dialect' : 'org.hibernate.dialect.PostgreSQLDialect',
@@ -37,8 +35,9 @@ ext {
3735
'jdbc.driver': 'org.h2.Driver',
3836
'jdbc.user' : 'sa',
3937
'jdbc.pass' : '',
40-
'jdbc.url' : 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000',
41-
'connection.init_sql' : ''
38+
'jdbc.url' : 'jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE',
39+
'connection.init_sql' : '',
40+
'hibernate.dialect.native_param_markers' : 'true'
4241
],
4342
hsqldb : [
4443
'db.dialect' : 'org.hibernate.dialect.HSQLDialect',
@@ -53,15 +52,15 @@ ext {
5352
'jdbc.driver': 'org.apache.derby.iapi.jdbc.AutoloadedDriver',
5453
'jdbc.user' : 'hibernate_orm_test',
5554
'jdbc.pass' : 'hibernate_orm_test',
56-
'jdbc.url' : 'jdbc:derby:target/tmp/derby/hibernate_orm_test;databaseName=hibernate_orm_test;create=true',
55+
'jdbc.url' : 'jdbc:derby:memory:;databaseName=hibernate_orm_test;create=true',
5756
'connection.init_sql' : ''
5857
],
5958
derby_old : [
6059
'db.dialect' : 'org.hibernate.dialect.DerbyDialect',
6160
'jdbc.driver': 'org.apache.derby.jdbc.EmbeddedDriver',
6261
'jdbc.user' : 'hibernate_orm_test',
6362
'jdbc.pass' : 'hibernate_orm_test',
64-
'jdbc.url' : 'jdbc:derby:target/tmp/derby/hibernate_orm_test;databaseName=hibernate_orm_test;create=true',
63+
'jdbc.url' : 'jdbc:derby:memory:;databaseName=hibernate_orm_test;create=true',
6564
'connection.init_sql' : ''
6665
],
6766
pgsql : [
@@ -97,9 +96,18 @@ ext {
9796
'jdbc.user' : 'hibernate_orm_test',
9897
'jdbc.pass' : 'hibernate_orm_test',
9998
// Disable prepared statement caching to avoid issues with changing schemas
100-
'jdbc.url' : 'jdbc:jtds:sybase://' + dbHost + ':5000/hibernate_orm_test;maxStatements=0;cacheMetaData=false',
99+
'jdbc.url' : 'jdbc:jtds:sybase://' + dbHost + ':9000/hibernate_orm_test;maxStatements=0;cacheMetaData=false',
101100
'connection.init_sql' : 'set ansinull on'
102101
],
102+
sybase_jconn_ci : [
103+
'db.dialect' : 'org.hibernate.dialect.SybaseASEDialect',
104+
'jdbc.driver': 'com.sybase.jdbc4.jdbc.SybDriver',
105+
'jdbc.user' : 'hibernate_orm_test',
106+
'jdbc.pass' : 'hibernate_orm_test',
107+
// Disable prepared statement caching to avoid issues with changing schemas
108+
'jdbc.url' : 'jdbc:sybase:Tds:' + dbHost + ':9000/hibernate_orm_test',
109+
'connection.init_sql' : 'set ansinull on set quoted_identifier on'
110+
],
103111
mysql : [
104112
'db.dialect' : 'org.hibernate.dialect.MySQLDialect',
105113
'jdbc.driver': 'com.mysql.cj.jdbc.Driver',
@@ -137,7 +145,7 @@ ext {
137145
'jdbc.driver': 'com.mysql.jdbc.Driver',
138146
'jdbc.user' : 'hibernate_orm_test',
139147
'jdbc.pass' : 'hibernate_orm_test',
140-
'jdbc.url' : 'jdbc:mysql://' + dbHost + '/hibernate_orm_test',
148+
'jdbc.url' : 'jdbc:mysql://' + dbHost + ':4000/hibernate_orm_test',
141149
'connection.init_sql' : ''
142150
],
143151
oracle : [
@@ -149,6 +157,14 @@ ext {
149157
'connection.init_sql' : ''
150158
],
151159
oracle_ci : [
160+
'db.dialect' : 'org.hibernate.dialect.OracleDialect',
161+
'jdbc.driver': 'oracle.jdbc.OracleDriver',
162+
'jdbc.user' : 'hibernate_orm_test',
163+
'jdbc.pass' : 'hibernate_orm_test',
164+
'jdbc.url' : 'jdbc:oracle:thin:@' + dbHost + ':1521/freepdb1',
165+
'connection.init_sql' : ''
166+
],
167+
oracle_xe_ci : [
152168
'db.dialect' : 'org.hibernate.dialect.OracleDialect',
153169
'jdbc.driver': 'oracle.jdbc.OracleDriver',
154170
'jdbc.user' : 'hibernate_orm_test',
@@ -168,13 +184,49 @@ ext {
168184
oracle_cloud_autonomous_tls : [
169185
'db.dialect' : 'org.hibernate.dialect.OracleDialect',
170186
'jdbc.driver': 'oracle.jdbc.OracleDriver',
171-
'jdbc.user' : 'hibernate_orm_test',
187+
'jdbc.user' : 'hibernate_orm_test_' + runID,
188+
'jdbc.pass' : 'Oracle_19_Password',
189+
// Requires dbHost (pointing to the right cloud region) AND dbService (unique database name).
190+
//
191+
// To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
192+
// https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
193+
'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',
194+
'connection.init_sql' : ''
195+
],
196+
oracle_cloud_db19c : [
197+
'db.dialect' : 'org.hibernate.dialect.OracleDialect',
198+
'jdbc.driver': 'oracle.jdbc.OracleDriver',
199+
'jdbc.user' : 'hibernate_orm_test_' + runID,
172200
'jdbc.pass' : 'Oracle_19_Password',
173201
// Requires dbHost (pointing to the right cloud region) AND dbService (unique database name).
174202
//
175203
// To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
176204
// https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
177-
'jdbc.url' : 'jdbc:oracle:thin:@(description=(retry_count=20)(retry_delay=3)(address=(protocol=tcps)(port=1521)(host=' + dbHost + '.oraclecloud.com))(connect_data=(service_name=' + dbService + '_low.adb.oraclecloud.com))(security=(ssl_server_dn_match=yes)))',
205+
'jdbc.url' : 'jdbc:oracle:thin:@' + dbHost + ':1521/' + dbService,
206+
'connection.init_sql' : ''
207+
],
208+
oracle_cloud_db21c : [
209+
'db.dialect' : 'org.hibernate.dialect.OracleDialect',
210+
'jdbc.driver': 'oracle.jdbc.OracleDriver',
211+
'jdbc.user' : 'hibernate_orm_test_' + runID,
212+
'jdbc.pass' : 'Oracle_21_Password',
213+
// Requires dbHost (pointing to the right cloud region) AND dbService (unique database name).
214+
//
215+
// To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
216+
// https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
217+
'jdbc.url' : 'jdbc:oracle:thin:@' + dbHost + ':1521/' + dbService,
218+
'connection.init_sql' : ''
219+
],
220+
oracle_cloud_db23c : [
221+
'db.dialect' : 'org.hibernate.dialect.OracleDialect',
222+
'jdbc.driver': 'oracle.jdbc.OracleDriver',
223+
'jdbc.user' : 'hibernate_orm_test_' + runID,
224+
'jdbc.pass' : 'Oracle_23_Password',
225+
// Requires dbHost (pointing to the right cloud region) AND dbService (unique database name).
226+
//
227+
// To avoid hibernate-spatial tests failure, JVM must be enabled as stated in documentation:
228+
// https://docs.oracle.com/en/cloud/paas/autonomous-database/adbsa/autonomous-oracle-java.html
229+
'jdbc.url' : 'jdbc:oracle:thin:@' + dbHost + ':1521/' + dbService,
178230
'connection.init_sql' : ''
179231
],
180232
mssql : [
@@ -256,6 +308,14 @@ ext {
256308
'jdbc.url' : 'jdbc:firebirdsql://' + dbHost +'/hibernate_orm_test?charSet=utf-8;TRANSACTION_READ_COMMITTED=read_committed,rec_version,wait,lock_timeout=5',
257309
'connection.init_sql' : ''
258310
],
311+
altibase : [
312+
'db.dialect' : 'org.hibernate.community.dialect.AltibaseDialect',
313+
'jdbc.driver': 'Altibase.jdbc.driver.AltibaseDriver',
314+
'jdbc.user' : 'sys',
315+
'jdbc.pass' : 'manager',
316+
'connection.init_sql' : '',
317+
'jdbc.url' : 'jdbc:Altibase://' + dbHost + ':20300/mydb?force_clob_bind=true'
318+
],
259319
]
260320
}
261321

@@ -266,7 +326,7 @@ if ( processTestResourcesTask != null ) {
266326
processTestResourcesTask.inputs.property( 'dbHost', dbHost )
267327
// processTestResourcesTask.inputs.property( "gradle.libs.versions.h2", project.getProperty( "gradle.libs.versions.h2", "2.1.214" ) )
268328
// processTestResourcesTask.inputs.property( "gradle.libs.versions.h2gis", project.getProperty( "gradle.libs.versions.h2gis", "2.1.0" ) )
269-
// processTestResourcesTask.inputs.property( "gradle.libs.versions.hsqldb", project.getProperty( "gradle.libs.versions.hsqldb", "2.7.1" ) )
329+
// processTestResourcesTask.inputs.property( "gradle.libs.versions.hsqldb", project.getProperty( "gradle.libs.versions.hsqldb", "2.7.2" ) )
270330
// processTestResourcesTask.inputs.property( "gradle.libs.versions.derby", project.getProperty( "gradle.libs.versions.derby", "10.15.2.0" ) )
271331
processTestResourcesTask.filter( ReplaceTokens, tokens: dbBundle[db] )
272332
}

‎wrapper/src/test/resources/hibernate_files/hibernate-core.gradle

+25-14
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@ plugins {
1010
id 'org.hibernate.build.xjc-jakarta'
1111
}
1212

13+
repositories {
14+
gradlePluginPortal()
15+
}
16+
1317
description = 'Hibernate\'s core ORM functionality'
1418

1519
apply from: rootProject.file( 'gradle/published-java-module.gradle' )
1620
apply plugin: 'org.hibernate.orm.antlr'
1721
apply plugin: 'org.hibernate.matrix-test'
1822

19-
2023
configurations {
2124
tests {
2225
description = 'Configuration for the produced test jar'
@@ -45,6 +48,7 @@ dependencies {
4548
compileOnly jakartaLibs.jsonbApi
4649
compileOnly libs.jackson
4750
compileOnly libs.jacksonXml
51+
compileOnly dbLibs.postgresql
4852

4953
testImplementation project(':hibernate-testing')
5054
testImplementation project(':hibernate-ant')
@@ -62,14 +66,15 @@ dependencies {
6266
}
6367
testImplementation "joda-time:joda-time:2.3"
6468
testImplementation files('/app/libs/aws-advanced-jdbc-wrapper-2.3.3.jar')
65-
testImplementation dbLibs.postgresql
66-
testImplementation dbLibs.mysql
6769
testImplementation dbLibs.h2
6870

6971
testRuntimeOnly libs.byteBuddy
7072
testRuntimeOnly testLibs.weld
7173
testRuntimeOnly testLibs.wildFlyTxnClient
74+
testRuntimeOnly jakartaLibs.jsonb
7275
testRuntimeOnly libs.jackson
76+
testRuntimeOnly libs.jacksonXml
77+
testRuntimeOnly libs.jacksonJsr310
7378

7479
testAnnotationProcessor project( ':hibernate-jpamodelgen' )
7580

@@ -105,10 +110,8 @@ sourceSets {
105110
}
106111
}
107112

108-
// resources inherently exclude sources
109113
test {
110114
resources {
111-
srcDir 'src/test/java'
112115
srcDir 'src/test/resources'
113116
srcDir 'src/test/bundles'
114117
}
@@ -240,13 +243,16 @@ tasks.withType( Test.class ).each { test ->
240243
test.jvmArgs( ['--add-opens', 'java.base/java.security=ALL-UNNAMED'] )
241244
test.jvmArgs( ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'] )
242245

246+
//Avoid Log4J2 classloader leaks:
247+
test.jvmArgs( ['-Dlog4j2.disableJmx=true'] )
248+
243249
test.beforeTest { descriptor ->
244250
//println "Starting test: " + descriptor
245251
}
246252
}
247253

248254
// Tests with records
249-
if ( gradle.ext.javaVersions.test.release.asInt() >= 17 && gradle.ext.javaToolchainEnabled ) {
255+
if ( jdkVersions.test.release.asInt() >= 17 && jdkVersions.explicit ) {
250256

251257
// Add a new source set, which contains tests that can run on JDK17+
252258
sourceSets {
@@ -256,15 +262,15 @@ if ( gradle.ext.javaVersions.test.release.asInt() >= 17 && gradle.ext.javaToolch
256262
}
257263
// Refer to the main test resources to avoid processing variables twice
258264
resources {
259-
srcDir 'target/resources/test'
265+
srcDirs tasks.processTestResources
260266
}
261267
}
262268
}
263269

264270
// For the new source set, we need to configure the source and target version to 17
265271
compileTestJava17Java {
266272
javaCompiler = javaToolchains.compilerFor {
267-
languageVersion = gradle.ext.javaVersions.test.compiler
273+
languageVersion = jdkVersions.test.compiler
268274
}
269275
sourceCompatibility = 17
270276
targetCompatibility = 17
@@ -275,6 +281,7 @@ if ( gradle.ext.javaVersions.test.release.asInt() >= 17 && gradle.ext.javaToolch
275281
// The source set gets a custom configuration which extends the normal test implementation config
276282
configurations {
277283
testJava17Implementation.extendsFrom(testImplementation, testRuntimeOnly)
284+
testJava17CompileOnly.extendsFrom(testCompileOnly)
278285
}
279286

280287
// Add the output from src/main/java as dependency
@@ -287,14 +294,14 @@ if ( gradle.ext.javaVersions.test.release.asInt() >= 17 && gradle.ext.javaToolch
287294
// We execute the Java 17 tests in a custom test task
288295
task testJava17(type: Test) {
289296
javaLauncher = javaToolchains.launcherFor {
290-
languageVersion = gradle.ext.javaVersions.test.launcher
297+
languageVersion = jdkVersions.test.launcher
291298
}
292299
useJUnitPlatform()
293300
testClassesDirs = sourceSets.testJava17.output.classesDirs
294301
classpath = sourceSets.testJava17.runtimeClasspath
295302

296-
if ( gradle.ext.javaVersions.test.launcher.asInt() >= 19 ) {
297-
logger.warn( "The version of Java bytecode that will be tested is not supported by Bytebuddy by default. " +
303+
if ( jdkVersions.test.launcher.asInt() >= 19 ) {
304+
logger.warn( "The version of Java bytecode that will be tested is not supported by Byte Buddy by default. " +
298305
" Setting 'net.bytebuddy.experimental=true'." )
299306
systemProperty 'net.bytebuddy.experimental', true
300307
}
@@ -305,9 +312,13 @@ if ( gradle.ext.javaVersions.test.release.asInt() >= 17 && gradle.ext.javaToolch
305312
check.dependsOn testJava17
306313
}
307314

308-
javadoc {
315+
tasks.named( "javadoc", Javadoc ) {
309316
configure(options) {
310-
overview = 'src/main/javadoc/overview.html'
311-
stylesheetFile = new File(projectDir, 'src/main/javadoc/stylesheet.css')
317+
overview = rootProject.file( "shared/javadoc/overview.html" )
312318
}
313319
}
320+
321+
tasks.sourcesJar.dependsOn ':hibernate-core:generateGraphParser'
322+
tasks.sourcesJar.dependsOn ':hibernate-core:generateHqlParser'
323+
tasks.sourcesJar.dependsOn ':hibernate-core:generateSqlScriptParser'
324+
tasks.sourcesJar.dependsOn ':hibernate-core:generateOrderingParser'

0 commit comments

Comments
 (0)