Skip to content
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
16 changes: 5 additions & 11 deletions ci/release/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ pipeline {
configFile(fileId: 'release.config.ssh', targetLocation: "${env.HOME}/.ssh/config"),
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: "${env.HOME}/.ssh/known_hosts")
]) {
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate-ci.frs.sourceforge.net']) {
// set release version
// update changelog from JIRA
// tags the version
Expand Down Expand Up @@ -216,21 +216,15 @@ pipeline {
string(credentialsId: 'release.gpg.passphrase', variable: 'JRELEASER_GPG_PASSPHRASE'),
string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')
]) {
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'jenkins.in.relation.to', 'hibernate-ci.frs.sourceforge.net']) {
sshagent(['ed25519.Hibernate-CI.github.com', 'jenkins.in.relation.to', 'hibernate-ci.frs.sourceforge.net']) {
// performs documentation upload and Sonatype release
// push to github
withEnv([
"DISABLE_REMOTE_GRADLE_CACHE=true"
]) {
def notesFiles = findFiles(glob: 'release_notes.md')
if ( notesFiles.length < 1 ) {
throw new IllegalStateException( "Could not locate `release_notes.md`" )
}
if ( notesFiles.length > 1 ) {
throw new IllegalStateException( "Located more than 1 `release_notes.md`" )
}
def ghReleaseNote = sh(script: 'realpath -e release_notes.md 2>/dev/null', returnStdout: true).trim()

sh ".release/scripts/publish.sh -j --notes=${notesFiles[0].path} ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH} "
sh ".release/scripts/publish.sh -j ${ghReleaseNote != '' ? '--notes=' + ghReleaseNote : ''} ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH} "
}
}
}
Expand Down Expand Up @@ -261,7 +255,7 @@ pipeline {
withCredentials([
gitUsernamePassword(credentialsId: 'username-and-token.Hibernate-CI.github.com', gitToolName: 'Default')
]) {
sshagent( ['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net'] ) {
sshagent( ['ed25519.Hibernate-CI.github.com', 'hibernate-ci.frs.sourceforge.net'] ) {
dir( '.release/hibernate.org' ) {
// Lock to avoid rejected pushes when multiple releases try to clone-commit-push
lock('hibernate.org-git') {
Expand Down
2 changes: 1 addition & 1 deletion design/working/6.0-posts.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Steve Ebersole
:awestruct-tags: ["Hibernate ORM"]
:awestruct-layout: blog-post
:docs-url: https://docs.jboss.org/hibernate/orm/6.0
:docs-url: https://docs.hibernate.org/orm/6.0
:javadocs-url: {docs-url}/javadocs
:migration-guide-url: {docs-url}/migration-guide/migration-guide.html
:user-guide-url: {docs-url}/userguide/html_single/Hibernate_User_Guide.html
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ Recognized Field types are listed below.
| `offset minute` | `Integer` | 0-59 | Minutes of offset | ✖
|===

For a full list of field types, see the Javadoc for https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/query/TemporalUnit.html[`TemporalUnit`].
For a full list of field types, see the Javadoc for https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/query/TemporalUnit.html[`TemporalUnit`].

[source, hql]
----
Expand Down Expand Up @@ -811,7 +811,7 @@ The pattern must be written in a subset of the pattern language defined by Java'
select format(local datetime as 'yyyy-MM-dd HH:mm:ss')
----

For a full list of `format()` pattern elements, see the Javadoc for https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/dialect/Dialect.html#appendDatetimeFormat[`Dialect.appendDatetimeFormat`].
For a full list of `format()` pattern elements, see the Javadoc for https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/dialect/Dialect.html#appendDatetimeFormat[`Dialect.appendDatetimeFormat`].

[[function-trunc-datetime]]
[discrete]
Expand Down
20 changes: 10 additions & 10 deletions documentation/src/main/asciidoc/shared/url-attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@

include::./common-attributes.adoc[]

:doc-base-url: https://docs.jboss.org/hibernate/orm
:doc-base-url: https://docs.hibernate.org/orm
:doc-version-base-url: {doc-base-url}/{majorMinorVersion}
:doc-migration-guide-url: {doc-version-base-url}/migration-guide/migration-guide.html
:doc-migration-guide-url: {doc-version-base-url}/migration-guide/
:doc-quick-start-url: {doc-version-base-url}/quickstart/html_single/
:doc-query-language-url: {doc-version-base-url}/querylanguage/html_single/Hibernate_Query_Language.html
:doc-introduction-url: {doc-version-base-url}/introduction/html_single/Hibernate_Introduction.html
:doc-data-repositories-url: {doc-version-base-url}/repositories/html_single/Hibernate_Data_Repositories.html
:doc-user-guide-url: {doc-version-base-url}/userguide/html_single/Hibernate_User_Guide.html
:doc-query-language-url: {doc-version-base-url}/querylanguage/html_single/
:doc-introduction-url: {doc-version-base-url}/introduction/html_single/
:doc-data-repositories-url: {doc-version-base-url}/repositories/html_single/
:doc-user-guide-url: {doc-version-base-url}/userguide/html_single/
:doc-javadoc-url: {doc-version-base-url}/javadocs/
:doc-topical-url: {doc-version-base-url}/topical/html_single/
:doc-registries-url: {doc-topical-url}/registries/ServiceRegistries.html
:doc-logging-url: {doc-topical-url}/logging/Logging.html
:doc-dialect-url: {doc-version-base-url}/dialect/dialect.html
:doc-registries-url: {doc-topical-url}/registries/
:doc-logging-url: {doc-topical-url}/logging/
:doc-dialect-url: {doc-version-base-url}/dialect/

:report-deprecation-url: {doc-version-base-url}/deprecated/deprecating.txt
:report-incubating-url: {doc-version-base-url}/incubating/incubating.txt
:report-internals-url: {doc-version-base-url}/internals/internal.txt
:report-logging-url: {doc-version-base-url}/logging/logging.html
:report-logging-url: {doc-version-base-url}/logging/
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ But first, let's explore how implicit resolution works and how applications can
====
A thorough discussion of `BasicTypeRegistry` and all the different ways to contribute types is beyond the scope of this documentation.
Please see the http://docs.jboss.org/hibernate/orm/{majorMinorVersion}/integrationguide/html_single/Hibernate_Integration_Guide.html[Integration Guide] for complete details.
Please see the http://docs.hibernate.org/orm/{majorMinorVersion}/integrationguide/html_single/Hibernate_Integration_Guide.html[Integration Guide] for complete details.
====

As an example, take a String attribute such as we saw before with Product#sku.
Expand Down Expand Up @@ -319,4 +319,4 @@ When running the previous test case against the `BitSetUserType` entity mapping,
----
include::{originalextrasdir}/basic/basic-custom-type-BitSetUserType-persistence-sql-example.sql[]
----
====
====
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Besides provider specific configuration, there are a number of configurations op

`hibernate.cache.use_second_level_cache`::
Enable or disable second level caching overall. By default, if the currently configured
https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/cache/spi/RegionFactory.html[`RegionFactory`] is not the `NoCachingRegionFactory`, then the second-level cache is going to be enabled. Otherwise, the second-level cache is disabled.
https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/cache/spi/RegionFactory.html[`RegionFactory`] is not the `NoCachingRegionFactory`, then the second-level cache is going to be enabled. Otherwise, the second-level cache is disabled.
`hibernate.cache.use_query_cache`::
Enable or disable second level caching of query results. The default is false.
`hibernate.cache.query_cache_factory`::
Expand Down Expand Up @@ -120,7 +120,7 @@ transactional::
====
Rather than using a global setting, it is recommended to define the cache concurrency strategy on a per entity basis.
Use the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/Cache.html[`@org.hibernate.annotations.Cache`] annotation for this purpose.
Use the https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/Cache.html[`@org.hibernate.annotations.Cache`] annotation for this purpose.
====

The `@Cache` annotation define three attributes:
Expand Down Expand Up @@ -377,7 +377,7 @@ include::{example-dir-caching}/SecondLevelCacheTest.java[tags=caching-query-regi

[NOTE]
====
When using {jpaJavadocUrlPrefix}CacheStoreMode.html#REFRESH[`CacheStoreMode.REFRESH`] or https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/CacheMode.html#REFRESH[`CacheMode.REFRESH`] in conjunction with the region you have defined for the given query,
When using {jpaJavadocUrlPrefix}CacheStoreMode.html#REFRESH[`CacheStoreMode.REFRESH`] or https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/CacheMode.html#REFRESH[`CacheMode.REFRESH`] in conjunction with the region you have defined for the given query,
Hibernate will selectively force the results cached in that particular region to be refreshed.
This behavior is particularly useful in cases when the underlying data may have been updated via a separate process
Expand Down Expand Up @@ -419,7 +419,7 @@ by placing the annotation on the entity class or the persistent collection attri
[[caching-management]]
=== Managing the cached data

Traditionally, Hibernate defined the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/CacheMode.html[`CacheMode`] enumeration to describe
Traditionally, Hibernate defined the https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/CacheMode.html[`CacheMode`] enumeration to describe
the ways of interactions with the cached data.
Jakarta Persistence split cache modes by storage ({jpaJavadocUrlPrefix}CacheStoreMode.html[`CacheStoreMode`])
and retrieval ({jpaJavadocUrlPrefix}CacheRetrieveMode.html[`CacheRetrieveMode`]).
Expand Down Expand Up @@ -495,7 +495,7 @@ include::{example-dir-caching}/SecondLevelCacheTest.java[tags=caching-management
====

Hibernate is much more flexible in this regard as it offers fine-grained control over what needs to be evicted.
The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/Cache.html[`org.hibernate.Cache`] interface defines various evicting strategies:
The https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/Cache.html[`org.hibernate.Cache`] interface defines various evicting strategies:

- entities (by their class or region)
- entities stored using the natural-id (by their class or region)
Expand All @@ -518,7 +518,7 @@ If you enable the `hibernate.generate_statistics` configuration property,
Hibernate will expose a number of metrics via `SessionFactory.getStatistics()`.
Hibernate can even be configured to expose these statistics via JMX.

This way, you can get access to the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/stat/Statistics.html[`Statistics`] class which comprises all sort of
This way, you can get access to the https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/stat/Statistics.html[`Statistics`] class which comprises all sort of
second-level cache metrics.

[[caching-statistics-example]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ include::{extrasdir}/associations-many-to-any-example.sql[]
[[associations-JoinFormula]]
==== `@JoinFormula` mapping

The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/JoinFormula.html[`@JoinFormula`] annotation is used to customize the join between a child Foreign Key and a parent row Primary Key.
The https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/JoinFormula.html[`@JoinFormula`] annotation is used to customize the join between a child Foreign Key and a parent row Primary Key.

[[associations-JoinFormula-example]]
.`@JoinFormula` mapping usage
Expand Down Expand Up @@ -806,7 +806,7 @@ Therefore, the `@JoinFormula` annotation is used to define a custom join associa
[[associations-JoinColumnOrFormula]]
==== `@JoinColumnOrFormula` mapping

The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/JoinColumnOrFormula.html[`@JoinColumnOrFormula`] annotation is used to customize the join between a child Foreign Key and a parent row Primary Key when we need to take into consideration a column value as well as a `@JoinFormula`.
The https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/JoinColumnOrFormula.html[`@JoinColumnOrFormula`] annotation is used to customize the join between a child Foreign Key and a parent row Primary Key when we need to take into consideration a column value as well as a `@JoinFormula`.

[[associations-JoinColumnOrFormula-example]]
.`@JoinColumnOrFormula` mapping usage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2023,7 +2023,7 @@ include::{example-dir-resources}/mapping/converter/hbm/MoneyConverterHbmTest.hbm
A basic type that's converted by a Jakarta Persistence `AttributeConverter` is immutable if the underlying Java type is immutable
and is mutable if the associated attribute type is mutable as well.

Therefore, mutability is given by the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/type/descriptor/java/JavaType.html#getMutabilityPlan--[`JavaType#getMutabilityPlan`]
Therefore, mutability is given by the https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/type/descriptor/java/JavaType.html#getMutabilityPlan--[`JavaType#getMutabilityPlan`]
of the associated entity attribute type.

This can be adjusted by using `@Immutable` or `@Mutability` on any of:
Expand Down Expand Up @@ -2602,8 +2602,8 @@ include::{example-dir-generated}/temporals/GeneratedUuidTests.java[tags=mapping-
----
====

See https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/ValueGenerationType.html[`@ValueGenerationType`]
and https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/generator/AnnotationValueGeneration.html[`AnnotationBasedGenerator`]
See https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/ValueGenerationType.html[`@ValueGenerationType`]
and https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/generator/AnnotationValueGeneration.html[`AnnotationBasedGenerator`]
for details of each contract


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:core-project-dir: {root-project-dir}/hibernate-core
:core-test-base: {core-project-dir}/src/test/java
:example-dir-collection: {core-test-base}/org/hibernate/orm/test/mapping/collections
:docs-base: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}
:docs-base: https://docs.hibernate.org/orm/{majorMinorVersion}
:javadoc-base: {docs-base}/javadocs
:java-javadoc-base: https://docs.oracle.com/en/java/javase/11/docs/api/java.base
:extrasdir: extras/collections
Expand Down Expand Up @@ -723,7 +723,7 @@ When fetching the collection, Hibernate will use the fetched ordered columns to
[[collections-customizing-ordered-list-ordinal]]
===== Customizing ordered list ordinal

You can customize the ordinal of the underlying ordered list by using the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/ListIndexBase.html[`@ListIndexBase`] annotation.
You can customize the ordinal of the underlying ordered list by using the https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/ListIndexBase.html[`@ListIndexBase`] annotation.

[[collections-customizing-ordered-list-ordinal-mapping-example]]
.`@ListIndexBase` mapping example
Expand Down Expand Up @@ -756,7 +756,7 @@ include::{extrasdir}/collections-customizing-ordered-list-ordinal-persist-exampl
While the Jakarta Persistence
{jpaJavadocUrlPrefix}OrderBy.html[`@OrderBy`] annotation allows you to specify the entity attributes used for sorting
when fetching the current annotated collection, the Hibernate specific
https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/OrderBy.html[`@OrderBy`] annotation is used to specify a *SQL* clause instead.
https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/OrderBy.html[`@OrderBy`] annotation is used to specify a *SQL* clause instead.

In the following example, the `@OrderBy` annotation uses the `CHAR_LENGTH` SQL function to order the `Article` entities
by the number of characters of the `name` attribute.
Expand Down Expand Up @@ -937,7 +937,7 @@ include::{extrasdir}/collections-map-value-type-entity-key-add-example.sql[]
===== Maps with a custom key type

Hibernate defines the
https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/MapKeyType.html[`@MapKeyType`] annotation
https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/MapKeyType.html[`@MapKeyType`] annotation
which you can use to customize the `Map` key type.

Considering you have the following tables in your database:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ Embeddable types that are used as collection entries, map keys or entity type id
[[embeddable-Target]]
==== `@TargetEmbeddable` mapping

The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/TargetEmbeddable.html[`@TargetEmbeddable`] annotation is used to specify the implementation class of an embeddable-valued mapping when the declared type is a non-concrete type (interface, etc).
The https://docs.hibernate.org/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/TargetEmbeddable.html[`@TargetEmbeddable`] annotation is used to specify the implementation class of an embeddable-valued mapping when the declared type is a non-concrete type (interface, etc).

As an example, consider an `@Embedded` attribute (`City.coordinates`) whose declared type (`Coordinates`) is an interface. However, Hibernate needs to know about the concrete type to use, which is `GPS` in this case. The `@TargetEmbeddable` annotation is used to provide this information.

Expand Down Expand Up @@ -764,4 +764,4 @@ Again, the name and the nullability of the `aggregate` column can be refined thr
Mapping <<chapters/domain/collections.adoc#collections,collections>> inside an `@Embeddable` value is supported in most cases. There are a couple exceptions:

* If the values of an <<chapters/domain/collections.adoc#collections-elemental,@ElementCollection>> is of embeddable type, that embeddable cannot contain nested collections;
* Explicitly selecting an embeddable that contains collections in a query is currently not supported (we wouldn't be able to correctly initialize the collection since its owning entity instance would be missing from the Persistence Context).
* Explicitly selecting an embeddable that contains collections in a query is currently not supported (we wouldn't be able to correctly initialize the collection since its owning entity instance would be missing from the Persistence Context).
Loading
Loading