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.

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

Hibernate Reactive, re-enabled as version 1.0.0.CR2 #16506

Merged
merged 3 commits into from
Apr 14, 2021
Merged

Hibernate Reactive, re-enabled as version 1.0.0.CR2 #16506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f991035
Change Hibernate Reactive version to 1.0.0.CR2
DavideD Apr 14, 2021
3543a70
Revert "Remove Hibernate Reactive from the build"
DavideD Apr 14, 2021
d8c928a
Make it easier to run tests locally without Docker
Sanne Apr 14, 2021
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
6 changes: 3 additions & 3 deletions .github/native-tests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.Final</hibernate-search.version>
<narayana.version>5.11.1.Final</narayana.version>
Expand Down
39 changes: 39 additions & 0 deletions devtools/bom-descriptor-json/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
39 changes: 39 additions & 0 deletions docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion extensions/hibernate-reactive/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions ...yment/src/test/java/io/quarkus/hibernate/reactive/panache/test/DuplicateIdEntityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
6 changes: 4 additions & 2 deletions ...che/deployment/src/test/java/io/quarkus/hibernate/reactive/panache/test/NoConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
1 change: 1 addition & 0 deletions ...s/panache/hibernate-reactive-panache/deployment/src/test/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions extensions/panache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down