This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new ead2018c45 [boyscout] removes conflicting persistence.xml
ead2018c45 is described below
commit ead2018c45f38be18f80c8e0a6e34c21dbe4b9bf
Author: Jean Helou <[email protected]>
AuthorDate: Fri Jan 27 00:58:10 2023 +0100
[boyscout] removes conflicting persistence.xml
Co-Authored-By: Matthieu Baechler <[email protected]>
---
mailbox/jpa/pom.xml | 1 +
.../jpa/src/{main/resources/META-INF => test/resources}/persistence.xml | 0
.../{jpa/src/main => spring/src/test}/resources/META-INF/persistence.xml | 0
server/data/data-jpa/pom.xml | 1 +
.../src/{main/resources/META-INF => test/resources}/persistence.xml | 0
5 files changed, 2 insertions(+)
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 8fbaf2ad5d..78892ec6b1 100644
--- a/mailbox/jpa/pom.xml
+++ b/mailbox/jpa/pom.xml
@@ -142,6 +142,7 @@
<excludes>org/apache/james/mailbox/jpa/mail/model/openjpa/EncryptDecryptHelper.class</excludes>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+
<persistenceXmlFile>${basedir}/src/test/resources/persistence.xml</persistenceXmlFile>
</configuration>
<executions>
<execution>
diff --git a/mailbox/jpa/src/main/resources/META-INF/persistence.xml
b/mailbox/jpa/src/test/resources/persistence.xml
similarity index 100%
copy from mailbox/jpa/src/main/resources/META-INF/persistence.xml
copy to mailbox/jpa/src/test/resources/persistence.xml
diff --git a/mailbox/jpa/src/main/resources/META-INF/persistence.xml
b/mailbox/spring/src/test/resources/META-INF/persistence.xml
similarity index 100%
rename from mailbox/jpa/src/main/resources/META-INF/persistence.xml
rename to mailbox/spring/src/test/resources/META-INF/persistence.xml
diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml
index 61bd23ca00..ccfb50dea8 100644
--- a/server/data/data-jpa/pom.xml
+++ b/server/data/data-jpa/pom.xml
@@ -180,6 +180,7 @@
org.apache.james.mailrepository.jpa.model.JPAMail)</value>
</property>
</toolProperties>
+
<persistenceXmlFile>${basedir}/src/test/resources/persistence.xml</persistenceXmlFile>
</configuration>
<executions>
<execution>
diff --git a/server/data/data-jpa/src/main/resources/META-INF/persistence.xml
b/server/data/data-jpa/src/test/resources/persistence.xml
similarity index 100%
rename from server/data/data-jpa/src/main/resources/META-INF/persistence.xml
rename to server/data/data-jpa/src/test/resources/persistence.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
