Skip to content

Commit 0d2fc55

Browse files
sdeleuzesdeleuze
authored
Add support for Hibernate 6.6.0.Final (#523)
* Add support for Hibernate 6.6.0.Final Add missing reflection entries for [Lorg.hibernate.event.spi.PostUpsertEventListener; and org.hibernate.internal.log.ConnectionInfoLogger_$logger to the Hibernate 6.5.0.Final metadata to create the 6.6.0.Final one. * Fix and refine generate-metadata.sh scripts
1 parent de05401 commit 0d2fc55

39 files changed

+2577
-27
lines changed

‎metadata/org.hibernate.orm/hibernate-core/6.6.0.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.0.Final/reflect-config.json

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

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"resources":{
3+
"includes":[
4+
{
5+
"condition":{"typeReachable":"org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl"},
6+
"pattern":"\\QMETA-INF/persistence.xml\\E"
7+
},
8+
{
9+
"condition":{"typeReachable":"org.hibernate.internal.util.ConfigHelper"},
10+
"pattern":"\\Qhibernate.properties\\E"
11+
},
12+
{
13+
"condition":{"typeReachable":"org.hibernate.boot.jaxb.internal.stax.LocalSchemaLocator"},
14+
"pattern":"\\Qorg/hibernate/hibernate-configuration-3.0.dtd\\E"
15+
},
16+
{
17+
"condition":{"typeReachable":"org.hibernate.boot.jaxb.internal.stax.LocalSchemaLocator"},
18+
"pattern":"\\Qorg/hibernate/hibernate-mapping-3.0.dtd\\E"
19+
},
20+
{
21+
"condition":{"typeReachable":"org.hibernate.boot.xsd.LocalXsdResolver"},
22+
"pattern":"\\Qorg/hibernate/jpa/persistence_2_0.xsd\\E"
23+
},
24+
{
25+
"condition": {"typeReachable": "org.hibernate.boot.xsd.LocalXsdResolver"},
26+
"pattern": "\\Qorg/hibernate/jpa/persistence_3_0.xsd\\E"
27+
},
28+
{
29+
"condition": {"typeReachable": "org.hibernate.boot.xsd.LocalXsdResolver"},
30+
"pattern": "\\Qorg/hibernate/jpa/persistence_3_1.xsd\\E"
31+
}
32+
]}
33+
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
[
22
{
33
"latest": true,
4+
"metadata-version": "6.6.0.Final",
5+
"module": "org.hibernate.orm:hibernate-core",
6+
"tested-versions": [
7+
"6.6.0.Final"
8+
]
9+
},
10+
{
411
"metadata-version": "6.5.0.Final",
12+
"default-for": "6\\.5\\..*",
513
"module": "org.hibernate.orm:hibernate-core",
614
"tested-versions": [
715
"6.5.0.Final"

‎tests/src/index.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,12 @@
460460
"name" : "org.hibernate.orm:hibernate-core",
461461
"versions" : [ "6.5.0.Final" ]
462462
} ]
463+
}, {
464+
"test-project-path" : "org.hibernate.orm/hibernate-core/6.6.0.Final",
465+
"libraries" : [ {
466+
"name" : "org.hibernate.orm:hibernate-core",
467+
"versions" : [ "6.6.0.Final" ]
468+
} ]
463469
}, {
464470
"test-project-path" : "org.hibernate.orm/hibernate-envers/6.1.1.Final",
465471
"libraries" : [ {
@@ -622,4 +628,4 @@
622628
"name" : "samples:docker",
623629
"versions" : [ "image-pull" ]
624630
} ]
625-
} ]
631+
} ]

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

100644100755
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/usr/bin/env bash
22

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.UrlMessageBundleTest" -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
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.UrlMessageBundleTest" -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.5.0.Final/generate-metadata.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/usr/bin/env bash
22

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
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.0.Final/.gitignore

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

‎tests/src/org.hibernate.orm/hibernate-core/6.6.0.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.0.Final/build.gradle

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

0 commit comments

Comments
 (0)