Merge pull request #16506 from Sanne/hibernate-reactive-CR2

Hibernate Reactive, re-enabled as version 1.0.0.CR2
quarkusio · Apr 14, 2021 · 04f12b8 · 04f12b8
2 parents 8f0dcc8 + d8c928a
commit 04f12b8
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 12 deletions.
diff --git 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
@@ -94,7 +94,7 @@
         <commons-codec.version>1.15</commons-codec.version>
         <classmate.version>1.5.1</classmate.version>
         <hibernate-orm.version>5.4.30.Final</hibernate-orm.version>
-        <hibernate-reactive.version>1.0.0.CR1.Vertx4</hibernate-reactive.version>
+        <hibernate-reactive.version>1.0.0.CR2</hibernate-reactive.version>
         <hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
         <hibernate-search.version>6.0.3.Final</hibernate-search.version>
         <narayana.version>5.11.1.Final</narayana.version>

diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml
@@ -838,6 +838,45 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-reactive</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-reactive-panache</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-hibernate-reactive-panache-common</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -799,6 +799,45 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-hibernate-reactive-panache-common-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-search-orm-elasticsearch-deployment</artifactId>

diff --git a/extensions/hibernate-reactive/deployment/pom.xml b/extensions/hibernate-reactive/deployment/pom.xml
@@ -12,6 +12,12 @@
     <artifactId>quarkus-hibernate-reactive-deployment</artifactId>
     <name>Quarkus - Hibernate Reactive - Deployment</name>
 
+    <!-- Defaults, to simplify local testing -->
+    <properties>
+        <postgres.image>postgres:13.1</postgres.image>
+        <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -144,7 +150,6 @@
                 </property>
             </activation>
             <properties>
-                <postgres.image>postgres:13.1</postgres.image>
                 <postgres.reactive.url>vertx-reactive:postgresql://localhost:5431/hibernate_orm_test</postgres.reactive.url>
             </properties>
             <build>

diff --git a/...yment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java b/...yment/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/...che/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/NoConfigTest.java b/...che/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/...s/panache/hibernate-reactive-panache/deployment/src/test/resources/application.properties b/...s/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
@@ -21,10 +21,8 @@
         <module>hibernate-orm-panache</module>
         <module>hibernate-orm-panache-kotlin</module>
         <module>mongodb-panache-common</module>
-        <!--
         <module>hibernate-reactive-panache-common</module>
         <module>hibernate-reactive-panache</module>
-        -->
         <module>mongodb-panache</module>
         <module>mongodb-panache-kotlin</module>
         <module>panacheql</module>

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -83,7 +83,7 @@
         <module>jdbc</module>
         <module>hibernate-orm</module>
         <module>hibernate-envers</module>
-        <!--<module>hibernate-reactive</module>-->
+        <module>hibernate-reactive</module>
         <module>hibernate-validator</module>
         <module>panache</module>
         <module>hibernate-search-orm-elasticsearch</module>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -59,12 +59,10 @@
         <module>hibernate-orm-panache</module>
         <module>hibernate-orm-rest-data-panache</module>
         <module>hibernate-orm-panache-kotlin</module>
-        <!--
         <module>hibernate-reactive-db2</module>
         <module>hibernate-reactive-mysql</module>
         <module>hibernate-reactive-postgresql</module>
         <module>hibernate-reactive-panache</module>
-        -->
         <module>hibernate-search-orm-elasticsearch</module>
         <module>hibernate-tenancy</module>
         <module>hibernate-orm-envers</module>