diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..4d1c7e327
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "monthly"
+ groups:
+ workflow-actions:
+ patterns:
+ - "*"
+ allow:
+ - dependency-name: "actions/*"
+ - dependency-name: "redhat-actions/*"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c90f0b9c..f818b94e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,12 +5,20 @@ on:
branches:
- 'main'
- 'wip/**'
+ - '2.*'
+ - '3.*'
+ - '4.*'
tags:
- '2.*'
+ - '3.*'
+ - '4.*'
pull_request:
branches:
- 'main'
- 'wip/**'
+ - '2.*'
+ - '3.*'
+ - '4.*'
# For building snapshots
workflow_call:
inputs:
@@ -45,7 +53,7 @@ jobs:
# Label used to access the service container
mysql:
# Docker Hub image
- image: mysql:8.4.0
+ image: mysql:9.2.0
env:
MYSQL_ROOT_PASSWORD: hreact
MYSQL_DATABASE: hreact
@@ -61,7 +69,7 @@ jobs:
- 3306:3306
postgres:
# Docker Hub image
- image: postgres:16.3
+ image: postgres:17.4
env:
POSTGRES_DB: hreact
POSTGRES_USER: hreact
@@ -76,7 +84,7 @@ jobs:
- 5432:5432
steps:
- name: Checkout ${{ inputs.branch }}
- uses: actions/checkout@v2
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.branch }}
- name: Get year/month for cache key
@@ -85,7 +93,7 @@ jobs:
echo "::set-output name=yearmonth::$(/bin/date -u "+%Y-%m")"
shell: bash
- name: Cache Gradle downloads
- uses: actions/cache@v2
+ uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
id: cache-gradle
with:
path: |
@@ -95,16 +103,23 @@ jobs:
# refresh cache every month to avoid unlimited growth
key: gradle-examples-${{ matrix.db }}-${{ steps.get-date.outputs.yearmonth }}
- name: Set up JDK 11
- uses: actions/setup-java@v2.2.0
+ if: ${{ startsWith( inputs.branch, 'wip/2' ) }}
+ uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: 'temurin'
java-version: 11
+ - name: Set up JDK 17
+ if: ${{ !startsWith( inputs.branch, 'wip/2' ) }}
+ uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+ with:
+ distribution: 'temurin'
+ java-version: 17
- name: Print the effective ORM version used
run: ./gradlew :${{ matrix.example }}:dependencyInsight --dependency org.hibernate.orm:hibernate-core
- name: Run examples in '${{ matrix.example }}' on ${{ matrix.db }}
run: ./gradlew :${{ matrix.example }}:runAllExamplesOn${{ matrix.db }}
- name: Upload reports (if build failed)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
if: failure()
with:
name: reports-examples-${{ matrix.db }}
@@ -118,7 +133,7 @@ jobs:
db: [ 'MariaDB', 'MySQL', 'PostgreSQL', 'MSSQLServer', 'CockroachDB', 'Db2', 'Oracle' ]
steps:
- name: Checkout ${{ inputs.branch }}
- uses: actions/checkout@v2
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.branch }}
- name: Get year/month for cache key
@@ -127,7 +142,7 @@ jobs:
echo "::set-output name=yearmonth::$(/bin/date -u "+%Y-%m")"
shell: bash
- name: Cache Gradle downloads
- uses: actions/cache@v2
+ uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
id: cache-gradle
with:
path: |
@@ -137,16 +152,24 @@ jobs:
# refresh cache every month to avoid unlimited growth
key: gradle-db-${{ matrix.db }}-${{ steps.get-date.outputs.yearmonth }}
- name: Set up JDK 11
- uses: actions/setup-java@v2.2.0
+ if: ${{ startsWith( inputs.branch, 'wip/2' ) }}
+ uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: 'temurin'
java-version: 11
+ - name: Set up JDK 17
+ if: ${{ !startsWith( inputs.branch, 'wip/2' ) }}
+ uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+
+ with:
+ distribution: 'temurin'
+ java-version: 17
- name: Print the effective ORM version used
run: ./gradlew :hibernate-reactive-core:dependencyInsight --dependency org.hibernate.orm:hibernate-core
- name: Build and Test with ${{ matrix.db }}
run: ./gradlew build -PshowStandardOutput -Pdocker -Pdb=${{ matrix.db }}
- name: Upload reports (if build failed)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
if: failure()
with:
name: reports-db-${{ matrix.db }}
@@ -165,19 +188,17 @@ jobs:
# To see the available versions and download links on jdk.java.net:
# https://github.com/oracle-actions/setup-java/blob/main/jdk.java.net-uri.properties
java:
- - { name: "11", java_version_numeric: 11 }
- { name: "17", java_version_numeric: 17 }
# We want to enable preview features when testing newer builds of OpenJDK:
# even if we don't use these features, just enabling them can cause side effects
# and it's useful to test that.
- { name: "20", java_version_numeric: 20, jvm_args: '--enable-preview' }
- { name: "21", java_version_numeric: 21, jvm_args: '--enable-preview' }
- - { name: "23", java_version_numeric: 23, from: 'jdk.java.net', jvm_args: '--enable-preview' }
- - { name: "24-ea", java_version_numeric: 24, from: 'jdk.java.net', jvm_args: '--enable-preview' }
+ - { name: "24", java_version_numeric: 24, from: 'jdk.java.net', jvm_args: '--enable-preview' }
- { name: "25-ea", java_version_numeric: 25, from: 'jdk.java.net', jvm_args: '--enable-preview' }
steps:
- name: Checkout ${{ inputs.branch }}
- uses: actions/checkout@v2
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ inputs.branch }}
- name: Get year/month for cache key
@@ -198,7 +219,7 @@ jobs:
echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
- name: Cache Maven/Gradle Dependency/Dist Caches
id: cache-maven
- uses: actions/cache@v4
+ uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
# if it's not a pull request, we restore and save the cache
if: github.event_name != 'pull_request'
with:
@@ -215,7 +236,7 @@ jobs:
${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
- name: Restore Maven/Gradle Dependency/Dist Caches
- uses: actions/cache/restore@v4
+ uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
# if it's a pull request, we restore the cache, but we don't save it
if: github.event_name == 'pull_request'
with:
@@ -231,13 +252,13 @@ jobs:
- name: Set up latest JDK ${{ matrix.java.name }} from jdk.java.net
if: matrix.java.from == 'jdk.java.net'
- uses: oracle-actions/setup-java@v1
+ uses: oracle-actions/setup-java@2e744f723b003fdd759727d0ff654c8717024845 # v1.4.0
with:
website: jdk.java.net
release: ${{ matrix.java.java_version_numeric }}
- name: Set up latest JDK ${{ matrix.java.name }} from Adoptium
if: matrix.java.from == '' || matrix.java.from == 'adoptium.net'
- uses: actions/setup-java@v2.2.0
+ uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: 'temurin'
java-version: ${{ matrix.java.java_version_numeric }}
@@ -245,13 +266,20 @@ jobs:
- name: Export path to JDK ${{ matrix.java.name }}
id: testjdk-exportpath
run: echo "::set-output name=path::${JAVA_HOME}"
- # Always use JDK 11 to build the main code: that's what we use for releases.
- name: Set up JDK 11
- uses: actions/setup-java@v2.2.0
+ if: ${{ startsWith( inputs.branch, 'wip/2' ) }}
+ uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: 'temurin'
java-version: 11
check-latest: true
+ - name: Set up JDK 17
+ if: ${{ !startsWith( inputs.branch, 'wip/2' ) }}
+ uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+ with:
+ distribution: 'temurin'
+ java-version: 17
+ check-latest: true
- name: Export path to JDK 11
id: mainjdk-exportpath
run: echo "::set-output name=path::${JAVA_HOME}"
@@ -266,7 +294,7 @@ jobs:
-Porg.gradle.java.installations.paths=${{ steps.mainjdk-exportpath.outputs.path }},${{ steps.testjdk-exportpath.outputs.path }} \
${{ matrix.java.jvm_args && '-Ptest.jdk.launcher.args=' }}${{ matrix.java.jvm_args }}
- name: Upload reports (if build failed)
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
if: failure()
with:
name: reports-java${{ matrix.java.name }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 584de137b..0be7d261f 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,7 +2,7 @@ name: "CodeQL"
on:
push:
- branches: [ "main", "1.0", "jakarta/main" ]
+ branches: [ "main", "4.0", "3.0", "2.4" ]
pull_request:
branches: [ "main" ]
schedule:
@@ -24,24 +24,24 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Setup Java
- uses: actions/setup-java@v3
+ uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
with:
distribution: temurin
- java-version: 11
+ java-version: 17
- name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # v3.28.4
with:
languages: ${{ matrix.language }}
queries: +security-and-quality
- name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ uses: github/codeql-action/autobuild@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # v3.28.4
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@7e3036b9cd87fc26dd06747b7aa4b96c27aaef3a # v3.28.4
with:
category: "/language:${{ matrix.language }}"
diff --git a/.github/workflows/scheduler.yml b/.github/workflows/scheduler.yml
index 01f827e22..24299c8a7 100644
--- a/.github/workflows/scheduler.yml
+++ b/.github/workflows/scheduler.yml
@@ -11,7 +11,7 @@ jobs:
build-snapshots:
strategy:
matrix:
- branch: [ 'wip/2.3', 'wip/2.4' ]
+ branch: [ 'wip/2.4', 'wip/3.0', 'wip/4.0' ]
uses: ./.github/workflows/build.yml
with:
branch: ${{ matrix.branch }}
diff --git a/.gitignore b/.gitignore
index 8016117ce..750319d47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,3 @@ bin
# Vim
*.swp
*.swo
-
-# Release scripts downloaded from hibernate/hibernate-release-scripts
-.release
diff --git a/.idea/icon.svg b/.idea/icon.svg
new file mode 100644
index 000000000..2b19df67f
--- /dev/null
+++ b/.idea/icon.svg
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/.release/.gitignore b/.release/.gitignore
new file mode 100644
index 000000000..cdd9a17d6
--- /dev/null
+++ b/.release/.gitignore
@@ -0,0 +1,3 @@
+# The folder into which we checkout our release scripts into
+*
+!.gitignore
\ No newline at end of file
diff --git a/AUTHORS.txt b/AUTHORS.txt
new file mode 100644
index 000000000..caf0817d1
--- /dev/null
+++ b/AUTHORS.txt
@@ -0,0 +1,39 @@
+# This file lists copyright owners of the project.
+# The list is not exhaustive: other copyright owners exist.
+# See CONTRIBUTING.md for instructions regarding how to be added to this list.
+
+# Corporate contributors
+
+Red Hat, Inc.
+
+# Individual contributors
+
+Andrea Boriero
+Andrew Guibert
+Barry LaFond
+Thinking Chen (cdmikechen)
+Coding Xu (codingxu97)
+Conor Farrell
+Davide D'Alto
+Derick Hermanson
+Eric Dalquist
+Eric Deandrea
+Gail Badner
+Gavin King
+George Gastaldi
+Georgios Andrianakis
+Jay Erb
+Julien Ponge
+Marko Bekhta
+Max Rydahl Andersen
+(meepown)
+Nesrin Aşan
+Ravi Khadiwala
+Renar Narubin
+Sanne Grinovero
+Scott Marlow
+Stephane Epardaud
+Steve Ebersole
+Stuart Douglas
+Thomas Segismont
+Yoann Rodière
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..bb825420f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,113 @@
+# Contributing
+
+Contributions from the community are essential in keeping Hibernate (and any Open Source
+project really) strong and successful.
+
+# Legal
+
+All original contributions to Hibernate are licensed under the
+[Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0).
+
+The Apache 2.0 license text is included verbatim in the [LICENSE](LICENSE) file in the root directory
+of the Hibernate Reactive repository.
+
+All contributions are subject to the [Developer Certificate of Origin (DCO)](https://developercertificate.org/).
+
+The DCO text is available verbatim in the [dco.txt](dco.txt) file in the root directory
+of the Hibernate Reactive repository.
+
+Copyright owners are listed in [AUTHORS.txt](AUTHORS.txt).
+Contributors with a valid copyright claim can request to be added to that list
+by sending a pull request to the project's GitHub repository,
+listing at least one relevant contribution in the pull request description.
+Note: one-liner or repetitive patches may not be sufficient to claim copyright.
+
+## Guidelines
+
+While we try to keep requirements for contributing to a minimum, there are a few guidelines
+we ask that you mind.
+
+For code contributions, these guidelines include:
+* Respect the project code style - find templates for [IntelliJ IDEA](https://hibernate.org/community/contribute/intellij-idea/) or [Eclipse](https://hibernate.org/community/contribute/eclipse-ide/)
+* Have a corresponding GitHub [issue](https://github.com/hibernate/hibernate-reactive/issues) and be sure to include
+ the key for this issue in your commit messages.
+* Have a set of appropriate tests.
+ For your convenience, a [set of test templates](https://github.com/hibernate/hibernate-test-case-templates/tree/main/reactive)
+ have been made available.
+
+ When submitting bug reports, the tests should reproduce the initially reported bug and illustrate that your solution addresses the issue.
+ For features/enhancements, the tests should demonstrate that the feature works as intended.
+ In both cases, be sure to incorporate your tests into the project to protect against possible regressions.
+* If applicable, documentation should be updated to reflect the introduced changes
+* The code compiles and the tests pass (`./gradlew clean build`)
+
+For documentation contributions, mainly to respect the project code style, especially in regard
+to the use of tabs - as mentioned above, code style templates are available for both IntelliJ IDEA and Eclipse
+IDEs. Ideally, these contributions would also have a corresponding issue, although this
+is less necessary for documentation contributions.
+
+## Getting Started
+
+If you are just getting started with Git, GitHub, and/or contributing to Hibernate via
+GitHub there are a few pre-requisite steps to follow:
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* [Fork](https://help.github.com/articles/fork-a-repo) the Hibernate Reactive repository. As discussed in
+the linked page, this also includes:
+ * [set up your local git install](https://help.github.com/articles/set-up-git)
+ * clone your fork
+* Instruct git to ignore certain commits when using `git blame`. From the directory of your local clone, run this: `git config blame.ignoreRevsFile .git-blame-ignore-revs`
+* See the wiki pages for setting up your IDE, whether you use
+[IntelliJ IDEA](https://hibernate.org/community/contribute/intellij-idea/)
+or [Eclipse](https://hibernate.org/community/contribute/eclipse-ide/)(1).
+
+
+## Create the working (topic) branch
+
+Create a [topic branch](https://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches)
+on which you will work. The convention is to incorporate the JIRA issue key in the name of this branch,
+although this is more of a mnemonic strategy than a hard-and-fast rule - but doing so helps:
+* Remember what each branch is for
+* Isolate the work from other contributions you may be working on
+
+_If there is not already a GitHub issue covering the work you want to do, [create one](https://github.com/hibernate/hibernate-reactive/issues/new)._
+
+Assuming you will be working from the `main` branch and working
+on the GitHub issue #123 : `git checkout -b 123 main`
+
+## Code
+
+Do your thing!
+
+
+## Commit
+
+* Make commits of logical units
+* Be sure to start each commit message using the ** GitHub issue key **. For example:
+ ```
+ [#1234] Fix some kind of problem
+ ```
+* Make sure you have added the necessary tests for your changes
+* Run _all_ the tests to ensure nothing else was accidentally broken
+
+_Before committing, if you want to pull in the latest upstream changes (highly
+appreciated btw), please use rebasing rather than merging. Merging creates
+"merge commits" that invariably muck up the project timeline._
+
+## Submit
+
+* Push your changes to the topic branch in your fork of the repository
+* Initiate a [pull request](https://help.github.com/articles/creating-a-pull-request)
+* Adding the sentence `Fix #123`, where `#123` is the issue key, will link the pull request to the corresponding issue
+ and close it accordingly, when the pull request gets merged.
+
+It is important that this topic branch of your fork:
+
+* Is isolated to just the work on this one issue, or multiple issues if they are
+ related and also fixed/implemented by this work. The main point is to not push commits for more than
+ one PR to a single branch - GitHub PRs are linked to a branch rather than specific commits
+* remain until the PR is closed. Once the underlying branch is deleted the corresponding PR will be closed,
+ if not already, and the changes will be lost.
+
+# Notes
+(1) Gradle `eclipse` plugin is no longer supported, so the recommended way to import the project in your IDE is with the proper IDE tools/plugins. Don't try to run `./gradlew clean eclipse --refresh-dependencies` from the command line as you'll get an error because `eclipse` no longer exists
diff --git a/README.md b/README.md
index a44faa31b..743540d6c 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
[](https://hibernate.org/reactive)
-[](https://github.com/hibernate/hibernate-reactive/actions?query=workflow%3A%22Hibernate+Reactive+CI%22)
-[](https://opensource.org/licenses/Apache-2.0)
-[](https://search.maven.org/search?q=g:org.hibernate.reactive)
-[](https://hibernate.zulipchat.com/#narrow/stream/205413-hibernate-reactive-dev)
-[](https://hibernate.org/reactive/documentation/)
+[](https://github.com/hibernate/hibernate-reactive/actions?query=workflow%3A%22Hibernate+Reactive+CI%22)
+[](https://opensource.org/licenses/Apache-2.0)
+[](https://search.maven.org/search?q=g:org.hibernate.reactive)
+[](https://hibernate.zulipchat.com/#narrow/stream/205413-hibernate-reactive-dev)
+[](https://hibernate.org/reactive/documentation/)
+[](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/hibernate/reactive/hibernate-reactive/README.md)
# Hibernate Reactive
@@ -29,20 +30,20 @@ Learn more at .
Hibernate Reactive has been tested with:
-- Java 11, 17, 21, 23
+- Java 17, 21, 24
- PostgreSQL 16
-- MySQL 8
+- MySQL 9
- MariaDB 11
-- Db2 11
+- Db2 12
- CockroachDB v24
- MS SQL Server 2022
- Oracle 23
-- [Hibernate ORM][] 6.6.3.Final
-- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.11
-- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.11
-- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.11
-- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.5.11
-- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.5.11
+- [Hibernate ORM][] 7.0.0.Final
+- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 5.0.0
+- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 5.0.0
+- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 5.0.0
+- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 5.0.0
+- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 5.0.0
- [Quarkus][Quarkus] via the Hibernate Reactive extension
[PostgreSQL]: https://www.postgresql.org
diff --git a/build.gradle b/build.gradle
index 5aee62970..f927371ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,15 +12,6 @@ group = "org.hibernate.reactive"
// leverage the ProjectVersion which comes from the `local.versions` plugin
version = project.projectVersion.fullName
-ext {
- if ( !project.hasProperty( 'hibernatePublishUsername' ) ) {
- hibernatePublishUsername = null
- }
- if ( !project.hasProperty( 'hibernatePublishPassword' ) ) {
- hibernatePublishPassword = null
- }
-}
-
// Versions which need to be aligned across modules; this also
// allows overriding the build using a parameter, which can be
// useful to monitor compatibility for upcoming versions on CI:
@@ -31,26 +22,14 @@ ext {
// Example:
// ./gradlew build -PvertxSqlClientVersion=4.0.0-SNAPSHOT
if ( !project.hasProperty( 'vertxSqlClientVersion' ) ) {
- vertxSqlClientVersion = '4.5.11'
+ vertxSqlClientVersion = '5.0.0'
}
- testcontainersVersion = '1.20.4'
+ testcontainersVersion = '1.21.0'
logger.lifecycle "Vert.x SQL Client Version: " + project.vertxSqlClientVersion
}
-// To release, see task ciRelease in release/build.gradle
-// To publish on Sonatype (Maven Central):
-// ./gradlew publishToSonatype closeAndReleaseStagingRepository -PhibernatePublishUsername="" -PhibernatePublishPassword=""
-nexusPublishing {
- repositories {
- sonatype {
- username = project.hibernatePublishUsername
- password = project.hibernatePublishPassword
- }
- }
-}
-
subprojects {
apply plugin: 'java-library'
apply plugin: 'com.diffplug.spotless'
@@ -87,7 +66,7 @@ subprojects {
ext.publishScript = rootProject.rootDir.absolutePath + '/publish.gradle'
- tasks.withType( JavaCompile ) {
+ tasks.withType( JavaCompile ).configureEach {
options.encoding = 'UTF-8'
}
diff --git a/ci/compare-build-results.sh b/ci/compare-build-results.sh
new file mode 100644
index 000000000..6b45022ce
--- /dev/null
+++ b/ci/compare-build-results.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+# This is a simple script to check if builds are reproducible. The steps are:
+# 1. Build Hibernate Reactive with `./gradlew --no-daemon clean publishToMavenLocal --no-build-cache -Dmaven.repo.local=some-path/out/build1`
+# 2. Build Hibernate Reactive with `./gradlew --no-daemon clean publishToMavenLocal --no-build-cache -Dmaven.repo.local=some-path/out/build2` second time pointing to a different local maven repository to publish
+# 3. Compare the build results with sh ./ci/compare-build-results.sh some-path/out/build1 some-path/out/build2
+# 4. The generated .buildcompare file will also contain the diffscope commands to see/compare the problematic build artifacts
+
+outputDir1=$1
+outputDir2=$2
+outputDir1=${outputDir1%/}
+outputDir2=${outputDir2%/}
+
+ok=()
+okFiles=()
+ko=()
+koFiles=()
+
+for f in `find ${outputDir1} -type f | grep -v "javadoc.jar$" | grep -v "maven-metadata-local.xml$" | sort`
+do
+ flocal=${f#$outputDir1}
+ # echo "comparing ${flocal}"
+ sha1=`shasum -a 512 $f | cut -f 1 -d ' '`
+ sha2=`shasum -a 512 $outputDir2$flocal | cut -f 1 -d ' '`
+ # echo "$sha1"
+ # echo "$sha2"
+ if [ "$sha1" = "$sha2" ]; then
+ ok+=($flocal)
+ okFiles+=(${flocal##*/})
+ else
+ ko+=($flocal)
+ koFiles+=(${flocal##*/})
+ fi
+done
+
+# generate .buildcompare
+buildcompare=".buildcompare"
+echo "ok=${#ok[@]}" >> ${buildcompare}
+echo "ko=${#ko[@]}" >> ${buildcompare}
+echo "okFiles=\"${okFiles[@]}\"" >> ${buildcompare}
+echo "koFiles=\"${koFiles[@]}\"" >> ${buildcompare}
+echo "" >> ${buildcompare}
+echo "# see what caused the mismatch in the checksum by executing the following diffscope commands" >> ${buildcompare}
+for f in ${ko[@]}
+do
+ echo "# diffoscope $outputDir1$f $outputDir2$f" >> ${buildcompare}
+done
+
+if [ ${#ko[@]} -eq 0 ]; then
+ exit 0
+else
+ exit 1
+fi
diff --git a/ci/nightly/Jenkinsfile b/ci/nightly/Jenkinsfile
new file mode 100644
index 000000000..945f02606
--- /dev/null
+++ b/ci/nightly/Jenkinsfile
@@ -0,0 +1,49 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+
+@Library('hibernate-jenkins-pipeline-helpers') _
+
+pipeline {
+ agent none
+ triggers {
+ cron '@midnight'
+ }
+ tools {
+ jdk 'OpenJDK 17 Latest'
+ }
+ options {
+ buildDiscarder logRotator(daysToKeepStr: '10', numToKeepStr: '3')
+ disableConcurrentBuilds(abortPrevious: true)
+ overrideIndexTriggers(false)
+ }
+ stages {
+ stage('Build reproducibility check') {
+ agent {
+ label 'Worker&&Containers'
+ }
+ steps {
+ timeout(time: 30, unit: 'MINUTES') {
+ script {
+ def tempDir = pwd(tmp: true)
+ def repo1 = tempDir + '/repo1'
+ def repo2 = tempDir + '/repo2'
+ // build Hibernate Reactive two times without any cache and "publish" the resulting artifacts
+ // to different maven repositories, so that we can compare them afterwards:
+ sh "./gradlew --no-daemon clean publishToMavenLocal --no-build-cache -Dmaven.repo.local=${repo1}"
+ sh "./gradlew --no-daemon clean publishToMavenLocal --no-build-cache -Dmaven.repo.local=${repo2}"
+
+ sh "sh ci/compare-build-results.sh ${repo1} ${repo2}"
+ sh "cat .buildcompare"
+ }
+ }
+ }
+ }
+ }
+ post {
+ always {
+ notifyBuildResult maintainers: 'davide@hibernate.org'
+ }
+ }
+}
diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index bb4315fb8..8627950a1 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -58,10 +58,10 @@ def checkoutReleaseScripts() {
pipeline {
agent {
- label 'Worker&&Containers'
+ label 'Release'
}
tools {
- jdk 'OpenJDK 11 Latest'
+ jdk 'OpenJDK 17 Latest'
}
options {
buildDiscarder logRotator(daysToKeepStr: '30', numToKeepStr: '10')
@@ -73,7 +73,7 @@ pipeline {
string(
name: 'RELEASE_VERSION',
defaultValue: '',
- description: 'The version to be released, e.g. 2.4.0.Final. Mandatory for manual releases, to prevent mistakes.',
+ description: 'The version to be released, e.g. 3.0.0.Beta1. Mandatory for manual releases, to prevent mistakes.',
trim: true
)
string(
@@ -119,8 +119,10 @@ pipeline {
echo "Release was triggered automatically"
// Avoid doing an automatic release for commits from a release
- def lastCommitter = sh(script: 'git show -s --format=\'%an\'', returnStdout: true)
- def secondLastCommitter = sh(script: 'git show -s --format=\'%an\' HEAD~1', returnStdout: true)
+ def lastCommitter = sh(script: 'git show -s --format=\'%an\'', returnStdout: true).trim()
+ def secondLastCommitter = sh(script: 'git show -s --format=\'%an\' HEAD~1', returnStdout: true).trim()
+ echo "Last two commits were performed by '${lastCommitter}'/'${secondLastCommitter}'."
+
if (lastCommitter == 'Hibernate-CI' && secondLastCommitter == 'Hibernate-CI') {
print "INFO: Automatic release skipped because last commits were for the previous release"
currentBuild.result = 'ABORTED'
@@ -149,6 +151,7 @@ pipeline {
env.DEVELOPMENT_VERSION = developmentVersion.toString()
// Dry run is not supported at the moment
env.SCRIPT_OPTIONS = params.RELEASE_DRY_RUN ? "-d" : ""
+ env.JRELEASER_DRY_RUN = params.RELEASE_DRY_RUN
// Determine version id to check if Jira version exists
// This step doesn't work for Hibernate Reactive (the project has been created with a different type on JIRA)
@@ -165,24 +168,17 @@ pipeline {
configFile(fileId: 'release.config.ssh', targetLocation: "${env.HOME}/.ssh/config"),
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: "${env.HOME}/.ssh/known_hosts")
]) {
- withCredentials([
- usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USER'),
- usernamePassword(credentialsId: 'gradle-plugin-portal-api-key', passwordVariable: 'PLUGIN_PORTAL_PASSWORD', usernameVariable: 'PLUGIN_PORTAL_USERNAME'),
- file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
- string(credentialsId: 'release.gpg.passphrase', variable: 'RELEASE_GPG_PASSPHRASE')
- ]) {
- sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
- // set release version
- // update changelog from JIRA
- // tags the version
- // changes the version to the provided development version
- withEnv([
- "BRANCH=${env.GIT_BRANCH}",
- // Increase the amount of memory for this part since asciidoctor doc rendering consumes a lot of metaspace
- "GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'"
- ]) {
- sh ".release/scripts/prepare-release.sh ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION}"
- }
+
+ sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
+ // set release version
+ // update changelog from JIRA
+ // tags the version
+ // changes the version to the provided development version
+ withEnv([
+ // Increase the amount of memory for this part since asciidoctor doc rendering consumes a lot of metaspace
+ "GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'"
+ ]) {
+ sh ".release/scripts/prepare-release.sh -j -b ${env.GIT_BRANCH} -v ${env.DEVELOPMENT_VERSION} ${env.PROJECT} ${env.RELEASE_VERSION}"
}
}
}
@@ -199,16 +195,22 @@ pipeline {
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: "${env.HOME}/.ssh/known_hosts")
]) {
withCredentials([
- usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USER'),
- usernamePassword(credentialsId: 'gradle-plugin-portal-api-key', passwordVariable: 'PLUGIN_PORTAL_PASSWORD', usernameVariable: 'PLUGIN_PORTAL_USERNAME'),
+ // TODO: Once we switch to maven-central publishing (from nexus2) we need to add a new credentials
+ // to use the following env variable names to set the user/password:
+ // - JRELEASER_MAVENCENTRAL_USERNAME
+ // - JRELEASER_MAVENCENTRAL_TOKEN
+ // Also use the new `credentialsId` for Maven Central, e.g.:
+ // usernamePassword(credentialsId: '???????', passwordVariable: 'JRELEASER_MAVENCENTRAL_TOKEN', usernameVariable: 'JRELEASER_MAVENCENTRAL_USERNAME'),
+ usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'JRELEASER_NEXUS2_PASSWORD', usernameVariable: 'JRELEASER_NEXUS2_USERNAME'),
+ gitUsernamePassword(credentialsId: 'username-and-token.Hibernate-CI.github.com', gitToolName: 'Default'),
file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
- string(credentialsId: 'release.gpg.passphrase', variable: 'RELEASE_GPG_PASSPHRASE'),
- gitUsernamePassword(credentialsId: 'username-and-token.Hibernate-CI.github.com', gitToolName: 'Default')
+ 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', 'hibernate-ci.frs.sourceforge.net']) {
// performs documentation upload and Sonatype release
// push to github
- sh ".release/scripts/publish.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH}"
+ sh ".release/scripts/publish.sh -j ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH}"
}
}
}
@@ -223,4 +225,4 @@ pipeline {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/ci/snapshot-publish.Jenkinsfile b/ci/snapshot-publish.Jenkinsfile
index c95f6663f..fea160b23 100644
--- a/ci/snapshot-publish.Jenkinsfile
+++ b/ci/snapshot-publish.Jenkinsfile
@@ -10,12 +10,20 @@ if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
return
}
+def checkoutReleaseScripts() {
+ dir('.release/scripts') {
+ checkout scmGit(branches: [[name: '*/main']], extensions: [],
+ userRemoteConfigs: [[credentialsId: 'ed25519.Hibernate-CI.github.com',
+ url: 'https://github.com/hibernate/hibernate-release-scripts.git']])
+ }
+}
+
pipeline {
agent {
- label 'Fedora'
+ label 'Release'
}
tools {
- jdk 'OpenJDK 11 Latest'
+ jdk 'OpenJDK 17 Latest'
}
options {
rateLimitBuilds(throttle: [count: 1, durationName: 'hour', userBoost: true])
@@ -30,16 +38,23 @@ pipeline {
}
stage('Publish') {
steps {
- withCredentials([
- usernamePassword(credentialsId: 'ossrh.sonatype.org', usernameVariable: 'hibernatePublishUsername', passwordVariable: 'hibernatePublishPassword'),
- string(credentialsId: 'release.gpg.passphrase', variable: 'SIGNING_PASS'),
- file(credentialsId: 'release.gpg.private-key', variable: 'SIGNING_KEYRING')
- ]) {
- sh '''./gradlew clean publish \
- -PhibernatePublishUsername=$hibernatePublishUsername \
- -PhibernatePublishPassword=$hibernatePublishPassword \
- --no-scan \
- '''
+ script {
+ withCredentials([
+ // https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
+ // TODO: Once we switch to maven-central publishing (from nexus2) we need to update credentialsId:
+ // https://docs.gradle.org/current/samples/sample_publishing_credentials.html#:~:text=via%20environment%20variables
+ usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'ORG_GRADLE_PROJECT_snapshotsPassword', usernameVariable: 'ORG_GRADLE_PROJECT_snapshotsUsername'),
+ gitUsernamePassword(credentialsId: 'username-and-token.Hibernate-CI.github.com', gitToolName: 'Default'),
+ string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')
+ ]) {
+ checkoutReleaseScripts()
+ def version = sh(
+ script: ".release/scripts/determine-current-version.sh reactive",
+ returnStdout: true
+ ).trim()
+ echo "Current version: '${version}'"
+ sh "bash -xe .release/scripts/snapshot-deploy.sh reactive ${version}"
+ }
}
}
}
@@ -51,4 +66,4 @@ pipeline {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/documentation/src/main/asciidoc/reference/introduction.adoc b/documentation/src/main/asciidoc/reference/introduction.adoc
index 40b4847bc..ee5090c21 100644
--- a/documentation/src/main/asciidoc/reference/introduction.adoc
+++ b/documentation/src/main/asciidoc/reference/introduction.adoc
@@ -89,7 +89,7 @@ Optionally, you might also add any of the following additional features:
| Hibernate Validator | `org.hibernate.validator:hibernate-validator` and `org.glassfish:jakarta.el`
| Compile-time checking for your HQL queries | `org.hibernate:query-validator`
| Second-level cache support via JCache and EHCache | `org.hibernate.orm:hibernate-jcache` along with `org.ehcache:ehcache`
-| SCRAM authentication support for PostgreSQL | `com.ongres.scram:client:2.1`
+| SCRAM authentication support for PostgreSQL | `com.ongres.scram:scram-client:3.1`
|===
You might also add the Hibernate {enhancer}[bytecode enhancer] to your
@@ -578,8 +578,8 @@ custom reactive identifier generator.
=== JSON Mapping
-:orm-json-basic-mapping: https://docs.jboss.org/hibernate/orm/6.6/userguide/html_single/Hibernate_User_Guide.html#basic-mapping-json
-:orm-json-embeddable-mapping: https://docs.jboss.org/hibernate/orm/6.6/userguide/html_single/Hibernate_User_Guide.html#_jsonxml_aggregate_embeddable_mapping
+:orm-json-basic-mapping: https://docs.jboss.org/hibernate/orm/7.0/userguide/html_single/Hibernate_User_Guide.html#basic-mapping-json
+:orm-json-embeddable-mapping: https://docs.jboss.org/hibernate/orm/7.0/userguide/html_single/Hibernate_User_Guide.html#_jsonxml_aggregate_embeddable_mapping
:string-to-json-converter: https://github.com/hibernate/hibernate-reactive/blob/main/hibernate-reactive-core/src/test/java/org/hibernate/reactive/types/StringToJsonConverter.java
Like in Hibernate ORM, it's possible to map a JSON field using the {orm-json-basic-mapping}[SqlTypes.JSON]
diff --git a/examples/native-sql-example/build.gradle b/examples/native-sql-example/build.gradle
index fabdbc7fa..3b650d34a 100644
--- a/examples/native-sql-example/build.gradle
+++ b/examples/native-sql-example/build.gradle
@@ -27,7 +27,7 @@ dependencies {
implementation project( ':hibernate-reactive-core' )
// Hibernate Validator (optional)
- implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
+ implementation 'org.hibernate.validator:hibernate-validator:8.0.2.Final'
runtimeOnly 'org.glassfish.expressly:expressly:5.0.0'
// JPA metamodel generation for criteria queries (optional)
@@ -40,7 +40,7 @@ dependencies {
runtimeOnly "org.apache.logging.log4j:log4j-core:2.20.0"
// Allow authentication to PostgreSQL using SCRAM:
- runtimeOnly 'com.ongres.scram:client:2.1'
+ runtimeOnly 'com.ongres.scram:scram-client:3.1'
}
// Optional: enable the bytecode enhancements
diff --git a/examples/native-sql-example/src/main/resources/META-INF/persistence.xml b/examples/native-sql-example/src/main/resources/META-INF/persistence.xml
index aaa9d3687..686442cb2 100644
--- a/examples/native-sql-example/src/main/resources/META-INF/persistence.xml
+++ b/examples/native-sql-example/src/main/resources/META-INF/persistence.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
version="3.0">
-
+
org.hibernate.reactive.provider.ReactivePersistenceProvider
org.hibernate.reactive.example.nativesql.Author
diff --git a/examples/session-example/build.gradle b/examples/session-example/build.gradle
index 7cf7fb5f6..a001112d8 100644
--- a/examples/session-example/build.gradle
+++ b/examples/session-example/build.gradle
@@ -27,7 +27,7 @@ dependencies {
implementation project( ':hibernate-reactive-core' )
// Hibernate Validator (optional)
- implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
+ implementation 'org.hibernate.validator:hibernate-validator:8.0.2.Final'
runtimeOnly 'org.glassfish.expressly:expressly:5.0.0'
// JPA metamodel generation for criteria queries (optional)
@@ -41,7 +41,7 @@ dependencies {
runtimeOnly "org.apache.logging.log4j:log4j-core:2.20.0"
// Allow authentication to PostgreSQL using SCRAM:
- runtimeOnly 'com.ongres.scram:client:2.1'
+ runtimeOnly 'com.ongres.scram:scram-client:3.1'
}
// Optional: enable the bytecode enhancements
diff --git a/examples/session-example/src/main/resources/META-INF/persistence.xml b/examples/session-example/src/main/resources/META-INF/persistence.xml
index 7c2c13900..f3271f251 100644
--- a/examples/session-example/src/main/resources/META-INF/persistence.xml
+++ b/examples/session-example/src/main/resources/META-INF/persistence.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
version="3.0">
-
+
org.hibernate.reactive.provider.ReactivePersistenceProvider
org.hibernate.reactive.example.session.Author
diff --git a/gradle.properties b/gradle.properties
index 55ec51fc8..36bc0c5ac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -35,21 +35,21 @@ org.gradle.java.installations.auto-download=false
#enableMavenLocalRepo = true
# The default Hibernate ORM version (override using `-PhibernateOrmVersion=the.version.you.want`)
-hibernateOrmVersion = 6.6.3.Final
+hibernateOrmVersion = 7.0.0.Final
# Override default Hibernate ORM Gradle plugin version
# Using the stable version because I don't know how to configure the build to download the snapshot version from
# a remote repository
-#hibernateOrmGradlePluginVersion = 6.6.3.Final
+#hibernateOrmGradlePluginVersion = 7.0.0.Final
# If set to true, skip Hibernate ORM version parsing (default is true, if set to null)
# this is required when using intervals or weird versions or the build will fail
#skipOrmVersionParsing = true
# Override default Vert.x Sql client version
-#vertxSqlClientVersion = 4.5.11-SNAPSHOT
+#vertxSqlClientVersion = 5.0.0-SNAPSHOT
# Override default Vert.x Web client and server versions. For integration tests, both default to vertxSqlClientVersion
-#vertxWebVersion = 4.5.11
-#vertxWebtClientVersion = 4.5.11
+#vertxWebVersion = 5.0.0
+#vertxWebtClientVersion = 5.0.0
diff --git a/gradle/version.properties b/gradle/version.properties
index dd20a5fa4..618fb2d72 100644
--- a/gradle/version.properties
+++ b/gradle/version.properties
@@ -1 +1 @@
-projectVersion=2.4.3-SNAPSHOT
\ No newline at end of file
+projectVersion=4.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd4917..a4b76b953 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9355b4155..cea7a793a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a426..f5feea6d6 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# SPDX-License-Identifier: Apache-2.0
+#
##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85be..9b42019c7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
diff --git a/hibernate-reactive-core/build.gradle b/hibernate-reactive-core/build.gradle
index bbcbc9e6c..26a4de751 100644
--- a/hibernate-reactive-core/build.gradle
+++ b/hibernate-reactive-core/build.gradle
@@ -10,21 +10,22 @@ dependencies {
api "org.hibernate.orm:hibernate-core:${hibernateOrmVersion}"
- api 'io.smallrye.reactive:mutiny:2.7.0'
+ api 'io.smallrye.reactive:mutiny:2.9.0'
//Logging
- implementation 'org.jboss.logging:jboss-logging:3.5.0.Final'
- compileOnly 'org.jboss.logging:jboss-logging-annotations:2.2.1.Final'
+ implementation 'org.jboss.logging:jboss-logging:3.6.1.Final'
+ annotationProcessor 'org.jboss.logging:jboss-logging:3.6.1.Final'
+
+ compileOnly 'org.jboss.logging:jboss-logging-annotations:3.0.4.Final'
+ annotationProcessor 'org.jboss.logging:jboss-logging-annotations:3.0.4.Final'
+ annotationProcessor 'org.jboss.logging:jboss-logging-processor:3.0.4.Final'
- annotationProcessor 'org.jboss.logging:jboss-logging:3.5.0.Final'
- annotationProcessor 'org.jboss.logging:jboss-logging-annotations:2.2.1.Final'
- annotationProcessor 'org.jboss.logging:jboss-logging-processor:2.2.1.Final'
//Specific implementation details of Hibernate Reactive:
implementation "io.vertx:vertx-sql-client:${vertxSqlClientVersion}"
// Testing
- testImplementation 'org.assertj:assertj-core:3.26.3'
+ testImplementation 'org.assertj:assertj-core:3.27.3'
testImplementation "io.vertx:vertx-junit5:${vertxSqlClientVersion}"
// Drivers
@@ -38,23 +39,23 @@ dependencies {
testImplementation "io.vertx:vertx-micrometer-metrics:${vertxSqlClientVersion}"
// Optional dependency of vertx-pg-client, essential when connecting via SASL SCRAM
- testImplementation 'com.ongres.scram:client:2.1'
+ testImplementation 'com.ongres.scram:scram-client:3.1'
// JUnit Jupiter
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
// JDBC driver to test with ORM and PostgreSQL
- testRuntimeOnly "org.postgresql:postgresql:42.7.4"
+ testRuntimeOnly "org.postgresql:postgresql:42.7.5"
// JDBC driver for Testcontainers with MS SQL Server
- testRuntimeOnly "com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre11"
+ testRuntimeOnly "com.microsoft.sqlserver:mssql-jdbc:12.10.0.jre11"
// JDBC driver for Testcontainers with MariaDB Server
- testRuntimeOnly "org.mariadb.jdbc:mariadb-java-client:3.5.1"
+ testRuntimeOnly "org.mariadb.jdbc:mariadb-java-client:3.5.3"
// JDBC driver for Testcontainers with MYSQL Server
- testRuntimeOnly "com.mysql:mysql-connector-j:9.1.0"
+ testRuntimeOnly "com.mysql:mysql-connector-j:9.3.0"
// JDBC driver for Db2 server, for testing
testRuntimeOnly "com.ibm.db2:jcc:12.1.0.0"
@@ -80,6 +81,15 @@ dependencies {
testImplementation "org.testcontainers:oracle-xe:${testcontainersVersion}"
}
+// Reproducible Builds
+
+// https://docs.gradle.org/current/userguide/working_with_files.html#sec:reproducible_archives
+// Configure archive tasks to produce reproducible archives:
+tasks.withType(AbstractArchiveTask).configureEach {
+ preserveFileTimestamps = false
+ reproducibleFileOrder = true
+}
+
// Print a summary of the results of the tests (number of failures, successes and skipped)
def loggingSummary(db, result, desc) {
if ( !desc.parent ) { // will match the outermost suite
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/engine/internal/ReactivePersistenceContextAdapter.java b/hibernate-reactive-core/src/main/java/org/hibernate/engine/internal/ReactivePersistenceContextAdapter.java
new file mode 100644
index 000000000..6d87416b4
--- /dev/null
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/engine/internal/ReactivePersistenceContextAdapter.java
@@ -0,0 +1,799 @@
+/* Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.engine.internal;
+
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletionStage;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import org.hibernate.HibernateException;
+import org.hibernate.Internal;
+import org.hibernate.LockMode;
+import org.hibernate.collection.spi.PersistentCollection;
+import org.hibernate.engine.spi.BatchFetchQueue;
+import org.hibernate.engine.spi.CollectionEntry;
+import org.hibernate.engine.spi.CollectionKey;
+import org.hibernate.engine.spi.EntityEntry;
+import org.hibernate.engine.spi.EntityHolder;
+import org.hibernate.engine.spi.EntityKey;
+import org.hibernate.engine.spi.EntityUniqueKey;
+import org.hibernate.engine.spi.NaturalIdResolutions;
+import org.hibernate.engine.spi.PersistenceContext;
+import org.hibernate.engine.spi.PersistentAttributeInterceptable;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.engine.spi.Status;
+import org.hibernate.event.service.spi.EventListenerGroup;
+import org.hibernate.event.spi.PostLoadEvent;
+import org.hibernate.event.spi.PostLoadEventListener;
+import org.hibernate.persister.collection.CollectionPersister;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.reactive.engine.impl.ReactiveCallbackImpl;
+import org.hibernate.reactive.engine.spi.ReactiveSharedSessionContractImplementor;
+import org.hibernate.reactive.logging.impl.Log;
+import org.hibernate.reactive.persister.entity.impl.ReactiveEntityPersister;
+import org.hibernate.sql.exec.spi.Callback;
+import org.hibernate.sql.results.graph.entity.EntityInitializer;
+import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
+import org.hibernate.sql.results.spi.LoadContexts;
+
+import static java.lang.invoke.MethodHandles.lookup;
+import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
+import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
+import static org.hibernate.reactive.util.impl.CompletionStages.loop;
+import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
+
+/**
+ * Add reactive methods to a {@link PersistenceContext}.
+ */
+public class ReactivePersistenceContextAdapter implements PersistenceContext {
+
+ private static final Log LOG = make( Log.class, lookup() );
+
+ private final PersistenceContext delegate;
+
+ /**
+ * Constructs a PersistentContext, bound to the given session.
+ */
+ public ReactivePersistenceContextAdapter(PersistenceContext persistenceContext) {
+ this.delegate = persistenceContext;
+ }
+
+ public CompletionStage reactiveInitializeNonLazyCollections() throws HibernateException {
+ final NonLazyCollectionInitializer initializer = new NonLazyCollectionInitializer();
+ delegate.initializeNonLazyCollections( initializer );
+ return initializer.stage;
+ }
+
+ private class NonLazyCollectionInitializer implements Consumer> {
+ CompletionStage stage = voidFuture();
+
+ @Override
+ public void accept(PersistentCollection nonLazyCollection) {
+ if ( !nonLazyCollection.wasInitialized() ) {
+ stage = stage.thenCompose( v ->
+ ( (ReactiveSharedSessionContractImplementor) getSession() )
+ .reactiveInitializeCollection( nonLazyCollection, false ) );
+ }
+ }
+ }
+
+ /**
+ * @deprecated use {@link #reactiveInitializeNonLazyCollections} instead.
+ */
+ @Deprecated
+ @Override
+ public void initializeNonLazyCollections() {
+ // still called by ResultSetProcessorImpl, so can't throw UnsupportedOperationException
+ }
+
+ @Override
+ public void initializeNonLazyCollections(Consumer> initializeAction) {
+ throw LOG.nonReactiveMethodCall( "reactiveInitializeNonLazyCollection" );
+ }
+
+ @Deprecated
+ @Override
+ public Object[] getDatabaseSnapshot(Object id, EntityPersister persister) throws HibernateException {
+ throw LOG.nonReactiveMethodCall( "reactiveGetDatabaseSnapshot" );
+ }
+
+ private static final Object[] NO_ROW = new Object[] {StatefulPersistenceContext.NO_ROW};
+
+ public CompletionStage reactiveGetDatabaseSnapshot(Object id, EntityPersister persister) throws HibernateException {
+ SessionImplementor session = (SessionImplementor) getSession();
+ final EntityKey key = session.generateEntityKey( id, persister );
+ final Object[] cached = getEntitySnapshotsByKey() == null
+ ? null
+ : (Object[]) getEntitySnapshotsByKey().get( key );
+ if ( cached != null ) {
+ return completedFuture( cached == NO_ROW ? null : cached );
+ }
+ else {
+ return ( (ReactiveEntityPersister) persister )
+ .reactiveGetDatabaseSnapshot( id, session )
+ .thenApply( snapshot -> {
+ getOrInitializeEntitySnapshotsByKey().put( key, snapshot );
+ return snapshot;
+ } );
+ }
+ }
+
+ @Override
+ public boolean isStateless() {
+ return delegate.isStateless();
+ }
+
+ @Override
+ public SharedSessionContractImplementor getSession() {
+ return delegate.getSession();
+ }
+
+ @Override
+ public LoadContexts getLoadContexts() {
+ return delegate.getLoadContexts();
+ }
+
+ @Override
+ public boolean hasLoadContext() {
+ return delegate.hasLoadContext();
+ }
+
+ @Override
+ public PersistentCollection useUnownedCollection(CollectionKey key) {
+ return delegate.useUnownedCollection( key );
+ }
+
+ @Override
+ public BatchFetchQueue getBatchFetchQueue() {
+ return delegate.getBatchFetchQueue();
+ }
+
+ @Override
+ public void clear() {
+ delegate.clear();
+ }
+
+ @Override
+ public void setEntryStatus(EntityEntry entry, Status status) {
+ delegate.setEntryStatus( entry, status );
+ }
+
+ @Override
+ public void afterTransactionCompletion() {
+ delegate.afterTransactionCompletion();
+ }
+
+ @Override
+ public Object[] getCachedDatabaseSnapshot(EntityKey key) {
+ return delegate.getCachedDatabaseSnapshot( key );
+ }
+
+ @Override
+ public Object getNaturalIdSnapshot(Object id, EntityPersister persister) {
+ return delegate.getNaturalIdSnapshot( id, persister );
+ }
+
+ @Override
+ public void addEntity(EntityKey key, Object entity) {
+ delegate.addEntity( key, entity );
+ }
+
+ @Override
+ public Object getEntity(EntityKey key) {
+ return delegate.getEntity( key );
+ }
+
+ @Override
+ public boolean containsEntity(EntityKey key) {
+ return delegate.containsEntity( key );
+ }
+
+ @Override
+ public Object removeEntity(EntityKey key) {
+ return delegate.removeEntity( key );
+ }
+
+ @Override
+ public void addEntity(EntityUniqueKey euk, Object entity) {
+ delegate.addEntity( euk, entity );
+ }
+
+ @Override
+ public Object getEntity(EntityUniqueKey euk) {
+ return delegate.getEntity( euk );
+ }
+
+ @Override
+ public EntityEntry getEntry(Object entity) {
+ return delegate.getEntry( entity );
+ }
+
+ @Override
+ public EntityEntry removeEntry(Object entity) {
+ return delegate.removeEntry( entity );
+ }
+
+ @Override
+ public boolean isEntryFor(Object entity) {
+ return delegate.isEntryFor( entity );
+ }
+
+ @Override
+ public CollectionEntry getCollectionEntry(PersistentCollection coll) {
+ return delegate.getCollectionEntry( coll );
+ }
+
+ @Override
+ public EntityEntry addEntity(
+ Object entity,
+ Status status,
+ Object[] loadedState,
+ EntityKey entityKey,
+ Object version,
+ LockMode lockMode,
+ boolean existsInDatabase,
+ EntityPersister persister,
+ boolean disableVersionIncrement) {
+ return delegate.addEntity(
+ entity,
+ status,
+ loadedState,
+ entityKey,
+ version,
+ lockMode,
+ existsInDatabase,
+ persister,
+ disableVersionIncrement
+ );
+ }
+
+ @Override
+ public EntityEntry addEntry(
+ Object entity,
+ Status status,
+ Object[] loadedState,
+ Object rowId,
+ Object id,
+ Object version,
+ LockMode lockMode,
+ boolean existsInDatabase,
+ EntityPersister persister,
+ boolean disableVersionIncrement) {
+ return delegate.addEntry(
+ entity,
+ status,
+ loadedState,
+ rowId,
+ id,
+ version,
+ lockMode,
+ existsInDatabase,
+ persister,
+ disableVersionIncrement
+ );
+ }
+
+ @Override
+ public EntityEntry addReferenceEntry(Object entity, Status status) {
+ return delegate.addReferenceEntry( entity, status );
+ }
+
+ @Override
+ public boolean containsCollection(PersistentCollection collection) {
+ return delegate.containsCollection( collection );
+ }
+
+ @Override
+ public boolean containsProxy(Object proxy) {
+ return delegate.containsProxy( proxy );
+ }
+
+ @Override
+ public boolean reassociateIfUninitializedProxy(Object value) {
+ return delegate.reassociateIfUninitializedProxy( value );
+ }
+
+ @Override
+ public void reassociateProxy(Object value, Object id) {
+ delegate.reassociateProxy( value, id );
+ }
+
+ @Override
+ public Object unproxy(Object maybeProxy) {
+ return delegate.unproxy( maybeProxy );
+ }
+
+ @Override
+ public Object unproxyAndReassociate(Object maybeProxy) {
+ return delegate.unproxyAndReassociate( maybeProxy );
+ }
+
+ @Override
+ public void checkUniqueness(EntityKey key, Object object) {
+ delegate.checkUniqueness( key, object );
+ }
+
+ @Override
+ public Object narrowProxy(Object proxy, EntityPersister persister, EntityKey key, Object object) {
+ return delegate.narrowProxy( proxy, persister, key, object );
+ }
+
+ @Override
+ public Object proxyFor(EntityPersister persister, EntityKey key, Object impl) {
+ return delegate.proxyFor( persister, key, impl );
+ }
+
+ @Override
+ public Object proxyFor(Object impl) {
+ return delegate.proxyFor( impl );
+ }
+
+ @Override
+ public Object proxyFor(EntityHolder holder, EntityPersister persister) {
+ return delegate.proxyFor( holder, persister );
+ }
+
+ @Override
+ public void addEnhancedProxy(EntityKey key, PersistentAttributeInterceptable entity) {
+ delegate.addEnhancedProxy( key, entity );
+ }
+
+ @Override
+ public Object getCollectionOwner(Object key, CollectionPersister collectionPersister) {
+ return delegate.getCollectionOwner( key, collectionPersister );
+ }
+
+ @Override
+ public Object getLoadedCollectionOwnerOrNull(PersistentCollection collection) {
+ return delegate.getLoadedCollectionOwnerOrNull( collection );
+ }
+
+ @Override
+ public Object getLoadedCollectionOwnerIdOrNull(PersistentCollection collection) {
+ return delegate.getLoadedCollectionOwnerIdOrNull( collection );
+ }
+
+ @Override
+ public void addUninitializedCollection(CollectionPersister persister, PersistentCollection collection, Object id) {
+ delegate.addUninitializedCollection( persister, collection, id );
+ }
+
+ @Override
+ public void addUninitializedDetachedCollection(CollectionPersister persister, PersistentCollection collection) {
+ delegate.addUninitializedDetachedCollection( persister, collection );
+ }
+
+ @Override
+ public void addNewCollection(CollectionPersister persister, PersistentCollection collection) {
+ delegate.addNewCollection( persister, collection );
+ }
+
+ @Override
+ public void addInitializedDetachedCollection(CollectionPersister collectionPersister, PersistentCollection collection) {
+ delegate.addInitializedDetachedCollection( collectionPersister, collection );
+ }
+
+ @Override
+ public void replaceCollection(CollectionPersister persister, PersistentCollection oldCollection, PersistentCollection collection) {
+ delegate.replaceCollection( persister, oldCollection, collection );
+ }
+
+ @Override
+ public CollectionEntry addInitializedCollection(CollectionPersister persister, PersistentCollection collection, Object id) {
+ return delegate.addInitializedCollection( persister, collection, id );
+ }
+
+ @Override
+ public PersistentCollection getCollection(CollectionKey collectionKey) {
+ return delegate.getCollection( collectionKey );
+ }
+
+ @Override
+ public void addNonLazyCollection(PersistentCollection collection) {
+ delegate.addNonLazyCollection( collection );
+ }
+
+ @Override
+ public PersistentCollection getCollectionHolder(Object array) {
+ return delegate.getCollectionHolder( array );
+ }
+
+ @Override
+ public void addCollectionHolder(PersistentCollection holder) {
+ delegate.addCollectionHolder( holder );
+ }
+
+ @Override
+ public PersistentCollection removeCollectionHolder(Object array) {
+ return delegate.removeCollectionHolder( array );
+ }
+
+ @Override
+ public Serializable getSnapshot(PersistentCollection coll) {
+ return delegate.getSnapshot( coll );
+ }
+
+ @Override
+ public Object getProxy(EntityKey key) {
+ return delegate.getProxy( key );
+ }
+
+ @Override
+ public void addProxy(EntityKey key, Object proxy) {
+ delegate.addProxy( key, proxy );
+ }
+
+ @Override
+ public Object removeProxy(EntityKey key) {
+ return delegate.removeProxy( key );
+ }
+
+ @Override
+ public EntityHolder claimEntityHolderIfPossible(EntityKey key, Object entity, JdbcValuesSourceProcessingState processingState, EntityInitializer initializer) {
+ return delegate.claimEntityHolderIfPossible( key, entity, processingState, initializer );
+ }
+
+ @Override
+ public EntityHolder addEntityHolder(EntityKey key, Object entity) {
+ return delegate.addEntityHolder( key, entity );
+ }
+
+ @Override
+ public EntityHolder getEntityHolder(EntityKey key) {
+ return delegate.getEntityHolder( key );
+ }
+
+ @Override
+ public boolean containsEntityHolder(EntityKey key) {
+ return delegate.containsEntityHolder( key );
+ }
+
+ @Override
+ public EntityHolder removeEntityHolder(EntityKey key) {
+ return delegate.removeEntityHolder( key );
+ }
+
+ @Override
+ public void postLoad(JdbcValuesSourceProcessingState processingState, Consumer loadedConsumer) {
+ throw LOG.nonReactiveMethodCall( "reactivePostLoad(JdbcValuesSourceProcessingState, Consumer) )" );
+ }
+
+ @Internal
+ @Override
+ public Map getEntitiesByKey() {
+ return delegate.getEntitiesByKey();
+ }
+
+ @Internal
+ @Override
+ public Map getEntityHoldersByKey() {
+ return delegate.getEntityHoldersByKey();
+ }
+
+ @Override
+ public Map.Entry[] reentrantSafeEntityEntries() {
+ return delegate.reentrantSafeEntityEntries();
+ }
+
+ @Override
+ public int getNumberOfManagedEntities() {
+ return delegate.getNumberOfManagedEntities();
+ }
+
+ @Internal
+ @Override
+ public Map, CollectionEntry> getCollectionEntries() {
+ return delegate.getCollectionEntries();
+ }
+
+ @Override
+ public void forEachCollectionEntry(BiConsumer, CollectionEntry> action, boolean concurrent) {
+ delegate.forEachCollectionEntry( action, concurrent );
+ }
+
+ @Deprecated
+ @Override
+ public Map> getCollectionsByKey() {
+ return delegate.getCollectionsByKey();
+ }
+
+ @Override
+ public int getCascadeLevel() {
+ return delegate.getCascadeLevel();
+ }
+
+ @Override
+ public int incrementCascadeLevel() {
+ return delegate.incrementCascadeLevel();
+ }
+
+ @Override
+ public int decrementCascadeLevel() {
+ return delegate.decrementCascadeLevel();
+ }
+
+ @Override
+ public boolean isFlushing() {
+ return delegate.isFlushing();
+ }
+
+ @Override
+ public void setFlushing(boolean flushing) {
+ delegate.setFlushing( flushing );
+ }
+
+ @Override
+ public void beforeLoad() {
+ delegate.beforeLoad();
+ }
+
+ @Override
+ public void afterLoad() {
+ delegate.afterLoad();
+ }
+
+ @Override
+ public boolean isLoadFinished() {
+ return delegate.isLoadFinished();
+ }
+
+ @Override
+ public String toString() {
+ return delegate.toString();
+ }
+
+ @Override
+ public Object getOwnerId(String entityName, String propertyName, Object childEntity, Map mergeMap) {
+ return delegate.getOwnerId( entityName, propertyName, childEntity, mergeMap );
+ }
+
+ @Override
+ public Object getIndexInOwner(String entity, String property, Object childObject, Map mergeMap) {
+ return delegate.getIndexInOwner( entity, property, childObject, mergeMap );
+ }
+
+ @Override
+ public void addNullProperty(EntityKey ownerKey, String propertyName) {
+ delegate.addNullProperty( ownerKey, propertyName );
+ }
+
+ @Override
+ public boolean isPropertyNull(EntityKey ownerKey, String propertyName) {
+ return delegate.isPropertyNull( ownerKey, propertyName );
+ }
+
+ @Override
+ public boolean isDefaultReadOnly() {
+ return delegate.isDefaultReadOnly();
+ }
+
+ @Override
+ public void setDefaultReadOnly(boolean readOnly) {
+ delegate.setDefaultReadOnly( readOnly );
+ }
+
+ @Override
+ public boolean isReadOnly(Object entityOrProxy) {
+ return delegate.isReadOnly( entityOrProxy );
+ }
+
+ @Override
+ public void setReadOnly(Object entityOrProxy, boolean readOnly) {
+ delegate.setReadOnly( entityOrProxy, readOnly );
+ }
+
+ @Override
+ public boolean isRemovingOrphanBeforeUpdates() {
+ return delegate.isRemovingOrphanBeforeUpdates();
+ }
+
+ @Override
+ public void beginRemoveOrphanBeforeUpdates() {
+ delegate.beginRemoveOrphanBeforeUpdates();
+ }
+
+ @Override
+ public void endRemoveOrphanBeforeUpdates() {
+ delegate.endRemoveOrphanBeforeUpdates();
+ }
+
+ @Override
+ public void replaceDelayedEntityIdentityInsertKeys(EntityKey oldKey, Object generatedId) {
+ delegate.replaceDelayedEntityIdentityInsertKeys( oldKey, generatedId );
+ }
+
+ @Internal
+ @Override
+ public void replaceEntityEntryRowId(Object entity, Object rowId) {
+ delegate.replaceEntityEntryRowId( entity, rowId );
+ }
+
+ @Override
+ public void addChildParent(Object child, Object parent) {
+ delegate.addChildParent( child, parent );
+ }
+
+ @Override
+ public void removeChildParent(Object child) {
+ delegate.removeChildParent( child );
+ }
+
+ @Override
+ public void registerInsertedKey(EntityPersister persister, Object id) {
+ delegate.registerInsertedKey( persister, id );
+ }
+
+ @Override
+ public boolean wasInsertedDuringTransaction(EntityPersister persister, Object id) {
+ return delegate.wasInsertedDuringTransaction( persister, id );
+ }
+
+ @Override
+ public boolean containsNullifiableEntityKey(Supplier sek) {
+ return delegate.containsNullifiableEntityKey( sek );
+ }
+
+ @Override
+ public void registerNullifiableEntityKey(EntityKey key) {
+ delegate.registerNullifiableEntityKey( key );
+ }
+
+ @Override
+ public boolean isNullifiableEntityKeysEmpty() {
+ return delegate.isNullifiableEntityKeysEmpty();
+ }
+
+ @Override
+ public boolean containsDeletedUnloadedEntityKey(EntityKey ek) {
+ return delegate.containsDeletedUnloadedEntityKey( ek );
+ }
+
+ @Override
+ public void registerDeletedUnloadedEntityKey(EntityKey key) {
+ delegate.registerDeletedUnloadedEntityKey( key );
+ }
+
+ @Override
+ public void removeDeletedUnloadedEntityKey(EntityKey key) {
+ delegate.removeDeletedUnloadedEntityKey( key );
+ }
+
+ @Override
+ public boolean containsDeletedUnloadedEntityKeys() {
+ return delegate.containsDeletedUnloadedEntityKeys();
+ }
+
+ @Override
+ public int getCollectionEntriesSize() {
+ return delegate.getCollectionEntriesSize();
+ }
+
+ @Override
+ public CollectionEntry removeCollectionEntry(PersistentCollection collection) {
+ return delegate.removeCollectionEntry( collection );
+ }
+
+ @Override
+ public void clearCollectionsByKey() {
+ delegate.clearCollectionsByKey();
+ }
+
+ @Override
+ public PersistentCollection addCollectionByKey(CollectionKey collectionKey, PersistentCollection persistentCollection) {
+ return delegate.addCollectionByKey( collectionKey, persistentCollection );
+ }
+
+ @Override
+ public void removeCollectionByKey(CollectionKey collectionKey) {
+ delegate.removeCollectionByKey( collectionKey );
+ }
+
+ @Internal
+ @Override
+ public Map getEntitySnapshotsByKey() {
+ return delegate.getEntitySnapshotsByKey();
+ }
+
+ @Override
+ @Internal
+ public Map getOrInitializeEntitySnapshotsByKey() {
+ return delegate.getOrInitializeEntitySnapshotsByKey();
+ }
+
+ @Override
+ public Iterator