Remove obsolete dialect tests and update dialect list and Regenerate metadata for Hibernate 6.6.3.Final #643
There are no files selected for viewing
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" | ||
| ] | ||
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,125 @@ | ||
| { | ||
| "resources":{ | ||
| "includes":[{ | ||
| "condition":{"typeReachable":"org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl"}, | ||
| "pattern":"\\QMETA-INF/persistence.xml\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.boot.jaxb.JaxbLogger"}, | ||
| "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl"}, | ||
| "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.id.enhanced.OptimizerFactory"}, | ||
| "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.jpa.HibernatePersistenceProvider"}, | ||
| "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.dialect.OracleServerConfiguration"}, | ||
| "pattern":"\\QMETA-INF/services/java.sql.Driver\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.internal.BytecodeProviderInitiator"}, | ||
| "pattern":"\\QMETA-INF/services/org.hibernate.bytecode.spi.BytecodeProvider\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.boot.jaxb.JaxbLogger"}, | ||
| "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl"}, | ||
| "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.id.enhanced.OptimizerFactory"}, | ||
| "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.jpa.HibernatePersistenceProvider"}, | ||
| "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.boot.jaxb.JaxbLogger"}, | ||
| "pattern":"\\Qlogback.xml\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl"}, | ||
| "pattern":"\\Qlogback.xml\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.id.enhanced.OptimizerFactory"}, | ||
| "pattern":"\\Qlogback.xml\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.jpa.HibernatePersistenceProvider"}, | ||
| "pattern":"\\Qlogback.xml\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.dialect.OracleServerConfiguration"}, | ||
| "pattern":"\\Qoracle/jdbc/defaultConnectionProperties.properties\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.dialect.OracleServerConfiguration"}, | ||
| "pattern":"\\Qoracle/jdbc/driver/errorMap.xml\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.engine.jdbc.connections.internal.DriverConnectionCreator"}, | ||
| "pattern":"\\Qorg/h2/util/data.zip\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl$PooledConnections"}, | ||
| "pattern":"\\Qorg/h2/util/data.zip\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$AreFieldsDirty.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$AreFieldsDirtyWithoutCollections.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$ClearDirtyAttributes.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$ClearDirtyAttributesWithoutCollections.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$ClearOwner.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$GetCollectionTrackerWithoutCollections.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$GetDirtyAttributes.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$GetDirtyAttributesWithoutCollections.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$InitializeLazyAttributeLoadingInterceptor.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$SetOwner.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$SuspendDirtyTracking.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "pattern":"\\Qorg/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates$TrackChange.class\\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.model.process.internal.ScanningCoordinator"}, | ||
| "pattern":"\\Qorg_hibernate_orm/hibernate_core/entity/Course.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.boot.model.process.internal.ScanningCoordinator"}, | ||
| "pattern":"\\Qorg_hibernate_orm/hibernate_core/entity/CourseMaterial.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.boot.model.process.internal.ScanningCoordinator"}, | ||
| "pattern":"\\Qorg_hibernate_orm/hibernate_core/entity/Student.class\\E" | ||
| }, { | ||
| "condition":{"typeReachable":"org.hibernate.boot.model.process.internal.ScanningCoordinator"}, | ||
| "pattern":"\\Qorg_hibernate_orm/hibernate_core/entity/Teacher.class\\E" | ||
| }]}, | ||
| "bundles":[{ | ||
| "name":"com.sun.org.apache.xerces.internal.impl.xpath.regex.message", | ||
| "locales":["und"] | ||
| }, { | ||
| "name":"oracle.jdbc.driver.Messages", | ||
| "locales":["und"] | ||
| }] | ||
| } |
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
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 @@ | ||
| gradlew.bat | ||
| gradlew | ||
| gradle/ | ||
| build/ |
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. |
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,61 @@ | ||
| /* | ||
| * 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 | ||
| } | ||
| } | ||
| } | ||
|
|
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 |
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 @@ | ||
| [ | ||
|
There was a problem hiding this comment. Once all necessary metadata is copied to |
||
| { | ||
| "condition":{"typeReachable":"org.hibernate.dialect.OracleServerConfiguration"}, | ||
| "name":"[Lcom.sun.management.internal.DiagnosticCommandArgumentInfo;" | ||
| }, | ||
| { | ||
| "condition":{"typeReachable":"org.hibernate.dialect.OracleServerConfiguration"}, | ||
| "name":"[Lcom.sun.management.internal.DiagnosticCommandInfo;" | ||
| }, | ||
| { | ||
| "condition":{"typeReachable":"org.hibernate.dialect.OracleServerConfiguration"}, | ||
| "name":"sun.management.VMManagementImpl", | ||
| "fields":[{"name":"compTimeMonitoringSupport"}, {"name":"currentThreadCpuTimeSupport"}, {"name":"objectMonitorUsageSupport"}, {"name":"otherThreadCpuTimeSupport"}, {"name":"remoteDiagnosticCommandsSupport"}, {"name":"synchronizerUsageSupport"}, {"name":"threadAllocatedMemorySupport"}, {"name":"threadContentionMonitoringSupport"}] | ||
| } | ||
| ] | ||
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,7 @@ | ||
| [ | ||
| { | ||
| "type":"agent-extracted", | ||
| "classes":[ | ||
| ] | ||
| } | ||
| ] |
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 @@ | ||
| [ | ||
| { | ||
| "condition":{"typeReachable":"org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper"}, | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription"] | ||
| }, | ||
| { | ||
| "condition":{"typeReachable":"org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImplConstants"}, | ||
| "interfaces":["net.bytebuddy.description.type.TypeDescription$Generic$AnnotationReader$Delegator$ForLoadedMethodReturnType$Dispatcher"] | ||
| } | ||
| ] |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why there is no
jni-config.jsonwhen such a file was generated (and not empty): https://github.com/oracle/graalvm-reachability-metadata/pull/643/files#diff-864e9e2b44a4eb076f376cfe7f0b0f3c26557a33e847a0dd444429ab22b63558R1