From 7ba1fc70d0cb076d1058f1035e5204dea74d86e9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 10 Feb 2026 12:01:02 +0000
Subject: [PATCH 1/3] Initial plan


From 66597b22096fe8f503608bb4fd306986a6549aaa Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 10 Feb 2026 12:10:29 +0000
Subject: [PATCH 2/3] Fix p6spy 2.0.0 compatibility by adding test
 configuration

Co-authored-by: ato <10588+ato@users.noreply.github.com>
---
 .../test-resources/application.properties     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 delivery/test-resources/application.properties

diff --git a/delivery/test-resources/application.properties b/delivery/test-resources/application.properties
new file mode 100644
index 00000000..f44d9b82
--- /dev/null
+++ b/delivery/test-resources/application.properties
@@ -0,0 +1,19 @@
+# Test-specific configuration for delivery module
+
+# Allow bean definition overriding to fix p6spy-spring-boot-starter 2.0.0 compatibility
+# Version 2.0.0 includes conflicting autoconfiguration for DataSourcePoolMetadataProviders
+spring.main.allow-bean-definition-overriding=true
+
+# Enable Hibernate DDL auto-update for tests to create tables
+spring.jpa.hibernate.ddl-auto=update
+
+# Ensure data.sql runs AFTER Hibernate creates the schema
+# This overrides the main application.properties setting
+spring.jpa.defer-datasource-initialization=true
+
+# Configure Hibernate Search for tests with in-memory backend
+spring.jpa.properties.hibernate.search.enabled=true
+spring.jpa.properties.hibernate.search.backend.type=lucene
+spring.jpa.properties.hibernate.search.backend.directory.type=local-heap
+spring.jpa.properties.hibernate.search.backend.directory.root=/tmp/lucene-test
+spring.jpa.properties.hibernate.search.backend.analysis.configurer=pandas.search.SearchAnalysisConfig

From 41edb9b4972737b51d6aafcb8ad6cf0cdca21b2b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 10 Feb 2026 12:14:12 +0000
Subject: [PATCH 3/3] Use system temp directory for Lucene path

Co-authored-by: ato <10588+ato@users.noreply.github.com>
---
 delivery/test-resources/application.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/delivery/test-resources/application.properties b/delivery/test-resources/application.properties
index f44d9b82..4550f32f 100644
--- a/delivery/test-resources/application.properties
+++ b/delivery/test-resources/application.properties
@@ -15,5 +15,5 @@ spring.jpa.defer-datasource-initialization=true
 spring.jpa.properties.hibernate.search.enabled=true
 spring.jpa.properties.hibernate.search.backend.type=lucene
 spring.jpa.properties.hibernate.search.backend.directory.type=local-heap
-spring.jpa.properties.hibernate.search.backend.directory.root=/tmp/lucene-test
+spring.jpa.properties.hibernate.search.backend.directory.root=${java.io.tmpdir}/lucene-test
 spring.jpa.properties.hibernate.search.backend.analysis.configurer=pandas.search.SearchAnalysisConfig