JAMES-2497 Remove h2
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e6381b41 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e6381b41 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e6381b41 Branch: refs/heads/master Commit: e6381b41f527674e5d0a5bd4335c4ad7907a5fa9 Parents: 0271026 Author: Gautier DI FOLCO <[email protected]> Authored: Tue Jul 24 14:38:53 2018 +0200 Committer: benwa <[email protected]> Committed: Thu Jul 26 13:46:51 2018 +0700 ---------------------------------------------------------------------- backends-common/jpa/pom.xml | 4 ++-- .../org/apache/james/backends/jpa/JpaTestCluster.java | 4 ++-- mailbox/jpa/pom.xml | 10 +++++----- mpt/impl/imap-mailbox/jpa/pom.xml | 4 ++-- mpt/impl/imap-mailbox/lucenesearch/pom.xml | 10 +++++----- mpt/pom.xml | 1 - pom.xml | 6 ------ server/container/guice/jpa-smtp-mariadb/pom.xml | 4 ++-- server/container/guice/jpa-smtp/pom.xml | 4 ++-- server/data/data-jpa/pom.xml | 4 ++-- 10 files changed, 22 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/backends-common/jpa/pom.xml ---------------------------------------------------------------------- diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml index 3fad710..2db2a06 100644 --- a/backends-common/jpa/pom.xml +++ b/backends-common/jpa/pom.xml @@ -15,8 +15,8 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java ---------------------------------------------------------------------- diff --git a/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java b/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java index fc96085..135b931 100644 --- a/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java +++ b/backends-common/jpa/src/test/java/org/apache/james/backends/jpa/JpaTestCluster.java @@ -38,8 +38,8 @@ public class JpaTestCluster { public static JpaTestCluster create(List<Class<?>> clazz) { HashMap<String, String> properties = new HashMap<>(); - properties.put("openjpa.ConnectionDriverName", org.h2.Driver.class.getName()); - properties.put("openjpa.ConnectionURL", "jdbc:h2:mem:mailboxintegrationtesting;DB_CLOSE_DELAY=-1"); // Memory H2 database + properties.put("openjpa.ConnectionDriverName", org.apache.derby.jdbc.EmbeddedDriver.class.getName()); + properties.put("openjpa.ConnectionURL", "jdbc:derby:memory:mailboxintegrationtesting;create=true"); // Memory Derby database properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)"); // Create Foreign Keys properties.put("openjpa.jdbc.MappingDefaults", "ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict"); properties.put("openjpa.jdbc.SchemaFactory", "native(ForeignKeys=true)"); http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/mailbox/jpa/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml index e613323..2af1c9e 100644 --- a/mailbox/jpa/pom.xml +++ b/mailbox/jpa/pom.xml @@ -68,11 +68,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> @@ -82,6 +77,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/mpt/impl/imap-mailbox/jpa/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/jpa/pom.xml b/mpt/impl/imap-mailbox/jpa/pom.xml index e7b90b1..2cb089c 100644 --- a/mpt/impl/imap-mailbox/jpa/pom.xml +++ b/mpt/impl/imap-mailbox/jpa/pom.xml @@ -58,8 +58,8 @@ <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/mpt/impl/imap-mailbox/lucenesearch/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/lucenesearch/pom.xml b/mpt/impl/imap-mailbox/lucenesearch/pom.xml index 0897a95..f8f8117 100644 --- a/mpt/impl/imap-mailbox/lucenesearch/pom.xml +++ b/mpt/impl/imap-mailbox/lucenesearch/pom.xml @@ -68,14 +68,14 @@ <artifactId>apache-james-mpt-imapmailbox-core</artifactId> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/mpt/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/pom.xml b/mpt/pom.xml index 738b653..d6092ee 100644 --- a/mpt/pom.xml +++ b/mpt/pom.xml @@ -55,7 +55,6 @@ <commons-lang.version>2.6</commons-lang.version> <derby.version>10.9.1.0</derby.version> <guice.version>4.0</guice.version> - <h2.version>1.3.170</h2.version> <hadoop.version>1.0.1</hadoop.version> <hbase.version>0.94.27</hbase.version> <jmock.version>2.6.0</jmock.version> http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9cc73f9..75a5853 100644 --- a/pom.xml +++ b/pom.xml @@ -598,7 +598,6 @@ <spring.version>3.2.18.RELEASE</spring.version> <geronimo-jms-spec.version>1.1.1</geronimo-jms-spec.version> <activmq-artemis.version>2.6.2</activmq-artemis.version> - <h2.version>1.3.170</h2.version> <apache-jspf-resolver.version>1.0.1</apache-jspf-resolver.version> <javamail.version>1.5.4</javamail.version> <javax-activation.version>1.1.1</javax-activation.version> @@ -1662,11 +1661,6 @@ <version>4.0</version> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2.version}</version> - </dependency> - <dependency> <groupId>com.jason-goodwin</groupId> <artifactId>better-monads</artifactId> <version>0.4.0</version> http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/server/container/guice/jpa-smtp-mariadb/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp-mariadb/pom.xml b/server/container/guice/jpa-smtp-mariadb/pom.xml index 97624e4..9135bf3 100644 --- a/server/container/guice/jpa-smtp-mariadb/pom.xml +++ b/server/container/guice/jpa-smtp-mariadb/pom.xml @@ -53,8 +53,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/server/container/guice/jpa-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml index 42f7ca5..4144d06 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -63,8 +63,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/e6381b41/server/data/data-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml index 23a7742..5cd2b64 100644 --- a/server/data/data-jpa/pom.xml +++ b/server/data/data-jpa/pom.xml @@ -82,8 +82,8 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> <scope>test</scope> </dependency> <dependency> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
