http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/jmap/pom.xml b/server/container/guice/protocols/jmap/pom.xml index 5bcc8bf..fb72ece 100644 --- a/server/container/guice/protocols/jmap/pom.xml +++ b/server/container/guice/protocols/jmap/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-jmap</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/lmtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/lmtp/pom.xml b/server/container/guice/protocols/lmtp/pom.xml index 7c757f4..cda2c6e 100644 --- a/server/container/guice/protocols/lmtp/pom.xml +++ b/server/container/guice/protocols/lmtp/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-lmtp</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/managedsieve/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/managedsieve/pom.xml b/server/container/guice/protocols/managedsieve/pom.xml index 6fde962..78066ba 100644 --- a/server/container/guice/protocols/managedsieve/pom.xml +++ b/server/container/guice/protocols/managedsieve/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-managedsieve</artifactId> @@ -45,10 +45,6 @@ <artifactId>james-server-protocols-managesieve</artifactId> </dependency> <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-managesieve</artifactId> - </dependency> - <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> @@ -56,6 +52,10 @@ <groupId>com.google.inject.extensions</groupId> <artifactId>guice-multibindings</artifactId> </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-managesieve</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/pop/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/pop/pom.xml b/server/container/guice/protocols/pop/pom.xml index 565b4f0..fad870c 100644 --- a/server/container/guice/protocols/pop/pom.xml +++ b/server/container/guice/protocols/pop/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-pop</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/smtp/pom.xml b/server/container/guice/protocols/smtp/pom.xml index 908122f..3928544 100644 --- a/server/container/guice/protocols/smtp/pom.xml +++ b/server/container/guice/protocols/smtp/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-smtp</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/webadmin-cassandra/pom.xml b/server/container/guice/protocols/webadmin-cassandra/pom.xml index 91aa5a8..3f438ad 100644 --- a/server/container/guice/protocols/webadmin-cassandra/pom.xml +++ b/server/container/guice/protocols/webadmin-cassandra/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-webadmin-cassandra</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin-data/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/webadmin-data/pom.xml b/server/container/guice/protocols/webadmin-data/pom.xml index b98c809..5e5d068 100644 --- a/server/container/guice/protocols/webadmin-data/pom.xml +++ b/server/container/guice/protocols/webadmin-data/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-webadmin-data</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin-mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/webadmin-mailbox/pom.xml b/server/container/guice/protocols/webadmin-mailbox/pom.xml index b295e92..9ca7ef9 100644 --- a/server/container/guice/protocols/webadmin-mailbox/pom.xml +++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-webadmin-mailbox</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/webadmin-swagger/pom.xml b/server/container/guice/protocols/webadmin-swagger/pom.xml index 05adf0d..3cd8701 100644 --- a/server/container/guice/protocols/webadmin-swagger/pom.xml +++ b/server/container/guice/protocols/webadmin-swagger/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-webadmin-swagger</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/webadmin/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/webadmin/pom.xml b/server/container/guice/protocols/webadmin/pom.xml index 5d6e1a6..33b26d1 100644 --- a/server/container/guice/protocols/webadmin/pom.xml +++ b/server/container/guice/protocols/webadmin/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server-guice</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>james-server-guice-webadmin</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/mailbox-adapter/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml index f30b911..b8e94f5 100644 --- a/server/container/mailbox-adapter/pom.xml +++ b/server/container/mailbox-adapter/pom.xml @@ -35,50 +35,50 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>apache-james-mailbox-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>apache-james-mailbox-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>apache-james-mailbox-maildir</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util-java8</artifactId> + <artifactId>apache-james-mailbox-memory</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-api</artifactId> + <artifactId>apache-james-mailbox-store</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-memory</artifactId> + <artifactId>apache-james-mailbox-store</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> + <artifactId>apache-james-mailbox-tool</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-store</artifactId> - <type>test-jar</type> - <scope>test</scope> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-maildir</artifactId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-tool</artifactId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-util-java8</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -99,6 +99,10 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/metrics/metrics-es-reporter/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/metrics/metrics-es-reporter/pom.xml b/server/container/metrics/metrics-es-reporter/pom.xml index 1635a22..b40cb91 100644 --- a/server/container/metrics/metrics-es-reporter/pom.xml +++ b/server/container/metrics/metrics-es-reporter/pom.xml @@ -18,13 +18,13 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>metrics-es-reporter</artifactId> @@ -35,13 +35,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>metrics-dropwizard</artifactId> + <artifactId>james-server-util-java8</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util-java8</artifactId> - <type>test-jar</type> + <artifactId>metrics-dropwizard</artifactId> <scope>test</scope> </dependency> <dependency> @@ -68,12 +68,12 @@ </dependency> <dependency> <groupId>org.elasticsearch</groupId> - <artifactId>metrics-elasticsearch-reporter</artifactId> + <artifactId>elasticsearch</artifactId> + <version>2.2.1</version> </dependency> <dependency> <groupId>org.elasticsearch</groupId> - <artifactId>elasticsearch</artifactId> - <version>2.2.1</version> + <artifactId>metrics-elasticsearch-reporter</artifactId> </dependency> <dependency> <groupId>org.testcontainers</groupId> @@ -90,4 +90,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/spring/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index de37a0b..f8299fe 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -35,37 +35,37 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>apache-james-mailbox-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>apache-james-mailbox-tool</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> - <scope>test</scope> - <type>test-jar</type> + <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-mailetcontainer-api</artifactId> + <artifactId>james-server-core</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> + <artifactId>james-server-filesystem-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-api</artifactId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -73,30 +73,69 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-tool</artifactId> + <artifactId>james-server-mailetcontainer-api</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-protocols-library</artifactId> + </dependency> + <dependency> + <groupId>com.sparkjava</groupId> + <artifactId>spark-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-spring</artifactId> + <version>${activemq.version}</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.james.protocols</groupId> <artifactId>protocols-api</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-spring</artifactId> - <version>${activemq.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -108,24 +147,28 @@ </dependency> <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> <scope>compile</scope> <exclusions> <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> + <groupId>org.springframework</groupId> </exclusion> <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> + <groupId>org.springframework</groupId> </exclusion> <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> + <groupId>org.springframework</groupId> </exclusion> <exclusion> - <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> + <groupId>org.springframework</groupId> </exclusion> </exclusions> </dependency> @@ -138,49 +181,6 @@ <artifactId>spring-osgi-extender</artifactId> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sparkjava</groupId> - <artifactId>spark-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>pl.pragmatists</groupId> <artifactId>JUnitParams</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/util-java8/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/util-java8/pom.xml b/server/container/util-java8/pom.xml index 92da74f..7da0ffe 100644 --- a/server/container/util-java8/pom.xml +++ b/server/container/util-java8/pom.xml @@ -30,7 +30,6 @@ <artifactId>james-server-util-java8</artifactId> <name>Apache James :: Server :: Common Utilities :: Java 8</name> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -66,6 +65,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>nl.jqno.equalsverifier</groupId> + <artifactId>equalsverifier</artifactId> + <version>1.7.6</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> @@ -79,12 +84,6 @@ <artifactId>testcontainers</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>nl.jqno.equalsverifier</groupId> - <artifactId>equalsverifier</artifactId> - <scope>test</scope> - <version>1.7.6</version> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/util/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml index 48f4e75..1577010 100644 --- a/server/container/util/pom.xml +++ b/server/container/util/pom.xml @@ -34,16 +34,12 @@ <dependencies> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>junit</groupId> @@ -55,6 +51,10 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml index bbd8dff..9761dd5 100644 --- a/server/data/data-cassandra/pom.xml +++ b/server/data/data-cassandra/pom.xml @@ -35,6 +35,15 @@ <groupId>${project.groupId}</groupId> <artifactId>apache-james-backends-cassandra</artifactId> </dependency> + + <!-- Test dependencies --> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>apache-james-backends-cassandra</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-data-api</artifactId> @@ -45,7 +54,19 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-library</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -64,31 +85,6 @@ <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - - <!-- Test dependencies --> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-james-backends-cassandra</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> <groupId>info.cukes</groupId> <artifactId>cucumber-java</artifactId> <scope>test</scope> @@ -125,11 +121,24 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>noTest</id> @@ -152,13 +161,4 @@ </profile> </profiles> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> - </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-file/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml index 7b2aafa..a1a443e 100644 --- a/server/data/data-file/pom.xml +++ b/server/data/data-file/pom.xml @@ -35,11 +35,11 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>james-server-core</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -51,35 +51,45 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> + <artifactId>james-server-data-library</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <artifactId>james-server-dnsservice-api</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-filesystem-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> </dependency> <!-- Test dependencies --> @@ -99,26 +109,12 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> - <type>test-jar</type> - <scope>test</scope> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <type>test-jar</type> + <groupId>junit</groupId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> @@ -128,6 +124,10 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml index 52210e3..15cd908 100644 --- a/server/data/data-hbase/pom.xml +++ b/server/data/data-hbase/pom.xml @@ -33,67 +33,55 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>apache-james-mailbox-hbase</artifactId> + <classifier>tests</classifier> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>james-server-data-library</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-data-library</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>13.0</version> + <!--$NO-MVN-MAN-VER$--> </dependency> <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <exclusions> - <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-core</artifactId> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <!-- Test dependencies --> <dependency> @@ -112,54 +100,63 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>13.0</version><!--$NO-MVN-MAN-VER$--> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <scope>test</scope> - <type>test-jar</type> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-hbase</artifactId> - <classifier>tests</classifier> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-test</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase</artifactId> - <type>test-jar</type> - <scope>test</scope> <exclusions> <exclusion> - <groupId>org.jruby</groupId> <artifactId>jruby-complete</artifactId> + <groupId>org.jruby</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase</artifactId> + <type>test-jar</type> <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>jruby-complete</artifactId> + <groupId>org.jruby</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.assertj</groupId> @@ -168,6 +165,10 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-jcr/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jcr/pom.xml b/server/data/data-jcr/pom.xml index e5c146f..5900ccc 100644 --- a/server/data/data-jcr/pom.xml +++ b/server/data/data-jcr/pom.xml @@ -35,43 +35,45 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> + <artifactId>james-server-core</artifactId> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> + <artifactId>james-server-data-library</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-library</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-commons</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> </dependency> <!-- Test dependencies --> @@ -81,24 +83,21 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> - <scope>test</scope> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-core</artifactId> - <scope>test</scope> + <artifactId>jackrabbit-jcr-commons</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> <dependency> @@ -106,8 +105,9 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml index da2c8ca..b2e1683 100644 --- a/server/data/data-jdbc/pom.xml +++ b/server/data/data-jdbc/pom.xml @@ -35,39 +35,44 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util</artifactId> + <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>james-server-core</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>james-server-data-library</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> + <artifactId>james-server-data-library</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> + <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <artifactId>james-server-filesystem-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-util</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -78,13 +83,13 @@ <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <scope>runtime</scope> </dependency> <!-- Test dependencies --> @@ -103,41 +108,36 @@ <artifactId>cucumber-picocontainer</artifactId> <scope>test</scope> </dependency> + <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> + <groupId>junit</groupId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> - <type>test-jar</type> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-jmap-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml index b4d0fb0..918d2bb 100644 --- a/server/data/data-jmap-cassandra/pom.xml +++ b/server/data/data-jmap-cassandra/pom.xml @@ -19,6 +19,8 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>james-server</artifactId> <groupId>org.apache.james</groupId> @@ -26,14 +28,11 @@ <relativePath>../../pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>james-server-data-jmap-cassandra</artifactId> <packaging>jar</packaging> <name>Apache James :: Server :: Data :: JMAP :: Cassandra persistance</name> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -42,8 +41,8 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-james-backends-cassandra</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -52,8 +51,8 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-data-jmap</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -95,6 +94,15 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>noTest</id> @@ -116,13 +124,4 @@ </build> </profile> </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml index ad127fb..26bd964 100644 --- a/server/data/data-jmap/pom.xml +++ b/server/data/data-jmap/pom.xml @@ -51,10 +51,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> @@ -64,6 +60,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml index 1e60351..addb50a 100644 --- a/server/data/data-jpa/pom.xml +++ b/server/data/data-jpa/pom.xml @@ -40,41 +40,59 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-james-backends-jpa</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> + <artifactId>james-server-data-library</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>james-server-data-library</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> + <artifactId>james-server-dnsservice-api</artifactId> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </dependency> + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <scope>test</scope> + </dependency> <!-- Test dependencies --> <dependency> @@ -98,31 +116,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -138,10 +138,17 @@ <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> <version>2.4.2</version> + <executions> + <execution> + <id>enhancer</id> + <phase>process-classes</phase> + <goals> + <goal>enhance</goal> + </goals> + </execution> + </executions> <configuration> - <includes> - org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/rrt/jpa/model/JPARecipientRewrite.class,org/apache/james/domainlist/jpa/model/JPADomain.class - </includes> + <includes>org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/rrt/jpa/model/JPARecipientRewrite.class,org/apache/james/domainlist/jpa/model/JPADomain.class</includes> <addDefaultConstructor>true</addDefaultConstructor> <enforcePropertyRestrictions>true</enforcePropertyRestrictions> <toolProperties> @@ -151,21 +158,10 @@ </property> <property> <name>metaDataFactory</name> - <value> - jpa(Types=org.apache.james.user.jpa.model.JPAUser;org.apache.james.rrt.jpa.model.JPARecipientRewrite;org.apache.james.domainlist.jpa.model.JPADomain) - </value> + <value>jpa(Types=org.apache.james.user.jpa.model.JPAUser;org.apache.james.rrt.jpa.model.JPARecipientRewrite;org.apache.james.domainlist.jpa.model.JPADomain)</value> </property> </toolProperties> </configuration> - <executions> - <execution> - <id>enhancer</id> - <phase>process-classes</phase> - <goals> - <goal>enhance</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.felix</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-ldap/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/pom.xml b/server/data/data-ldap/pom.xml index 0c83739..4f6a8f5 100644 --- a/server/data/data-ldap/pom.xml +++ b/server/data/data-ldap/pom.xml @@ -35,31 +35,23 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>james-server-data-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-util</artifactId> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> <groupId>com.github.steveash.guavate</groupId> <artifactId>guavate</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> </dependency> <dependency> <groupId>junit</groupId> @@ -67,6 +59,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> </dependency> @@ -76,6 +72,10 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-library/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml index a13c071..8ea942d 100644 --- a/server/data/data-library/pom.xml +++ b/server/data/data-library/pom.xml @@ -35,7 +35,12 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>apache-mailet-api</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-core</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -47,11 +52,17 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> <groupId>com.github.steveash.guavate</groupId> @@ -62,20 +73,12 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> </dependency> <!-- Test dependencies --> @@ -90,6 +93,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -111,23 +118,16 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> - <scope>test</scope> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> <scope>test</scope> - <type>test-jar</type> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/data/data-memory/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml index 28202c5..989cae5 100644 --- a/server/data/data-memory/pom.xml +++ b/server/data/data-memory/pom.xml @@ -43,13 +43,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> + <artifactId>james-server-data-library</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> + <artifactId>james-server-dnsservice-api</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/dns-service/dnsservice-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-api/pom.xml b/server/dns-service/dnsservice-api/pom.xml index b450545..23ba212 100644 --- a/server/dns-service/dnsservice-api/pom.xml +++ b/server/dns-service/dnsservice-api/pom.xml @@ -33,16 +33,16 @@ <name>Apache James :: Server :: DNS Service :: API</name> <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/dns-service/dnsservice-dnsjava/pom.xml ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-dnsjava/pom.xml b/server/dns-service/dnsservice-dnsjava/pom.xml index eda568a..252688b 100644 --- a/server/dns-service/dnsservice-dnsjava/pom.xml +++ b/server/dns-service/dnsservice-dnsjava/pom.xml @@ -46,18 +46,14 @@ <artifactId>metrics-api</artifactId> </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + <dependency> <groupId>dnsjava</groupId> <artifactId>dnsjava</artifactId> </dependency> @@ -65,10 +61,6 @@ <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.1_spec</artifactId> - </dependency> <dependency> <groupId>junit</groupId> @@ -76,6 +68,10 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.1_spec</artifactId> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> @@ -86,6 +82,10 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/dns-service/dnsservice-library/pom.xml ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml index 36fe4a8..0f2b6c1 100644 --- a/server/dns-service/dnsservice-library/pom.xml +++ b/server/dns-service/dnsservice-library/pom.xml @@ -35,34 +35,34 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>apache-mailet-api</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-dnsservice-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <artifactId>james-server-dnsservice-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <type>test-jar</type> - <scope>test</scope> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/karaf/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/server/karaf/distribution/pom.xml b/server/karaf/distribution/pom.xml index ac6c3ff..0729dbf 100644 --- a/server/karaf/distribution/pom.xml +++ b/server/karaf/distribution/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> <artifactId>james-server</artifactId> + <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -16,6 +16,11 @@ <dependencies> <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-karaf-features</artifactId> + <type>pom</type> + </dependency> + <dependency> <groupId>org.apache.karaf</groupId> <artifactId>apache-karaf</artifactId> <version>${karaf.version}</version> @@ -28,19 +33,13 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-karaf-features</artifactId> - <type>pom</type> - </dependency> </dependencies> - <build> <resources> <resource> - <directory>src/main/filtered-resources</directory> <filtering>true</filtering> + <directory>src/main/filtered-resources</directory> <includes> <include>**/*</include> </includes> @@ -50,12 +49,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <configuration> - <useDefaultDelimiters>false</useDefaultDelimiters> - <delimiters> - <delimiter>${*}</delimiter> - </delimiters> - </configuration> <executions> <execution> <id>filter</id> @@ -65,6 +58,12 @@ </goals> </execution> </executions> + <configuration> + <useDefaultDelimiters>false</useDefaultDelimiters> + <delimiters> + <delimiter>${*}</delimiter> + </delimiters> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -122,17 +121,12 @@ <goals> <goal>add-features-to-repo</goal> </goals> + <inherited>false</inherited> <configuration> <descriptors> - <descriptor> - mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features - </descriptor> - <descriptor> - mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features - </descriptor> - <descriptor> - mvn:org.apache.james.karaf/james-karaf-features/${project.version}/xml/features - </descriptor> + <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor> + <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor> + <descriptor>mvn:org.apache.james.karaf/james-karaf-features/${project.version}/xml/features</descriptor> </descriptors> <features> <feature>config</feature> @@ -142,7 +136,6 @@ <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors> <repository>target/features-repo</repository> </configuration> - <inherited>false</inherited> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/server/karaf/features/pom.xml b/server/karaf/features/pom.xml index bd04f2a..c8627f6 100644 --- a/server/karaf/features/pom.xml +++ b/server/karaf/features/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> <artifactId>james-server</artifactId> + <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -24,9 +24,9 @@ <build> <resources> <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> <targetPath>${project.build.directory}</targetPath> + <filtering>true</filtering> + <directory>src/main/resources</directory> </resource> </resources> @@ -89,4 +89,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/karaf/integration/pom.xml ---------------------------------------------------------------------- diff --git a/server/karaf/integration/pom.xml b/server/karaf/integration/pom.xml index 0348012..3bcc628 100644 --- a/server/karaf/integration/pom.xml +++ b/server/karaf/integration/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> <artifactId>james-server</artifactId> + <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -15,14 +15,43 @@ <dependencies> <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-dnsservice-dnsjava</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <scope>test</scope> + </dependency> + + <!-- Apache Felix Karaf integration --> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-fetchmail</artifactId> + <artifactId>james-karaf-distribution</artifactId> + <type>tar.gz</type> <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>org.apache.karaf.client</artifactId> + <groupId>org.apache.karaf</groupId> + </exclusion> + <exclusion> + <artifactId>org.eclipse.osgi</artifactId> + <groupId>org.eclipse.osgi</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-karaf-features</artifactId> + <type>pom</type> </dependency> <dependency> <groupId>org.apache.james</groupId> @@ -31,41 +60,39 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-mailetcontainer-camel</artifactId> + <artifactId>james-server-dnsservice-dnsjava</artifactId> <scope>test</scope> </dependency> - - <!-- Pax-Exam dependencies --> <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam</artifactId> + <groupId>org.apache.james</groupId> + <artifactId>james-server-fetchmail</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.karaf.tooling.exam</groupId> - <artifactId>org.apache.karaf.tooling.exam.container</artifactId> + <groupId>org.apache.james</groupId> + <artifactId>james-server-mailetcontainer-camel</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-junit4</artifactId> + <groupId>org.apache.karaf.tooling.exam</groupId> + <artifactId>org.apache.karaf.tooling.exam.container</artifactId> <scope>test</scope> </dependency> + <!-- Pax-Exam dependencies --> <dependency> <groupId>org.ops4j.pax.exam</groupId> - <artifactId>pax-exam-link-mvn</artifactId> - <scope>test</scope> + <artifactId>pax-exam</artifactId> </dependency> - <dependency> - <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-junit4</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> + <groupId>org.ops4j.pax.exam</groupId> + <artifactId>pax-exam-link-mvn</artifactId> <scope>test</scope> </dependency> @@ -74,42 +101,14 @@ <artifactId>pax-swissbox-tinybundles</artifactId> </dependency> - <!-- Apache Felix Karaf integration --> <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-karaf-distribution</artifactId> - <scope>test</scope> - <type>tar.gz</type> - <exclusions> - <exclusion> - <groupId>org.apache.karaf</groupId> - <artifactId>org.apache.karaf.client</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.osgi</groupId> - <artifactId>org.eclipse.osgi</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.ops4j.pax.url</groupId> + <artifactId>pax-url-aether</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-karaf-features</artifactId> - <type>pom</type> - </dependency> - </dependencies> - <build> <plugins> <plugin> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
