diff --git a/.github/native-tests.json b/.github/native-tests.json index 2a9f582dd29b4..94e84417eb295 100644 --- a/.github/native-tests.json +++ b/.github/native-tests.json @@ -36,7 +36,7 @@ { "category": "Data2", "timeout": 65, - "test-modules": "jpa jpa-mysql jpa-db2 reactive-mysql-client reactive-db2-client" + "test-modules": "jpa jpa-mysql jpa-db2 reactive-mysql-client reactive-db2-client hibernate-reactive-db2 hibernate-reactive-mysql" }, { "category": "Data3", @@ -51,12 +51,12 @@ { "category": "Data5", "timeout": 65, - "test-modules": "jpa-postgresql narayana-stm narayana-jta reactive-pg-client" + "test-modules": "jpa-postgresql narayana-stm narayana-jta reactive-pg-client hibernate-reactive-postgresql" }, { "category": "Data6", "timeout": 50, - "test-modules": "elasticsearch-rest-client elasticsearch-rest-high-level-client hibernate-search-orm-elasticsearch" + "test-modules": "elasticsearch-rest-client elasticsearch-rest-high-level-client hibernate-search-orm-elasticsearch hibernate-reactive-panache" }, { "category": "Amazon", diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 2df722ca0aec1..c9d8b358b8ac3 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -94,7 +94,7 @@ 1.15 1.5.1 5.4.30.Final - 1.0.0.CR1.Vertx4 + 1.0.0.CR2 6.2.0.Final 6.0.2.Final 5.11.1.Final diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml index f27b2c0f2017b..7922a8e67a786 100644 --- a/devtools/bom-descriptor-json/pom.xml +++ b/devtools/bom-descriptor-json/pom.xml @@ -838,6 +838,45 @@ + + io.quarkus + quarkus-hibernate-reactive + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-hibernate-reactive-panache + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-hibernate-reactive-panache-common + ${project.version} + pom + test + + + * + * + + + io.quarkus quarkus-hibernate-search-orm-elasticsearch diff --git a/docs/pom.xml b/docs/pom.xml index a1090326c8656..2fb17020fd348 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -799,6 +799,45 @@ + + io.quarkus + quarkus-hibernate-reactive-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-hibernate-reactive-panache-deployment + ${project.version} + pom + test + + + * + * + + + + + io.quarkus + quarkus-hibernate-reactive-panache-common-deployment + ${project.version} + pom + test + + + * + * + + + io.quarkus quarkus-hibernate-search-orm-elasticsearch-deployment diff --git a/extensions/hibernate-reactive/deployment/pom.xml b/extensions/hibernate-reactive/deployment/pom.xml index b8c700ab088bd..20f3610589054 100644 --- a/extensions/hibernate-reactive/deployment/pom.xml +++ b/extensions/hibernate-reactive/deployment/pom.xml @@ -12,6 +12,12 @@ quarkus-hibernate-reactive-deployment Quarkus - Hibernate Reactive - Deployment + + + postgres:13.1 + vertx-reactive:postgresql://localhost:5432/hibernate_orm_test + + io.quarkus @@ -144,7 +150,6 @@ - postgres:13.1 vertx-reactive:postgresql://localhost:5431/hibernate_orm_test diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java index 046deb1bfe05a..d455f671ab714 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java @@ -14,6 +14,7 @@ public class DuplicateIdEntityTest { @RegisterExtension static QuarkusUnitTest runner = new QuarkusUnitTest() + .overrideConfigKey("quarkus.datasource.devservices", "false") .setExpectedException(BuildException.class) .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(DuplicateIdEntity.class)); diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/NoConfigTest.java b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/NoConfigTest.java index 7cb07508a9d21..5022b25a28618 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/NoConfigTest.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/NoConfigTest.java @@ -10,8 +10,10 @@ public class NoConfigTest { @RegisterExtension - static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer( - () -> ShrinkWrap.create(JavaArchive.class)); + static final QuarkusUnitTest config = new QuarkusUnitTest() + .overrideConfigKey("quarkus.datasource.devservices", "false") + .setArchiveProducer( + () -> ShrinkWrap.create(JavaArchive.class)); @Test public void testNoConfig() { diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/application.properties b/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/application.properties index 6d0922b28d2fe..fcb319f05c7f1 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/application.properties +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/test/resources/application.properties @@ -2,5 +2,6 @@ quarkus.datasource.db-kind=postgresql quarkus.datasource.username=hibernate_orm_test quarkus.datasource.password=hibernate_orm_test quarkus.datasource.reactive.url=${postgres.reactive.url} +quarkus.datasource.devservices=false quarkus.hibernate-orm.database.generation=drop-and-create diff --git a/extensions/panache/pom.xml b/extensions/panache/pom.xml index ddd193fb2e931..b1f972fa0003a 100644 --- a/extensions/panache/pom.xml +++ b/extensions/panache/pom.xml @@ -21,10 +21,8 @@ hibernate-orm-panache hibernate-orm-panache-kotlin mongodb-panache-common - mongodb-panache mongodb-panache-kotlin panacheql diff --git a/extensions/pom.xml b/extensions/pom.xml index d0bbc0bc101d3..31d17454c6253 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -83,7 +83,7 @@ jdbc hibernate-orm hibernate-envers - + hibernate-reactive hibernate-validator panache hibernate-search-orm-elasticsearch diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index e561985ce5564..215f2fc4366b9 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -59,12 +59,10 @@ hibernate-orm-panache hibernate-orm-rest-data-panache hibernate-orm-panache-kotlin - hibernate-search-orm-elasticsearch hibernate-tenancy hibernate-orm-envers