Skip to content
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

Add initial support for hibernate-orm:hibernate-core:6.5.0.Final #479

Merged
merged 6 commits into from
May 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[
"reflect-config.json",
"resource-config.json"
]

Large diffs are not rendered by default.

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"
}
]}
}
8 changes: 8 additions & 0 deletions metadata/org.hibernate.orm/hibernate-core/index.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
[
{
"latest": true,
"metadata-version": "6.5.0.Final",
"module": "org.hibernate.orm:hibernate-core",
"tested-versions": [
"6.5.0.Final"
]
},
{
"metadata-version": "6.2.0.Final",
sdeleuze marked this conversation as resolved.
Show resolved Hide resolved
"default-for": "6\\.[2-4]\\..*",
"module": "org.hibernate.orm:hibernate-core",
"tested-versions": [
"6.2.0.Final",
Expand Down
6 changes: 6 additions & 0 deletions tests/src/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,12 @@
"name" : "org.hibernate.orm:hibernate-core",
"versions" : [ "6.2.0.Final" ]
} ]
}, {
"test-project-path" : "org.hibernate.orm/hibernate-core/6.5.0.Final",
"libraries" : [ {
"name" : "org.hibernate.orm:hibernate-core",
"versions" : [ "6.5.0.Final" ]
} ]
}, {
"test-project-path" : "org.hibernate.orm/hibernate-envers/6.1.1.Final",
"libraries" : [ {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
gradlew.bat
gradlew
gradle/
build/
generated-metadata/
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.
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
}
}
}
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
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/
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"}
]
}
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.*"}
]
}
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'
Loading
Loading