diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index 19b3daf882f5..c8efb63dca8b 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -169,6 +169,7 @@ dependencies { javadocClasspath gradleApi() javadocClasspath libs.jacksonXml javadocClasspath jdbcLibs.oracle + javadocClasspath jdbcLibs.oracleJdbcJacksonOsonExtension } diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/basic_types.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/basic_types.adoc index ba070be46a00..c43473cfe6c4 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/basic_types.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/basic_types.adoc @@ -1356,7 +1356,7 @@ include::{example-dir-basic-mapping}/basic/InetAddressMappingTests.java[tags=bas Hibernate will only use the `JSON` type if explicitly configured through `@JdbcTypeCode( SqlTypes.JSON )`. The JSON library used for serialization/deserialization is detected automatically, but can be overridden by setting `hibernate.type.json_format_mapper` -as can be read in the <> section. +as can be read in the <> section. [[basic-json-example]] .Mapping JSON @@ -1373,7 +1373,7 @@ include::{example-dir-basic-mapping}/basic/JsonMappingTests.java[tags=basic-json Hibernate will only use the `XML` type if explicitly configured through `@JdbcTypeCode( SqlTypes.SQLXML )`. The XML library used for serialization/deserialization is detected automatically, but can be overridden by setting `hibernate.type.xml_format_mapper` -as can be read in the <> section. +as can be read in the <> section. [[basic-xml-example]] .Mapping XML @@ -2425,7 +2425,7 @@ include::{extrasdir}/basic/basic-auto-quoting-persistence-example.sql[indent=0] As you can see, both the table name and all the column have been quoted. -For more about quoting-related configuration properties, check out the <> section as well. +For more about quoting-related configuration properties, check out the <> section as well. diff --git a/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc b/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc index 387e2e33509a..c61996105915 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc @@ -42,7 +42,7 @@ Otherwise, the no-arg form is used. === Driver Configuration `hibernate.connection.driver_class`:: The name of the JDBC Driver class to use `hibernate.connection.url`:: The JDBC connection url -`hibernate.connection.*`:: All such setting names (except the <>) will have the `hibernate.connection.` prefix stripped. The remaining name and the original value will be passed to the driver as a JDBC connection property +`hibernate.connection.*`:: All such setting names (except the <>) will have the `hibernate.connection.` prefix stripped. The remaining name and the original value will be passed to the driver as a JDBC connection property NOTE: Not all properties apply to all situations. For example, if you are providing a data source, `hibernate.connection.driver_class` setting will not be used. @@ -155,7 +155,7 @@ The `Connection` will be acquired as soon as it is needed and will be released a The `Connection` will be acquired as soon as it is needed and will be released after each transaction is completed. If you don't want to use the default connection handling mode, you can specify a connection handling mode via the `hibernate.connection.handling_mode` configuration property. For more details, check out the -<> section. +<> section. ==== Transaction type and connection handling @@ -206,4 +206,4 @@ Hibernate abstracts over variations between dialects of SQL via the class `org.h - Additional community-supported ``Dialect``s are available in the separate module `hibernate-community-dialects`. In Hibernate 6, it's no longer necessary to explicitly specify a dialect using the configuration property `hibernate.dialect`, and so setting that property is now discouraged. -(An exception is the case of custom user-written ``Dialect``s.) \ No newline at end of file +(An exception is the case of custom user-written ``Dialect``s.) diff --git a/documentation/src/main/asciidoc/userguide/chapters/pc/PersistenceContext.adoc b/documentation/src/main/asciidoc/userguide/chapters/pc/PersistenceContext.adoc index 67e935869719..62eef58a76d7 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/pc/PersistenceContext.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/pc/PersistenceContext.adoc @@ -1409,8 +1409,4 @@ Starting with Hibernate 5.2, the Hibernate `Session` extends the Jakarta Persist the `HibernateException` or `SQLException` can be wrapped in a Jakarta Persistence {jpaJavadocUrlPrefix}PersistenceException.html[`PersistenceException`] when thrown by `Session` methods that implement `EntityManager` methods (e.g., https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/Session.html#merge-java.lang.Object-[Session.merge(Object object)], https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/Session.html#flush--[Session.flush()]). - -If your `SessionFactory` is built via Hibernate's native bootstrapping, and you don't want the Hibernate exceptions to be wrapped in the Jakarta Persistence `PersistenceException`, you need to set the -`hibernate.native_exception_handling_51_compliance` configuration property to `true`. See the -<> configuration property for more details. ==== diff --git a/documentation/src/main/asciidoc/userguide/chapters/schema/Schema.adoc b/documentation/src/main/asciidoc/userguide/chapters/schema/Schema.adoc index f6f0b4984781..8db80dacc582 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/schema/Schema.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/schema/Schema.adoc @@ -15,7 +15,7 @@ it's much more flexible to manage the schema using incremental migration scripts ==== Traditionally, the process of generating schema from entity mapping has been called `HBM2DDL`. -To get a list of Hibernate-native and Jakarta Persistence-specific configuration properties consider reading the <> section. +To get a list of Hibernate-native and Jakarta Persistence-specific configuration properties consider reading the <> section. Considering the following Domain Model: