This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.40.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9191f37527187e35ad0f39a22de35f67b75f7c91 Author: James Netherton <[email protected]> AuthorDate: Wed Oct 14 08:05:39 2026 +0100 Prevent jpa tests from starting multiple container instances when quarkus.datasource.devservices.image-name is overridden --- .../jpa/src/main/resources/application.properties | 26 ++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/integration-tests/jpa/src/main/resources/application.properties b/integration-tests/jpa/src/main/resources/application.properties index 02d16d6263..ffe7c17cd7 100644 --- a/integration-tests/jpa/src/main/resources/application.properties +++ b/integration-tests/jpa/src/main/resources/application.properties @@ -17,29 +17,27 @@ jpa.model.packages=org.apache.camel.quarkus.component.jpa.it.model,org.apache.camel.processor.idempotent.jpa -%dev,test,prod.quarkus.datasource.db-kind=${cq.sqlJdbcKind:h2} - -%dev,test,prod.quarkus.datasource.test.db-kind=${cq.sqlJdbcKind:h2} -%dev,test,prod.quarkus.datasource.test.jdbc.max-size=8 +# All persistence units share the default datasource. Its configuration is identical in every profile +# so that tests are run against a single database (and Dev Services container) instead of one per datasource and test profile +quarkus.datasource.db-kind=${cq.sqlJdbcKind:h2} +quarkus.datasource.jdbc.max-size=8 %dev,test,prod.quarkus.hibernate-orm.test.packages=${jpa.model.packages} -%dev,test,prod.quarkus.hibernate-orm.test.datasource=test +%dev,test,prod.quarkus.hibernate-orm.test.datasource=<default> %dev,test,prod.quarkus.hibernate-orm.test.schema-management.strategy=drop-and-create -# single-resource-no-default profile to test single named DataSource / EntityManagerFactory beans without defaults +# single-resource-no-default profile to test a single named EntityManagerFactory bean without a default %single-resource-no-default.quarkus.camel.routes-discovery.exclude-patterns=**/* -%single-resource-no-default.quarkus.datasource.singleA.db-kind=${cq.sqlJdbcKind:h2} %single-resource-no-default.quarkus.hibernate-orm.singleA.packages=${jpa.model.packages} -%single-resource-no-default.quarkus.hibernate-orm.singleA.datasource=singleA +%single-resource-no-default.quarkus.hibernate-orm.singleA.datasource=<default> %single-resource-no-default.quarkus.hibernate-orm.singleA.schema-management.strategy=drop-and-create -# multi-resource-no-default profile to test multiple named DataSource / EntityManagerFactory beans without defaults +# multi-resource-no-default profile to test multiple named EntityManagerFactory beans without a default %multi-resource-no-default.quarkus.camel.routes-discovery.exclude-patterns=**/* -%multi-resource-no-default.quarkus.datasource.multiA.db-kind=${cq.sqlJdbcKind:h2} %multi-resource-no-default.quarkus.hibernate-orm.multiA.packages=${jpa.model.packages} -%multi-resource-no-default.quarkus.hibernate-orm.multiA.datasource=multiA +%multi-resource-no-default.quarkus.hibernate-orm.multiA.datasource=<default> %multi-resource-no-default.quarkus.hibernate-orm.multiA.schema-management.strategy=drop-and-create -%multi-resource-no-default.quarkus.datasource.multiB.db-kind=${cq.sqlJdbcKind:h2} %multi-resource-no-default.quarkus.hibernate-orm.multiB.packages=${jpa.model.packages} -%multi-resource-no-default.quarkus.hibernate-orm.multiB.datasource=multiB -%multi-resource-no-default.quarkus.hibernate-orm.multiB.schema-management.strategy=drop-and-create +%multi-resource-no-default.quarkus.hibernate-orm.multiB.datasource=<default> +# multiA & multiB share the same database, so only one of them must manage the schema +%multi-resource-no-default.quarkus.hibernate-orm.multiB.schema-management.strategy=none
