Skip to content

Commit 12c0e18

Browse files
erguiti-imaneerguiti-imane
committed
Remove obsolete dialect tests and update dialect list for Hibernate 6.6.3.Final
- Removed testDeprecatedHibernateDialects() method as the tested dialects (e.g., MariaDB106Dialect, MySQL8Dialect, SQLServer2012Dialect) were removed in Hibernate 6 and the test fails. - Removed PostgresPlusDialect from provideHibernateDialects(), as it is no longer present in Hibernate 6. - Regenerated metadata
1 parent 9f25247 commit 12c0e18

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+4174
-1
lines changed

‎metadata/org.hibernate.orm/hibernate-core/6.6.3.Final/index.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[
2+
"reflect-config.json",
3+
"resource-config.json"
4+
]

‎metadata/org.hibernate.orm/hibernate-core/6.6.3.Final/reflect-config.json

Lines changed: 1070 additions & 0 deletions
Large diffs are not rendered by default.

‎metadata/org.hibernate.orm/hibernate-core/6.6.3.Final/resource-config.json

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{
2+
"resources":{
3+
"includes":[{
4+
"condition":{"typeReachable":"org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl"},
5+
"pattern":"\\QMETA-INF/persistence.xml\\E"
6+
}, {
7+
"condition":{"typeReachable":"org.hibernate.jpa.HibernatePersistenceProvider"},
8+
"pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
9+
}, {
10+
"condition":{"typeReachable":"org.hibernate.bytecode.internal.BytecodeProviderInitiator"},
11+
"pattern":"\\QMETA-INF/services/org.hibernate.bytecode.spi.BytecodeProvider\\E"
12+
}, {
13+
"condition":{"typeReachable":"org.hibernate.jpa.HibernatePersistenceProvider"},
14+
"pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E"
15+
}, {
16+
"condition":{"typeReachable":"org.hibernate.jpa.HibernatePersistenceProvider"},
17+
"pattern":"\\Qlogback.xml\\E"
18+
}, {
19+
"condition":{"typeReachable":"org.hibernate.engine.jdbc.connections.internal.DriverConnectionCreator"},
20+
"pattern":"\\Qorg/h2/util/data.zip\\E"
21+
}, {
22+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
23+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$AreFieldsDirty.class\\E"
24+
}, {
25+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
26+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$AreFieldsDirtyWithoutCollections.class\\E"
27+
}, {
28+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
29+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$ClearDirtyAttributes.class\\E"
30+
}, {
31+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
32+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$ClearDirtyAttributesWithoutCollections.class\\E"
33+
}, {
34+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
35+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$ClearOwner.class\\E"
36+
}, {
37+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
38+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$GetCollectionTrackerWithoutCollections.class\\E"
39+
}, {
40+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
41+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$GetDirtyAttributes.class\\E"
42+
}, {
43+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
44+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$GetDirtyAttributesWithoutCollections.class\\E"
45+
}, {
46+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
47+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$InitializeLazyAttributeLoadingInterceptor.class\\E"
48+
}, {
49+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
50+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$SetOwner.class\\E"
51+
}, {
52+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
53+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$SuspendDirtyTracking.class\\E"
54+
}, {
55+
"condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"},
56+
"pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$TrackChange.class\\E"
57+
}, {
58+
"condition":{"typeReachable":"org.hibernate.boot.jaxb.internal.stax.LocalSchemaLocator"},
59+
"pattern":"\\Qorg/hibernate/hibernate-configuration-3.0.dtd\\E"
60+
}, {
61+
"condition":{"typeReachable":"org.hibernate.boot.jaxb.internal.stax.LocalSchemaLocator"},
62+
"pattern":"\\Qorg/hibernate/hibernate-mapping-3.0.dtd\\E"
63+
}, {
64+
"condition":{"typeReachable":"org.hibernate.boot.xsd.LocalXsdResolver"},
65+
"pattern":"\\Qorg/hibernate/jpa/persistence_2_0.xsd\\E"
66+
}, {
67+
"condition":{"typeReachable":"org.hibernate.boot.model.process.internal.ScanningCoordinator"},
68+
"pattern":"\\Qorg_hibernate_orm/hibernate_core/entity/Course.class\\E"
69+
}, {
70+
"condition":{"typeReachable":"org.hibernate.boot.model.process.internal.ScanningCoordinator"},
71+
"pattern":"\\Qorg_hibernate_orm/hibernate_core/entity/CourseMaterial.class\\E"
72+
}, {
73+
"condition":{"typeReachable":"org.hibernate.boot.model.process.internal.ScanningCoordinator"},
74+
"pattern":"\\Qorg_hibernate_orm/hibernate_core/entity/Student.class\\E"
75+
}, {
76+
"condition":{"typeReachable":"org.hibernate.boot.model.process.internal.ScanningCoordinator"},
77+
"pattern":"\\Qorg_hibernate_orm/hibernate_core/entity/Teacher.class\\E"
78+
}]},
79+
"bundles":[{
80+
"name":"com.sun.org.apache.xerces.internal.impl.xpath.regex.message",
81+
"locales":["und"]
82+
}]
83+
}

