From 9d58018bfc676db6cfe3b33a6c1dcef071a19f86 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Tue, 26 Mar 2024 17:36:03 +0100
Subject: [PATCH] Move PU-specific test entities into their own packages

---
 .../jpa/postgresql/JPAFunctionalityTestEndpoint.java   |  3 +++
 .../jpa/postgresql/{ => defaultpu}/EntityWithXml.java  |  2 +-
 .../it/jpa/postgresql/{ => defaultpu}/Person.java      |  2 +-
 .../postgresql/{ => defaultpu}/SequencedAddress.java   |  2 +-
 .../quarkus/it/jpa/postgresql/defaultpu}/Status.java   |  2 +-
 .../src/main/resources/application.properties          |  5 +++--
 .../jpa/postgresql/JPAFunctionalityTestEndpoint.java   |  4 ++++
 .../it/jpa/postgresql/JPATestReflectionEndpoint.java   | 10 ++++++++--
 .../it/jpa/postgresql/{ => defaultpu}/Address.java     |  2 +-
 .../it/jpa/postgresql/{ => defaultpu}/Animal.java      |  2 +-
 .../it/jpa/postgresql/{ => defaultpu}/Customer.java    |  2 +-
 .../jpa/postgresql/{ => defaultpu}/EntityWithJson.java |  2 +-
 .../it/jpa/postgresql/{ => defaultpu}/Human.java       |  2 +-
 .../jpa/postgresql/{ => defaultpu}/MyUUIDEntity.java   |  2 +-
 .../{ => defaultpu}/NotAnEntityNotReferenced.java      |  2 +-
 .../it/jpa/postgresql/{ => defaultpu}/Person.java      |  2 +-
 .../postgresql/{ => defaultpu}/SequencedAddress.java   |  2 +-
 .../quarkus/it/jpa/postgresql/defaultpu}/Status.java   |  2 +-
 .../it/jpa/postgresql/{ => defaultpu}/WorkAddress.java |  2 +-
 .../src/main/resources/application.properties          |  4 +++-
 20 files changed, 36 insertions(+), 20 deletions(-)
 rename integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/EntityWithXml.java (97%)
 rename integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/Person.java (97%)
 rename integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/SequencedAddress.java (94%)
 rename integration-tests/{jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql => jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu}/Status.java (50%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/Address.java (95%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/Animal.java (84%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/Customer.java (95%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/EntityWithJson.java (96%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/Human.java (87%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/MyUUIDEntity.java (93%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/NotAnEntityNotReferenced.java (83%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/Person.java (98%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/SequencedAddress.java (94%)
 rename integration-tests/{jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql => jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu}/Status.java (50%)
 rename integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/{ => defaultpu}/WorkAddress.java (88%)

diff --git a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
index c489c84120f30..09068c790e582 100644
--- a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
+++ b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
@@ -32,6 +32,9 @@
 import jakarta.ws.rs.core.MediaType;
 
 import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.it.jpa.postgresql.defaultpu.EntityWithXml;
+import io.quarkus.it.jpa.postgresql.defaultpu.Person;
+import io.quarkus.it.jpa.postgresql.defaultpu.SequencedAddress;
 import io.quarkus.it.jpa.postgresql.otherpu.EntityWithXmlOtherPU;
 import io.quarkus.narayana.jta.QuarkusTransaction;
 
diff --git a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/EntityWithXml.java b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/EntityWithXml.java
similarity index 97%
rename from integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/EntityWithXml.java
rename to integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/EntityWithXml.java
index 470ce79c8f365..771712f2e3569 100644
--- a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/EntityWithXml.java
+++ b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/EntityWithXml.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import java.time.LocalDate;
 
diff --git a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Person.java b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Person.java
similarity index 97%
rename from integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Person.java
rename to integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Person.java
index d43892763452c..ef7a47b0a51b5 100644
--- a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Person.java
+++ b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Person.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
diff --git a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/SequencedAddress.java
similarity index 94%
rename from integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java
rename to integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/SequencedAddress.java
index 99a659838cd1a..6ba94e5810e2e 100644
--- a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java
+++ b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/SequencedAddress.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Status.java b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Status.java
similarity index 50%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Status.java
rename to integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Status.java
index cea1a939fdf0a..2804e452a8b90 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Status.java
+++ b/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Status.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 public enum Status {
     LIVING,
diff --git a/integration-tests/jpa-postgresql-withxml/src/main/resources/application.properties b/integration-tests/jpa-postgresql-withxml/src/main/resources/application.properties
index c0ff6325328d0..c119ff7e45091 100644
--- a/integration-tests/jpa-postgresql-withxml/src/main/resources/application.properties
+++ b/integration-tests/jpa-postgresql-withxml/src/main/resources/application.properties
@@ -3,7 +3,7 @@ quarkus.datasource.password=hibernate_orm_test
 quarkus.datasource.jdbc.url=${postgres.url}
 quarkus.datasource.jdbc.max-size=8
 
-quarkus.hibernate-orm.packages=io.quarkus.it.jpa.postgresql
+quarkus.hibernate-orm.packages=io.quarkus.it.jpa.postgresql.defaultpu
 quarkus.hibernate-orm.database.generation=drop-and-create
 
 #Necessary for assertions in JPAFunctionalityInGraalITCase:
@@ -14,4 +14,5 @@ quarkus.native.additional-build-args=-J-Dio.quarkus.jdbc.postgresql.graalvm.diag
 
 # Define non-default PU so that we can configure a custom XML format mapper. The default PU is using the default mapper.
 quarkus.hibernate-orm."other".datasource=<default>
-quarkus.hibernate-orm."other".packages=io.quarkus.it.jpa.postgresql.otherpu
\ No newline at end of file
+quarkus.hibernate-orm."other".packages=io.quarkus.it.jpa.postgresql.otherpu
+quarkus.hibernate-orm."other".database.generation=drop-and-create
\ No newline at end of file
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
index 6b9b3df9d6433..822a2947a26c8 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPAFunctionalityTestEndpoint.java
@@ -16,6 +16,10 @@
 import jakarta.ws.rs.core.MediaType;
 
 import io.quarkus.hibernate.orm.PersistenceUnit;
+import io.quarkus.it.jpa.postgresql.defaultpu.EntityWithJson;
+import io.quarkus.it.jpa.postgresql.defaultpu.MyUUIDEntity;
+import io.quarkus.it.jpa.postgresql.defaultpu.Person;
+import io.quarkus.it.jpa.postgresql.defaultpu.SequencedAddress;
 import io.quarkus.it.jpa.postgresql.otherpu.EntityWithJsonOtherPU;
 import io.quarkus.narayana.jta.QuarkusTransaction;
 
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java
index fb8f672784738..bc417a6140fa9 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/JPATestReflectionEndpoint.java
@@ -16,6 +16,11 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
+import io.quarkus.it.jpa.postgresql.defaultpu.Address;
+import io.quarkus.it.jpa.postgresql.defaultpu.Customer;
+import io.quarkus.it.jpa.postgresql.defaultpu.NotAnEntityNotReferenced;
+import io.quarkus.it.jpa.postgresql.defaultpu.WorkAddress;
+
 /**
  * Various tests for the JPA integration.
  * WARNING: these tests will ONLY pass in native mode, as it also verifies reflection non-functionality.
@@ -32,8 +37,9 @@ public String test() throws SQLException, TransformerException, IOException {
         makeSureNonAnnotatedEmbeddableAreAccessibleViaReflection(errors);
         makeSureAnnotatedEmbeddableAreAccessibleViaReflection(errors);
         String packageName = this.getClass().getPackage().getName();
-        makeSureClassAreAccessibleViaReflection(packageName + ".Human", "Unable to enlist @MappedSuperclass", errors);
-        makeSureClassAreAccessibleViaReflection(packageName + ".Animal", "Unable to enlist entity superclass", errors);
+        makeSureClassAreAccessibleViaReflection(packageName + ".defaultpu.Human", "Unable to enlist @MappedSuperclass", errors);
+        makeSureClassAreAccessibleViaReflection(packageName + ".defaultpu.Animal", "Unable to enlist entity superclass",
+                errors);
         if (errors.isEmpty()) {
             return "OK";
         } else {
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Address.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Address.java
similarity index 95%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Address.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Address.java
index 7da64d96144e6..af5e855aebb08 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Address.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Address.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.Embeddable;
 
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Animal.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Animal.java
similarity index 84%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Animal.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Animal.java
index 5db8c8fe1004a..efe327cc07436 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Animal.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Animal.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 /**
  * @author Emmanuel Bernard emmanuel@hibernate.org
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Customer.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Customer.java
similarity index 95%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Customer.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Customer.java
index d61b16d528613..27d8c2d3f24be 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Customer.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Customer.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/EntityWithJson.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/EntityWithJson.java
similarity index 96%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/EntityWithJson.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/EntityWithJson.java
index e513a7d8b1d23..f82b79df3564c 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/EntityWithJson.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/EntityWithJson.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import java.time.LocalDate;
 
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Human.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Human.java
similarity index 87%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Human.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Human.java
index 0081919382064..efe9fa55ebc36 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Human.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Human.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.MappedSuperclass;
 
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/MyUUIDEntity.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/MyUUIDEntity.java
similarity index 93%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/MyUUIDEntity.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/MyUUIDEntity.java
index 23997f53e5f09..4e26d249addb6 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/MyUUIDEntity.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/MyUUIDEntity.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import java.util.UUID;
 
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/NotAnEntityNotReferenced.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/NotAnEntityNotReferenced.java
similarity index 83%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/NotAnEntityNotReferenced.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/NotAnEntityNotReferenced.java
index 725424592f338..7a5ad8b55c49f 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/NotAnEntityNotReferenced.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/NotAnEntityNotReferenced.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 /**
  * Should not be referenced by the code
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Person.java
similarity index 98%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Person.java
index f8c82d346ee3f..22b6dfa87c7b6 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/Person.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Person.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import java.time.Duration;
 
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/SequencedAddress.java
similarity index 94%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/SequencedAddress.java
index 99a659838cd1a..6ba94e5810e2e 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/SequencedAddress.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/SequencedAddress.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Status.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Status.java
similarity index 50%
rename from integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Status.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Status.java
index cea1a939fdf0a..2804e452a8b90 100644
--- a/integration-tests/jpa-postgresql-withxml/src/main/java/io/quarkus/it/jpa/postgresql/Status.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/Status.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 public enum Status {
     LIVING,
diff --git a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/WorkAddress.java b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/WorkAddress.java
similarity index 88%
rename from integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/WorkAddress.java
rename to integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/WorkAddress.java
index b4aa1f46fd456..ec14c0954269d 100644
--- a/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/WorkAddress.java
+++ b/integration-tests/jpa-postgresql/src/main/java/io/quarkus/it/jpa/postgresql/defaultpu/WorkAddress.java
@@ -1,4 +1,4 @@
-package io.quarkus.it.jpa.postgresql;
+package io.quarkus.it.jpa.postgresql.defaultpu;
 
 import jakarta.persistence.Embeddable;
 
diff --git a/integration-tests/jpa-postgresql/src/main/resources/application.properties b/integration-tests/jpa-postgresql/src/main/resources/application.properties
index 90370fd628984..f0b72dfc53a65 100644
--- a/integration-tests/jpa-postgresql/src/main/resources/application.properties
+++ b/integration-tests/jpa-postgresql/src/main/resources/application.properties
@@ -3,12 +3,14 @@ quarkus.datasource.password=hibernate_orm_test
 quarkus.datasource.jdbc.url=${postgres.url}
 quarkus.datasource.jdbc.max-size=8
 
-quarkus.hibernate-orm.packages=io.quarkus.it.jpa.postgresql
+quarkus.hibernate-orm.packages=io.quarkus.it.jpa.postgresql.defaultpu
 quarkus.hibernate-orm.database.generation=drop-and-create
 quarkus.hibernate-orm.database.generation.create-schemas=true
 # Define non-default PU so that we can configure a custom JSON format mapper. The default PU is using the default mapper.
 quarkus.hibernate-orm."other".datasource=<default>
 quarkus.hibernate-orm."other".packages=io.quarkus.it.jpa.postgresql.otherpu
+quarkus.hibernate-orm."other".database.generation=drop-and-create
+quarkus.hibernate-orm."other".database.generation.create-schemas=true
 
 #Necessary for assertions in JPAFunctionalityInGraalITCase:
 quarkus.native.enable-reports=true
\ No newline at end of file