JAMES-1738 MPT should not depend on ONAMI
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/df506d9d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/df506d9d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/df506d9d Branch: refs/heads/master Commit: df506d9d1faa90c287005cc0dce9060357dd965b Parents: 7adbc83 Author: Benoit Tellier <[email protected]> Authored: Wed Oct 5 14:24:41 2016 +0200 Committer: Benoit Tellier <[email protected]> Committed: Wed Oct 5 16:40:41 2016 +0200 ---------------------------------------------------------------------- .../mpt/imapmailbox/cassandra/CassandraMailboxTest.java | 2 +- mpt/impl/imap-mailbox/core/pom.xml | 4 ++-- .../james/mpt/imapmailbox/AbstractMailboxTest.java | 2 +- .../james/mpt/imapmailbox/cyrus/CyrusMailboxTest.java | 4 ++-- .../elasticsearch/ElasticSearchMailboxTest.java | 4 ++-- .../imapmailbox/external/james/ExternalJamesTest.java | 4 ++-- .../james/mpt/imapmailbox/hbase/HBaseMailboxTest.java | 2 +- .../inmemory/InMemoryMailboxEventAsynchronousTest.java | 4 ++-- .../mpt/imapmailbox/inmemory/InMemoryMailboxTest.java | 2 +- .../james/mpt/imapmailbox/jcr/JcrMailboxTest.java | 2 +- .../james/mpt/imapmailbox/jpa/JpaMailboxTest.java | 2 +- .../mpt/imapmailbox/maildir/MaildirMailboxTest.java | 2 +- .../managesieve/cassandra/ManageSieveCassandraTest.java | 4 ++-- mpt/impl/managesieve/core/pom.xml | 4 ++-- .../james/mpt/managesieve/file/ManageSieveFileTest.java | 4 ++-- mpt/impl/smtp/cassandra/pom.xml | 12 ++++++------ .../test/java/org/apache/james/mpt/smtp/SmtpTest.java | 4 ++-- mpt/pom.xml | 11 +++++------ 18 files changed, 36 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java index 7ea7e29..bd3044a 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/CassandraMailboxTest.java @@ -20,7 +20,7 @@ package org.apache.james.mpt.imapmailbox.cassandra; import org.apache.james.mpt.imapmailbox.AbstractMailboxTest; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; @GuiceModules({ CassandraMailboxTestModule.class }) public class CassandraMailboxTest extends AbstractMailboxTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/core/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/pom.xml b/mpt/impl/imap-mailbox/core/pom.xml index 8a5d72d..627721b 100644 --- a/mpt/impl/imap-mailbox/core/pom.xml +++ b/mpt/impl/imap-mailbox/core/pom.xml @@ -57,8 +57,8 @@ <type>test-jar</type> </dependency> <dependency> - <groupId>org.apache.onami</groupId> - <artifactId>org.apache.onami.test</artifactId> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mpt-onami-test</artifactId> </dependency> <dependency> <groupId>ch.qos.logback</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java index ee695c0..7d674dc 100644 --- a/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java +++ b/mpt/impl/imap-mailbox/core/src/main/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java @@ -40,7 +40,7 @@ import org.apache.james.mpt.imapmailbox.suite.SelectedInbox; import org.apache.james.mpt.imapmailbox.suite.SelectedState; import org.apache.james.mpt.imapmailbox.suite.UidSearch; import org.apache.james.mpt.imapmailbox.suite.UserFlagsSupport; -import org.apache.onami.test.OnamiSuite; +import org.apache.james.mpt.onami.test.OnamiSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTest.java b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTest.java index d2133af..5a2b6bc 100644 --- a/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTest.java +++ b/mpt/impl/imap-mailbox/cyrus/src/test/java/org/apache/james/mpt/imapmailbox/cyrus/CyrusMailboxTest.java @@ -21,8 +21,8 @@ package org.apache.james.mpt.imapmailbox.cyrus; import org.apache.james.mpt.imapmailbox.suite.ACLCommands; import org.apache.james.mpt.imapmailbox.suite.ACLIntegration; -import org.apache.onami.test.OnamiSuite; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.OnamiSuite; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.junit.runner.RunWith; import org.junit.runners.Suite.SuiteClasses; http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchMailboxTest.java b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchMailboxTest.java index d41f5da..36fa2fd 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchMailboxTest.java +++ b/mpt/impl/imap-mailbox/elasticsearch/src/test/java/org/apache/james/mpt/imapmailbox/elasticsearch/ElasticSearchMailboxTest.java @@ -20,8 +20,8 @@ package org.apache.james.mpt.imapmailbox.elasticsearch; import org.apache.james.mpt.imapmailbox.suite.UidSearchOnIndex; -import org.apache.onami.test.OnamiSuite; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.OnamiSuite; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.junit.runner.RunWith; import org.junit.runners.Suite; http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesTest.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesTest.java index 566103e..39e1966 100644 --- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesTest.java +++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/ExternalJamesTest.java @@ -21,8 +21,8 @@ package org.apache.james.mpt.imapmailbox.external.james; import org.apache.james.mpt.imapmailbox.suite.DeploymentValidation; -import org.apache.onami.test.OnamiSuite; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.OnamiSuite; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.junit.runner.RunWith; import org.junit.runners.Suite; http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java index e4157ec..bbbe160 100644 --- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java +++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java @@ -1,7 +1,7 @@ package org.apache.james.mpt.imapmailbox.hbase; import org.apache.james.mpt.imapmailbox.AbstractMailboxTest; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; @GuiceModules({ HBaseMailboxTestModule.class }) public class HBaseMailboxTest extends AbstractMailboxTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxEventAsynchronousTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxEventAsynchronousTest.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxEventAsynchronousTest.java index bbc5dba..a15614b 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxEventAsynchronousTest.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxEventAsynchronousTest.java @@ -37,8 +37,8 @@ import org.apache.james.mpt.imapmailbox.suite.Select; import org.apache.james.mpt.imapmailbox.suite.SelectedInbox; import org.apache.james.mpt.imapmailbox.suite.SelectedState; import org.apache.james.mpt.imapmailbox.suite.UidSearch; -import org.apache.onami.test.OnamiSuite; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.OnamiSuite; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.junit.runner.RunWith; import org.junit.runners.Suite; http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java index 95493d2..5983593 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java @@ -19,7 +19,7 @@ package org.apache.james.mpt.imapmailbox.inmemory; import org.apache.james.mpt.imapmailbox.AbstractMailboxTest; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; @GuiceModules({ InMemoryMailboxTestModule.class }) public class InMemoryMailboxTest extends AbstractMailboxTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java index 6d808c4..fcc3621 100644 --- a/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java +++ b/mpt/impl/imap-mailbox/jcr/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java @@ -19,7 +19,7 @@ package org.apache.james.mpt.imapmailbox.jcr; import org.apache.james.mpt.imapmailbox.AbstractMailboxTest; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.junit.Ignore; @Ignore("JWC-130 : JCR mailbox does not correctly release resources + append problems") http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java index d5d112a..f808afd 100644 --- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java +++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java @@ -19,7 +19,7 @@ package org.apache.james.mpt.imapmailbox.jpa; import org.apache.james.mpt.imapmailbox.AbstractMailboxTest; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; @GuiceModules({ JpaMailboxTestModule.class }) public class JpaMailboxTest extends AbstractMailboxTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java index 654834a..88edfc3 100644 --- a/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java +++ b/mpt/impl/imap-mailbox/maildir/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java @@ -19,7 +19,7 @@ package org.apache.james.mpt.imapmailbox.maildir; import org.apache.james.mpt.imapmailbox.AbstractMailboxTest; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; @GuiceModules({ MaildirMailboxTestModule.class }) public class MaildirMailboxTest extends AbstractMailboxTest { http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/ManageSieveCassandraTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/ManageSieveCassandraTest.java b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/ManageSieveCassandraTest.java index f41af26..22abd4a 100644 --- a/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/ManageSieveCassandraTest.java +++ b/mpt/impl/managesieve/cassandra/src/test/java/org/apache/james/mpt/managesieve/cassandra/ManageSieveCassandraTest.java @@ -19,6 +19,8 @@ package org.apache.james.mpt.managesieve.cassandra; +import org.apache.james.mpt.onami.test.OnamiSuite; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.apache.james.mpt.testsuite.AuthenticateTest; import org.apache.james.mpt.testsuite.CapabilityTest; import org.apache.james.mpt.testsuite.CheckScriptTest; @@ -33,8 +35,6 @@ import org.apache.james.mpt.testsuite.RenameScriptTest; import org.apache.james.mpt.testsuite.SetActiveTest; import org.apache.james.mpt.testsuite.StartTlsTest; import org.apache.james.mpt.testsuite.UnauthenticatedTest; -import org.apache.onami.test.OnamiSuite; -import org.apache.onami.test.annotation.GuiceModules; import org.junit.runner.RunWith; import org.junit.runners.Suite; http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/managesieve/core/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/managesieve/core/pom.xml b/mpt/impl/managesieve/core/pom.xml index 823d741..a248e37 100644 --- a/mpt/impl/managesieve/core/pom.xml +++ b/mpt/impl/managesieve/core/pom.xml @@ -55,8 +55,8 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>org.apache.onami</groupId> - <artifactId>org.apache.onami.test</artifactId> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mpt-onami-test</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/ManageSieveFileTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/ManageSieveFileTest.java b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/ManageSieveFileTest.java index e4cf40c..9b98838 100644 --- a/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/ManageSieveFileTest.java +++ b/mpt/impl/managesieve/file/src/test/java/org/apache/james/mpt/managesieve/file/ManageSieveFileTest.java @@ -19,6 +19,8 @@ package org.apache.james.mpt.managesieve.file; +import org.apache.james.mpt.onami.test.OnamiSuite; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.apache.james.mpt.testsuite.AuthenticateTest; import org.apache.james.mpt.testsuite.CapabilityTest; import org.apache.james.mpt.testsuite.CheckScriptTest; @@ -33,8 +35,6 @@ import org.apache.james.mpt.testsuite.RenameScriptTest; import org.apache.james.mpt.testsuite.SetActiveTest; import org.apache.james.mpt.testsuite.StartTlsTest; import org.apache.james.mpt.testsuite.UnauthenticatedTest; -import org.apache.onami.test.OnamiSuite; -import org.apache.onami.test.annotation.GuiceModules; import org.junit.runner.RunWith; import org.junit.runners.Suite; http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/smtp/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml index 78a378a..3d3aab0 100644 --- a/mpt/impl/smtp/cassandra/pom.xml +++ b/mpt/impl/smtp/cassandra/pom.xml @@ -195,8 +195,8 @@ <version>18.0</version> </dependency> <dependency> - <groupId>org.apache.onami</groupId> - <artifactId>org.apache.onami.test</artifactId> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mpt-onami-test</artifactId> </dependency> <dependency> <groupId>org.cassandraunit</groupId> @@ -270,6 +270,10 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> + <artifactId>apache-james-mpt-onami-test</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> <artifactId>james-server-cassandra-guice</artifactId> </dependency> <dependency> @@ -290,10 +294,6 @@ <version>18.0</version> </dependency> <dependency> - <groupId>org.apache.onami</groupId> - <artifactId>org.apache.onami.test</artifactId> - </dependency> - <dependency> <groupId>org.cassandraunit</groupId> <artifactId>cassandra-unit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTest.java ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTest.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTest.java index 569c98c..5a7beea 100644 --- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTest.java +++ b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/SmtpTest.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.mpt.smtp; -import org.apache.onami.test.OnamiSuite; -import org.apache.onami.test.annotation.GuiceModules; +import org.apache.james.mpt.onami.test.OnamiSuite; +import org.apache.james.mpt.onami.test.annotation.GuiceModules; import org.junit.runner.RunWith; import org.junit.runners.Suite; http://git-wip-us.apache.org/repos/asf/james-project/blob/df506d9d/mpt/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/pom.xml b/mpt/pom.xml index bbe1466..517fe60 100644 --- a/mpt/pom.xml +++ b/mpt/pom.xml @@ -101,7 +101,6 @@ <junit.version>4.11</junit.version> <log4j.version>1.2.16</log4j.version> <lucene-core.version>3.6.0</lucene-core.version> - <onami.version>1.4.1-incubating-SNAPSHOT</onami.version> <slf4j.version>1.6.6</slf4j.version> <assertj-1.version>1.7.1</assertj-1.version> <assertj-3.version>3.2.0</assertj-3.version> @@ -154,6 +153,11 @@ <version>${project.version}</version> <type>test-jar</type> </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-mpt-onami-test</artifactId> + <version>${project.version}</version> + </dependency> <!-- Other Apache James sub projects --> <dependency> <groupId>org.apache.james</groupId> @@ -437,11 +441,6 @@ <version>4.12</version> </dependency> <dependency> - <groupId>org.apache.onami</groupId> - <artifactId>org.apache.onami.test</artifactId> - <version>${onami.version}</version> - </dependency> - <dependency> <groupId>org.cassandraunit</groupId> <artifactId>cassandra-unit</artifactId> <version>2.1.9.2</version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
