Skip to content
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.

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

Revert "[#1791] Upgrade Vert.x SQL client to 4.5.0" #1830

Draft
wants to merge 2 commits into
base: 2.0
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ jobs:
# and it's useful to test that.
- { name: "20", java_version_numeric: 20, jvm_args: '--enable-preview' }
- { name: "21-ea", java_version_numeric: 21, from: 'jdk.java.net', jvm_args: '--enable-preview' }
- { name: "22-ea", java_version_numeric: 22, from: 'jdk.java.net', jvm_args: '--enable-preview' }
# Requires Vert.x 4.5
# - { name: "22-ea", java_version_numeric: 22, from: 'jdk.java.net', jvm_args: '--enable-preview' }
steps:
- uses: actions/checkout@v2
- name: Get year/month for cache key
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ Hibernate Reactive has been tested with:
- MS SQL Server 2019
- Oracle 21.3
- [Hibernate ORM][] 6.2.13.Final
- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.5.0
- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.5.0
- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.5.0
- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.5.0
- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.5.0
- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.4.6
- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.4.6
- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.4.6
- [Vert.x Reactive MS SQL Server Client](https://vertx.io/docs/vertx-mssql-client/java/) 4.4.6
- [Vert.x Reactive Oracle Client](https://vertx.io/docs/vertx-oracle-client/java/) 4.4.6
- [Quarkus][Quarkus] via the Hibernate Reactive extension

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

testcontainersVersion = '1.18.3'
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ org.gradle.java.installations.auto-download=false
#skipOrmVersionParsing = true

# Override default Vert.x Sql client version
#vertxSqlClientVersion = 4.5.0-SNAPSHOT
#vertxSqlClientVersion = 4.4.6-SNAPSHOT

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

4 changes: 2 additions & 2 deletions tooling/jbang/CockroachDBReactiveTest.java.qute
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.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.4.6}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.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
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.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-db2-client:$\{vertx.version:4.4.6}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.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
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.0}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.4.6}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.4.6}
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.4.6}
//DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.0.6.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
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.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.4.6}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.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
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.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-mysql-client:$\{vertx.version:4.4.6}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.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
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.0}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.5.0}
//DEPS io.vertx:vertx-pg-client:$\{vertx.version:4.4.6}
//DEPS io.vertx:vertx-unit:$\{vertx.version:4.4.6}
//DEPS org.hibernate.reactive:hibernate-reactive-core:$\{hibernate-reactive.version:2.0.6.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
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.0}
//DEPS io.vertx:vertx-pg-client:${vertx.version:4.4.6}
//DEPS com.ongres.scram:client:2.1
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-unit:${vertx.version:4.5.0}
//DEPS io.vertx:vertx-db2-client:${vertx.version:4.4.6}
//DEPS io.vertx:vertx-mysql-client:${vertx.version:4.4.6}
//DEPS io.vertx:vertx-unit:${vertx.version:4.4.6}
//DEPS org.hibernate.reactive:hibernate-reactive-core:${hibernate-reactive.version:2.0.6.Final}
//DEPS org.assertj:assertj-core:3.24.2
//DEPS junit:junit:4.13.2
Expand Down