| commit | e1fbcf5c2aa10812433f63b1e90dc79186b6089e | [log] [tgz] |
|---|---|---|
| author | Jean Helou <jhe@codamens.fr> | Fri Jan 27 00:58:10 2023 +0100 |
| committer | Jean Helou <jhe@codamens.fr> | Fri Jan 27 12:58:38 2023 +0100 |
| tree | a5d0846d15584b77a4a3faa1cd7f6d0bce4f1143 | |
| parent | ecc2583dc9f582d4de36656f606b8b3e26b94b2c [diff] |
[boyscout] removes conflicting persistence.xml Co-Authored-By: Matthieu Baechler <matthieu@apache.org>
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml index 8fbaf2a..78892ec 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 61bd23c..ccfb50d 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