-
Notifications
You must be signed in to change notification settings - Fork 100
Add initial support for hibernate-orm:hibernate-core:6.5.0.Final #479
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
fniephaus
merged 6 commits into
oracle:master
from
christophstrobl:hibernate-orm-core/6.5.0.CR1
May 12, 2024
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9521dfc
Add initial support for hibernate-orm:hibernate-core:6.5.0.CR1
christophstrobl c2b0ba6
Work around no longer evaluated hibernate.properties.
christophstrobl 2c24c98
Upgrade to Hibernate 6.5.0.Final
christophstrobl 80a9aa9
Add default-for attribute to hibernate metadata
christophstrobl 8c806ff
Remove no longer used hibernate.properties.
christophstrobl 626ee82
Remove default-for value for latest version of hibernate-core metadata
christophstrobl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
4 changes: 4 additions & 0 deletions
4
metadata/org.hibernate.orm/hibernate-core/6.5.0.Final/index.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
[ | ||
"reflect-config.json", | ||
"resource-config.json" | ||
] |
988 changes: 988 additions & 0 deletions
988
metadata/org.hibernate.orm/hibernate-core/6.5.0.Final/reflect-config.json
Large diffs are not rendered by default.
Oops, something went wrong.
33 changes: 33 additions & 0 deletions
33
metadata/org.hibernate.orm/hibernate-core/6.5.0.Final/resource-config.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
{ | ||
"resources":{ | ||
"includes":[ | ||
{ | ||
"condition":{"typeReachable":"org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl"}, | ||
"pattern":"\\QMETA-INF/persistence.xml\\E" | ||
}, | ||
{ | ||
"condition":{"typeReachable":"org.hibernate.internal.util.ConfigHelper"}, | ||
"pattern":"\\Qhibernate.properties\\E" | ||
}, | ||
{ | ||
"condition":{"typeReachable":"org.hibernate.boot.jaxb.internal.stax.LocalSchemaLocator"}, | ||
"pattern":"\\Qorg/hibernate/hibernate-configuration-3.0.dtd\\E" | ||
}, | ||
{ | ||
"condition":{"typeReachable":"org.hibernate.boot.jaxb.internal.stax.LocalSchemaLocator"}, | ||
"pattern":"\\Qorg/hibernate/hibernate-mapping-3.0.dtd\\E" | ||
}, | ||
{ | ||
"condition":{"typeReachable":"org.hibernate.boot.xsd.LocalXsdResolver"}, | ||
"pattern":"\\Qorg/hibernate/jpa/persistence_2_0.xsd\\E" | ||
}, | ||
{ | ||
"condition": {"typeReachable": "org.hibernate.boot.xsd.LocalXsdResolver"}, | ||
"pattern": "\\Qorg/hibernate/jpa/persistence_3_0.xsd\\E" | ||
}, | ||
{ | ||
"condition": {"typeReachable": "org.hibernate.boot.xsd.LocalXsdResolver"}, | ||
"pattern": "\\Qorg/hibernate/jpa/persistence_3_1.xsd\\E" | ||
} | ||
]} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
tests/src/org.hibernate.orm/hibernate-core/6.5.0.Final/.gitignore
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
gradlew.bat | ||
gradlew | ||
gradle/ | ||
build/ | ||
generated-metadata/ |
10 changes: 10 additions & 0 deletions
10
tests/src/org.hibernate.orm/hibernate-core/6.5.0.Final/README.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
|
||
# Hibernate ORM | ||
|
||
The metadata has been generated by executing the following script: | ||
|
||
```bash | ||
./generate-metadata.sh | ||
``` | ||
|
||
The generated metadata can be found in the `generated-metadata` directory. |
59 changes: 59 additions & 0 deletions
59
tests/src/org.hibernate.orm/hibernate-core/6.5.0.Final/build.gradle
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* Copyright and related rights waived via CC0 | ||
* | ||
* You should have received a copy of the CC0 legalcode along with this | ||
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. | ||
*/ | ||
|
||
plugins { | ||
id "org.graalvm.internal.tck" | ||
} | ||
|
||
String libraryVersion = tck.testedLibraryVersion.get() | ||
|
||
dependencies { | ||
testImplementation "org.hibernate.orm:hibernate-core:$libraryVersion" | ||
testImplementation 'org.assertj:assertj-core:3.22.0' | ||
testImplementation 'com.h2database:h2:2.1.214' | ||
testImplementation 'jakarta.validation:jakarta.validation-api:3.0.2' | ||
testImplementation 'org.postgresql:postgresql:42.6.0' | ||
testImplementation 'com.oracle.database.jdbc:ojdbc11:21.9.0.0' | ||
testImplementation 'org.jboss.logging:jboss-logging:3.5.0.Final' | ||
|
||
testImplementation 'ch.qos.logback:logback-classic:1.4.5' | ||
testCompileOnly("net.bytebuddy:byte-buddy:1.12.10") | ||
testCompileOnly("org.graalvm.nativeimage:graal-hotspot-library:22.0.0") | ||
} | ||
|
||
task updateGeneratedMetadata { | ||
doLast { | ||
final ant = new groovy.ant.AntBuilder() | ||
final metadataDir = project.projectDir.toString() + "/generated-metadata" | ||
|
||
// replace typeReachable value for entries generated by IdentifierGeneratorTest test class | ||
ant.replace(file: metadataDir + "/reflect-config.json", | ||
token: "org_hibernate_orm.hibernate_core.IdentifierGeneratorTest", | ||
value: "org.hibernate.id.factory.internal.StandardIdentifierGeneratorFactory") | ||
} | ||
} | ||
|
||
task deleteGeneratedMetadata(type: Delete) { | ||
delete files(project.projectDir.toString() + "/generated-metadata") | ||
} | ||
|
||
graalvmNative { | ||
agent { | ||
defaultMode = "conditional" | ||
modes { | ||
conditional { | ||
userCodeFilterPath = "metadata-conditions-filter.json" | ||
extraFilterPath = "metadata-extra-filter.json" | ||
} | ||
} | ||
metadataCopy { | ||
inputTaskNames.add("test") | ||
outputDirectories.add("generated-metadata") | ||
mergeWithExisting = true | ||
} | ||
} | ||
} |
15 changes: 15 additions & 0 deletions
15
tests/src/org.hibernate.orm/hibernate-core/6.5.0.Final/generate-metadata.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
#!/usr/bin/env bash | ||
|
||
./gradlew deleteGeneratedMetadata | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.H2DialectHibernateTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.MariaDBDialectHibernateTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.MSSQLDialectHibernateTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.MySQLDialectHibernateTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.OracleDialectHibernateTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.PostgresDialectHibernateTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.HibernateDialectTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.LoggerTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.IdentifierGeneratorTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.OptimizerTest" -Pagent metadataCopy | ||
./gradlew test --tests "org_hibernate_orm.hibernate_core.EntityManagerTest" -Pagent metadataCopy | ||
./gradlew updateGeneratedMetadata |
2 changes: 2 additions & 0 deletions
2
tests/src/org.hibernate.orm/hibernate-core/6.5.0.Final/gradle.properties
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
library.version = 6.5.0.Final | ||
metadata.dir = org.hibernate.orm/hibernate-core/6.5.0.Final/ |
6 changes: 6 additions & 0 deletions
6
tests/src/org.hibernate.orm/hibernate-core/6.5.0.Final/metadata-conditions-filter.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"rules": [ | ||
{"includeClasses": "org.hibernate.**"}, | ||
{"includeClasses": "org_hibernate_orm.hibernate_core.IdentifierGeneratorTest"} | ||
] | ||
} |
16 changes: 16 additions & 0 deletions
16
tests/src/org.hibernate.orm/hibernate-core/6.5.0.Final/metadata-extra-filter.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"rules": [ | ||
{"includeClasses": "**"}, | ||
{"excludeClasses": "[Ljava.util.**"}, | ||
{"excludeClasses": "ch.qos.**"}, | ||
{"excludeClasses": "com.sun.**"}, | ||
{"excludeClasses": "java.**"}, | ||
{"excludeClasses": "org.slf4j.**"}, | ||
{"excludeClasses": "org_hibernate_orm.hibernate_core.entity.**"}, | ||
{"excludeClasses": "sun.security.**"}, | ||
{"excludeClasses": "org.hibernate.bytecode.internal.bytebuddy.**"} | ||
], | ||
"regexRules": [ | ||
{"excludeClasses": "org\\.hibernate.*_\\$logger_en.*"} | ||
] | ||
} |
13 changes: 13 additions & 0 deletions
13
tests/src/org.hibernate.orm/hibernate-core/6.5.0.Final/settings.gradle
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
pluginManagement { | ||
def tckPath = Objects.requireNonNullElse( | ||
System.getenv("GVM_TCK_TCKDIR"), | ||
"../../../../tck-build-logic" | ||
) | ||
includeBuild(tckPath) | ||
} | ||
|
||
plugins { | ||
id "org.graalvm.internal.tck-settings" version "1.0.0-SNAPSHOT" | ||
} | ||
|
||
rootProject.name = 'org.hibernate.orm.hibernate-core_tests' |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.