Skip to content

Upgrade Hibernate ORM and Vert.x #1994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Upgrade Hibernate ORM and Vert.x #1994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71af3e2
[#1992] Upgrade Hibernate ORM to 6.6.1.Final
DavideD Sep 17, 2024
1bb00c8
[#1993] Upgrade Vert.x SQL client to 4.5.10
DavideD Sep 17, 2024
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
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ Hibernate Reactive has been tested with:
- CockroachDB v24
- MS SQL Server 2022
- Oracle 23
- [Hibernate ORM][] 6.6.0.Final
- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.9
- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.9
- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.9
- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.5.9
- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.5.9
- [Hibernate ORM][] 6.6.1.Final
- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.10
- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.10
- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.10
- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.5.10
- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.5.10
- [Quarkus][Quarkus] via the Hibernate Reactive extension

[PostgreSQL]: https://www.postgresql.org
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ext {
// Example:
// ./gradlew build -PvertxSqlClientVersion=4.0.0-SNAPSHOT
if ( !project.hasProperty( 'vertxSqlClientVersion' ) ) {
vertxSqlClientVersion = '4.5.9'
vertxSqlClientVersion = '4.5.10'
}

testcontainersVersion = '1.19.8'
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.Final
hibernateOrmVersion = 6.6.1.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.0.CR2
#hibernateOrmGradlePluginVersion = 6.6.1.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.9-SNAPSHOT
#vertxSqlClientVersion = 4.5.10-SNAPSHOT

# Override default Vert.x Web client and server versions. For integration tests, both default to vertxSqlClientVersion
#vertxWebVersion = 4.5.9
#vertxWebtClientVersion = 4.5.9
#vertxWebVersion = 4.5.10
#vertxWebtClientVersion = 4.5.10

5 changes: 3 additions & 2 deletions ...core/src/main/java/org/hibernate/reactive/id/impl/ReactiveIdentifierGeneratorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.hibernate.engine.config.spi.StandardConverters;
import org.hibernate.generator.BeforeExecutionGenerator;
import org.hibernate.generator.Generator;
import org.hibernate.generator.GeneratorCreationContext;
import org.hibernate.generator.OnExecutionGenerator;
import org.hibernate.id.Configurable;
import org.hibernate.id.IdentifierGenerator;
Expand Down Expand Up @@ -45,10 +46,10 @@
}

@Override
public Generator createIdentifierGenerator(String strategy, Type type, Properties config) {
public Generator createIdentifierGenerator(String strategy, Type type, GeneratorCreationContext creationContext, Properties config) {
Object generator;
try {
generator = super.createIdentifierGenerator( strategy, type, config );
generator = super.createIdentifierGenerator( strategy, type, creationContext, config );
}
catch ( MappingException ignored ) {
try {
Expand Down
4 changes: 2 additions & 2 deletions tooling/jbang/CockroachDBReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.10}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.10}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.4.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
Expand Down
4 changes: 2 additions & 2 deletions tooling/jbang/Db2ReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-db2-client:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-db2-client:$\{vertx.version:4.5.10}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.10}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.4.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
Expand Down
6 changes: 3 additions & 3 deletions tooling/jbang/Example.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/

//DEPS com.ongres.scram:client:2.1
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.9}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.9}
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.9}
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.10}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.10}
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.10}
//DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.4.0.Final}
//DEPS org.slf4j:slf4j-simple:2.0.7
//DESCRIPTION Allow authentication to PostgreSQL using SCRAM:
Expand Down
4 changes: 2 additions & 2 deletions tooling/jbang/MariaDBReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.10}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.10}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.4.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
Expand Down
4 changes: 2 additions & 2 deletions tooling/jbang/MySQLReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.5.10}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.10}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.4.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
Expand Down
4 changes: 2 additions & 2 deletions tooling/jbang/PostgreSQLReactiveTest.java.qute
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Copyright: Red Hat Inc. and Hibernate Authors
*/

//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.9}
//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.5.10}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.10}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.4.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
Expand Down
8 changes: 4 additions & 4 deletions tooling/jbang/ReactiveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
*/

///usr/bin/env jbang "$0" "$@" ; exit $?
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.9}
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.5.10}
//DEPS com.ongres.scram:client:2.1
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.9}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.9}
//DEPS io.vertx:vertx-unit:${vertx.version:4.5.9}
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.10}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.10}
//DEPS io.vertx:vertx-unit:${vertx.version:4.5.10}
//DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.4.0.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
Expand Down
Loading