‎metadata/org.hibernate.orm/hibernate-core/index.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
[
2+
{
3+
"metadata-version" : "6.6.3.Final",
4+
"tested-versions" : [
5+
"6.6.3.Final"
6+
],
7+
"latest" : true,
8+
"module" : "org.hibernate.orm:hibernate-core"
9+
},
210
{
311
"metadata-version" : "6.6.0.Final",
412
"tested-versions" : [
513
"6.6.0.Final",
614
"6.6.1.Final",
715
"6.6.2.Final"
816
],
9-
"latest" : true,
1017
"module" : "org.hibernate.orm:hibernate-core"
1118
},
1219
{

‎tests/src/index.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,12 @@
520520
"name" : "org.hibernate.orm:hibernate-core",
521521
"versions" : [ "6.6.0.Final" ]
522522
} ]
523+
}, {
524+
"test-project-path" : "org.hibernate.orm/hibernate-core/6.6.3.Final",
525+
"libraries" : [ {
526+
"name" : "org.hibernate.orm:hibernate-core",
527+
"versions" : [ "6.6.3.Final" ]
528+
} ]
523529
}, {
524530
"test-project-path" : "org.hibernate.orm/hibernate-envers/6.1.1.Final",
525531
"libraries" : [ {

‎tests/src/org.hibernate.orm/hibernate-core/6.6.3.Final/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
gradlew.bat
2+
gradlew
3+
gradle/
4+
build/

‎tests/src/org.hibernate.orm/hibernate-core/6.6.3.Final/README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
# Hibernate ORM
3+
4+
The metadata has been generated by executing the following script:
5+
6+
```bash
7+
./generate-metadata.sh
8+
```
9+
10+
The generated metadata can be found in the `generated-metadata` directory.

‎tests/src/org.hibernate.orm/hibernate-core/6.6.3.Final/build.gradle

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/*
2+
* Copyright and related rights waived via CC0
3+
*
4+
* You should have received a copy of the CC0 legalcode along with this
5+
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6+
*/
7+
8+
9+
plugins {
10+
id "org.graalvm.internal.tck"
11+
}
12+
13+
String libraryVersion = tck.testedLibraryVersion.get()
14+
15+
dependencies {
16+
testImplementation "org.hibernate.orm:hibernate-core:$libraryVersion"
17+
testImplementation 'org.assertj:assertj-core:3.22.0'
18+
testImplementation 'com.h2database:h2:2.1.214'
19+
testImplementation 'jakarta.validation:jakarta.validation-api:3.0.2'
20+
testImplementation 'org.postgresql:postgresql:42.6.0'
21+
testImplementation 'com.oracle.database.jdbc:ojdbc11:21.9.0.0'
22+
testImplementation 'org.jboss.logging:jboss-logging:3.5.0.Final'
23+
24+
testImplementation 'ch.qos.logback:logback-classic:1.4.5'
25+
testCompileOnly("net.bytebuddy:byte-buddy:1.12.10")
26+
testCompileOnly("org.graalvm.nativeimage:graal-hotspot-library:22.0.0")
27+
}
28+
29+
task updateGeneratedMetadata {
30+
doLast {
31+
final ant = new groovy.ant.AntBuilder()
32+
final metadataDir = project.projectDir.toString() + "/generated-metadata"
33+
34+
// replace typeReachable value for entries generated by IdentifierGeneratorTest test class
35+
ant.replace(file: metadataDir + "/reflect-config.json",
36+
token: "org_hibernate_orm.hibernate_core.IdentifierGeneratorTest",
37+
value: "org.hibernate.id.factory.internal.StandardIdentifierGeneratorFactory")
38+
}
39+
}
40+
41+
task deleteGeneratedMetadata(type: Delete) {
42+
delete files(project.projectDir.toString() + "/generated-metadata")
43+
}
44+
45+
graalvmNative {
46+
agent {
47+
defaultMode = "conditional"
48+
modes {
49+
conditional {
50+
userCodeFilterPath = "metadata-conditions-filter.json"
51+
extraFilterPath = "metadata-extra-filter.json"
52+
}
53+
}
54+
metadataCopy {
55+
inputTaskNames.add("test")
56+
outputDirectories.add("generated-metadata")
57+
mergeWithExisting = true
58+
}
59+
}
60+
}
61+

‎tests/src/org.hibernate.orm/hibernate-core/6.6.3.Final/generate-metadata.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
../../../../../gradlew deleteGeneratedMetadata
4+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.H2DialectHibernateTest" -Pagent metadataCopy
5+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.MariaDBDialectHibernateTest" -Pagent metadataCopy
6+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.MSSQLDialectHibernateTest" -Pagent metadataCopy
7+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.MySQLDialectHibernateTest" -Pagent metadataCopy
8+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.OracleDialectHibernateTest" -Pagent metadataCopy
9+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.PostgresDialectHibernateTest" -Pagent metadataCopy
10+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.HibernateDialectTest" -Pagent metadataCopy
11+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.LoggerTest" -Pagent metadataCopy
12+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.IdentifierGeneratorTest" -Pagent metadataCopy
13+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.OptimizerTest" -Pagent metadataCopy
14+
../../../../../gradlew test --tests "org_hibernate_orm.hibernate_core.EntityManagerTest" -Pagent metadataCopy
15+
../../../../../gradlew updateGeneratedMetadata

‎tests/src/org.hibernate.orm/hibernate-core/6.6.3.Final/generated-metadata/jni-config.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[
2+
{
3+
"condition":{"typeReachable":"org.hibernate.dialect.OracleServerConfiguration"},
4+
"name":"[Lcom.sun.management.internal.DiagnosticCommandArgumentInfo;"
5+
},
6+
{
7+
"condition":{"typeReachable":"org.hibernate.dialect.OracleServerConfiguration"},
8+
"name":"[Lcom.sun.management.internal.DiagnosticCommandInfo;"
9+
},
10+
{
11+
"condition":{"typeReachable":"org.hibernate.dialect.OracleServerConfiguration"},
12+
"name":"sun.management.VMManagementImpl",
13+
"fields":[{"name":"compTimeMonitoringSupport"}, {"name":"currentThreadCpuTimeSupport"}, {"name":"objectMonitorUsageSupport"}, {"name":"otherThreadCpuTimeSupport"}, {"name":"remoteDiagnosticCommandsSupport"}, {"name":"synchronizerUsageSupport"}, {"name":"threadAllocatedMemorySupport"}, {"name":"threadContentionMonitoringSupport"}]
14+
}
15+
]

0 commit comments

Comments
 (0)