http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/app/pom.xml ---------------------------------------------------------------------- diff --git a/server/app/pom.xml b/server/app/pom.xml index ba0c491..1a5feba 100644 --- a/server/app/pom.xml +++ b/server/app/pom.xml @@ -22,8 +22,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> @@ -51,8 +51,7 @@ <javamail.system-properties>${javamail.system-property1} ${javamail.system-property2} ${javamail.system-property3} ${javamail.system-property4} ${javamail.system-property5} ${javamail.system-property6} ${javamail.system-property7} ${javamail.system-property8} - ${javamail.system-property9} ${javamail.system-property10} - </javamail.system-properties> + ${javamail.system-property9} ${javamail.system-property10}</javamail.system-properties> <!-- JMX system properties --> <!-- For more details see --> @@ -74,11 +73,8 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-cli</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-core</artifactId> + <artifactId>apache-james-mailbox-jcr</artifactId> + <scope>runtime</scope> <exclusions> <exclusion> <artifactId>mail</artifactId> @@ -88,11 +84,19 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>metrics-logger</artifactId> + <artifactId>apache-james-mailbox-jpa</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-api</artifactId> + <artifactId>apache-james-mailbox-memory</artifactId> + <scope>runtime</scope> <exclusions> <exclusion> <artifactId>mail</artifactId> @@ -102,9 +106,18 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-library</artifactId> + <artifactId>apache-james-mailbox-spring</artifactId> + <scope>runtime</scope> <exclusions> <exclusion> + <artifactId>hbase</artifactId> + <groupId>org.apache.hbase</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-core</artifactId> + <groupId>org.apache.hadoop</groupId> + </exclusion> + <exclusion> <artifactId>mail</artifactId> <groupId>javax.mail</groupId> </exclusion> @@ -112,15 +125,21 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>james-server-cli</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>james-server-core</artifactId> + <exclusions> + <exclusion> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-mailetcontainer-api</artifactId> + <artifactId>james-server-data-api</artifactId> <exclusions> <exclusion> <artifactId>mail</artifactId> @@ -128,9 +147,11 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-api</artifactId> + <artifactId>james-server-data-file</artifactId> + <scope>runtime</scope> <exclusions> <exclusion> <artifactId>mail</artifactId> @@ -140,15 +161,24 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-spring</artifactId> + <artifactId>james-server-data-hbase</artifactId> + <scope>runtime</scope> <exclusions> <exclusion> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-osgi-extender</artifactId> + <artifactId>jruby-complete</artifactId> + <groupId>org.jruby</groupId> </exclusion> <exclusion> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>hsqldb</artifactId> + <groupId>hsqldb</groupId> + </exclusion> + <exclusion> + <artifactId>hbase</artifactId> + <groupId>org.apache.hbase</groupId> + </exclusion> + <exclusion> + <artifactId>hadoop-core</artifactId> + <groupId>org.apache.hadoop</groupId> </exclusion> <exclusion> <artifactId>mail</artifactId> @@ -156,77 +186,62 @@ </exclusion> </exclusions> </dependency> - <!-- Runtime dependencies which will get included in the generated binary distribution --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>commons-daemon</groupId> - <artifactId>commons-daemon</artifactId> - </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-jcr</artifactId> <scope>runtime</scope> <exclusions> <exclusion> - <artifactId>tools</artifactId> - <groupId>com.sun</groupId> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-jdbc</artifactId> <scope>runtime</scope> <exclusions> <exclusion> - <artifactId>tools</artifactId> - <groupId>com.sun</groupId> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-spring</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-jpa</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-ldap</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-data-library</artifactId> <scope>runtime</scope> + <exclusions> + <exclusion> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-api</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-dnsservice-dnsjava</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-mailetcontainer-camel</artifactId> - <scope>runtime</scope> + <artifactId>james-server-dnsservice-library</artifactId> <exclusions> <exclusion> <artifactId>mail</artifactId> @@ -236,7 +251,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-mailbox-adapter</artifactId> + <artifactId>james-server-fetchmail</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -247,30 +262,15 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-api</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-dnsservice-dnsjava</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>metrics-api</artifactId> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>metrics-dropwizard</artifactId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> - <scope>runtime</scope> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util</artifactId> + <artifactId>james-server-mailbox-adapter</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -281,8 +281,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-library</artifactId> - <scope>runtime</scope> + <artifactId>james-server-mailetcontainer-api</artifactId> <exclusions> <exclusion> <artifactId>mail</artifactId> @@ -292,13 +291,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-ldap</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-smtp</artifactId> + <artifactId>james-server-mailetcontainer-camel</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -309,12 +302,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-imap4</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-lmtp</artifactId> + <artifactId>james-server-mailets</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -325,12 +313,17 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-managesieve</artifactId> + <artifactId>james-server-protocols-imap4</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-pop3</artifactId> + <artifactId>james-server-protocols-library</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-protocols-lmtp</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -340,12 +333,13 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.james.protocols</groupId> - <artifactId>protocols-managesieve</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-protocols-managesieve</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-fetchmail</artifactId> + <artifactId>james-server-protocols-pop3</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -354,9 +348,10 @@ </exclusion> </exclusions> </dependency> + <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-file</artifactId> + <artifactId>james-server-protocols-smtp</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -367,7 +362,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-jms</artifactId> + <artifactId>james-server-queue-activemq</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -378,8 +373,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-activemq</artifactId> - <scope>runtime</scope> + <artifactId>james-server-queue-api</artifactId> <exclusions> <exclusion> <artifactId>mail</artifactId> @@ -389,7 +383,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-mailets</artifactId> + <artifactId>james-server-queue-file</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -398,27 +392,9 @@ </exclusion> </exclusions> </dependency> - <!-- Comment jackrabbit dependency to avoid lucene version clash with mailbox-lucene (JAMES-1297) - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-core</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </exclusion> - </exclusions> - </dependency> - --> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>runtime</scope> - </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-jpa</artifactId> + <artifactId>james-server-queue-jms</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -429,16 +405,15 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-spring</artifactId> - <scope>runtime</scope> + <artifactId>james-server-spring</artifactId> <exclusions> <exclusion> - <artifactId>hbase</artifactId> - <groupId>org.apache.hbase</groupId> + <artifactId>spring-osgi-extender</artifactId> + <groupId>org.springframework.osgi</groupId> </exclusion> <exclusion> - <artifactId>hadoop-core</artifactId> - <groupId>org.apache.hadoop</groupId> + <artifactId>org.osgi.core</artifactId> + <groupId>org.osgi</groupId> </exclusion> <exclusion> <artifactId>mail</artifactId> @@ -448,7 +423,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-jcr</artifactId> + <artifactId>james-server-util</artifactId> <scope>runtime</scope> <exclusions> <exclusion> @@ -459,80 +434,59 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-memory</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>mail</artifactId> - <groupId>javax.mail</groupId> - </exclusion> - </exclusions> + <artifactId>metrics-api</artifactId> </dependency> - <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-file</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>mail</artifactId> - <groupId>javax.mail</groupId> - </exclusion> - </exclusions> + <artifactId>metrics-dropwizard</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-jpa</artifactId> - <scope>runtime</scope> + <artifactId>metrics-logger</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-jdbc</artifactId> + <groupId>commons-daemon</groupId> + <artifactId>commons-daemon</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> <scope>runtime</scope> <exclusions> <exclusion> - <artifactId>mail</artifactId> - <groupId>javax.mail</groupId> + <artifactId>tools</artifactId> + <groupId>com.sun</groupId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-hbase</artifactId> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring</artifactId> <scope>runtime</scope> <exclusions> <exclusion> - <groupId>org.jruby</groupId> - <artifactId>jruby-complete</artifactId> - </exclusion> - <exclusion> - <artifactId>hsqldb</artifactId> - <groupId>hsqldb</groupId> - </exclusion> - <exclusion> - <artifactId>hbase</artifactId> - <groupId>org.apache.hbase</groupId> - </exclusion> - <exclusion> - <artifactId>hadoop-core</artifactId> - <groupId>org.apache.hadoop</groupId> - </exclusion> - <exclusion> - <artifactId>mail</artifactId> - <groupId>javax.mail</groupId> + <artifactId>tools</artifactId> + <groupId>com.sun</groupId> </exclusion> </exclusions> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>james-server-data-jcr</artifactId> + <!-- Comment jackrabbit dependency to avoid lucene version clash with mailbox-lucene (JAMES-1297) + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> <scope>runtime</scope> <exclusions> - <exclusion> - <artifactId>mail</artifactId> - <groupId>javax.mail</groupId> - </exclusion> + <exclusion> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + </exclusion> </exclusions> + </dependency> + --> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -540,6 +494,51 @@ <artifactId>protocols-imap</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-managesieve</artifactId> + </dependency> + <dependency> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-spring</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <scope>runtime</scope> + </dependency> + <!-- Runtime dependencies which will get included in the generated binary distribution --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <scope>runtime</scope> + </dependency> </dependencies> <build> @@ -553,35 +552,35 @@ </build> <profiles> - <profile> + <profile> <id>build-for-jdk-8</id> <activation> <jdk>[1.8,)</jdk> </activation> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-elasticsearch</artifactId> - <scope>runtime</scope> - <exclusions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>apache-james-mailbox-elasticsearch</artifactId> + <scope>runtime</scope> + <exclusions> <exclusion> - <artifactId>mail</artifactId> - <groupId>javax.mail</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-tika</artifactId> - <scope>runtime</scope> - <exclusions> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>apache-james-mailbox-tika</artifactId> + <scope>runtime</scope> + <exclusions> <exclusion> - <artifactId>mail</artifactId> - <groupId>javax.mail</groupId> - </exclusion> - </exclusions> - </dependency> - </dependencies> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </profile> <profile> <id>cassandra</id> @@ -592,6 +591,11 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>apache-james-backends-cassandra</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>apache-james-mailbox-cassandra</artifactId> <scope>runtime</scope> <exclusions> @@ -606,11 +610,6 @@ <artifactId>james-server-data-cassandra</artifactId> <scope>runtime</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-james-backends-cassandra</artifactId> - <scope>runtime</scope> - </dependency> </dependencies> </profile> <profile> @@ -626,7 +625,7 @@ <profile> <id>lucene</id> <activation> - <activeByDefault>true</activeByDefault> + <activeByDefault>true</activeByDefault> </activation> <dependencies> <dependency> @@ -655,16 +654,16 @@ <groupId>javax.mail</groupId> </exclusion> <exclusion> - <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> + <groupId>org.apache.lucene</groupId> </exclusion> <exclusion> - <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers</artifactId> + <groupId>org.apache.lucene</groupId> </exclusion> <exclusion> - <groupId>org.apache.lucene</groupId> <artifactId>lucene-smartcn</artifactId> + <groupId>org.apache.lucene</groupId> </exclusion> </exclusions> </dependency> @@ -673,7 +672,7 @@ <profile> <id>with-assembly</id> <activation> - <activeByDefault>true</activeByDefault> + <activeByDefault>true</activeByDefault> </activation> <build> <plugins> @@ -681,6 +680,16 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> <version>1.10</version> + <executions> + <execution> + <id>make-appassemble</id> + <phase>package</phase> + <goals> + <goal>assemble</goal> + <goal>generate-daemons</goal> + </goals> + </execution> + </executions> <configuration> <!-- Include etc/ in the beginning of the classpath declaration in the bin scripts --> <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath> @@ -692,8 +701,7 @@ <environmentSetupFileName>setenv</environmentSetupFileName> <!-- set some sane defaults for memory --> <extraJvmArguments>${jvm.system-property1} -Xms128m -Xmx512m ${jmx.system-properties} - ${javamail.system-properties} ${james.system-properties} - </extraJvmArguments> + ${javamail.system-properties} ${james.system-properties}</extraJvmArguments> <!-- Generate bin scripts for windows and unix per default --> <platforms> <platform>windows</platform> @@ -920,16 +928,6 @@ </daemon> </daemons> </configuration> - <executions> - <execution> - <id>make-appassemble</id> - <phase>package</phase> - <goals> - <goal>assemble</goal> - <goal>generate-daemons</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -938,41 +936,37 @@ <executions> <execution> <phase>package</phase> + <goals> + <goal>run</goal> + </goals> <configuration> <tasks> <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path from the lib dir to make windows happy again --> - <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib" /> - <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh" /> + <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib"></replace> + <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh"></replace> <!-- this is needed because appassembler is not really smart on some settings --> - <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar" /> - <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var" /> + <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar"></replace> + <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var"></replace> <!-- copy the linux wrapper-linux-x86-32 to wrapper, so use it as default if no matching wrapper was found --> - <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" /> + <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper"></copy> <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path from the lib dir to make windows happy again --> - <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib" /> - <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh" /> + <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib"></replace> + <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh"></replace> </tasks> </configuration> - <goals> - <goal>run</goal> - </goals> </execution> </executions> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> <executions> <execution> <id>make-assembly</id> @@ -982,6 +976,10 @@ </goals> </execution> </executions> + <configuration> + <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> </plugin> <!-- The signing process excludes the artifact created by this plugin. @@ -992,6 +990,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>make-war</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + </execution> + </executions> <configuration> <webResources> <resource> @@ -1040,15 +1047,6 @@ </resource> </webResources> </configuration> - <executions> - <execution> - <id>make-war</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/cli-integration/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml index 3bf5d72..394b7c2 100644 --- a/server/container/cli-integration/pom.xml +++ b/server/container/cli-integration/pom.xml @@ -70,15 +70,15 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/cli/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml index 536712b..fb94d41 100644 --- a/server/container/cli/pom.xml +++ b/server/container/cli/pom.xml @@ -54,9 +54,9 @@ <artifactId>commons-cli</artifactId> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>compile</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.assertj</groupId> @@ -64,16 +64,16 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> <version>3.3.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>compile</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/core/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml index 8fc7b19..7f5c4d2 100644 --- a/server/container/core/pom.xml +++ b/server/container/core/pom.xml @@ -34,32 +34,45 @@ <dependencies> <dependency> + <groupId>${javax.activation.groupId}</groupId> + <artifactId>${javax.activation.artifactId}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>apache-mailet-api</artifactId> </dependency> + + <!-- RFC2822Headers constants imported from mailet-base (undetected by bytecode analyzers because constants are inlined) --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-filesystem-api</artifactId> + <artifactId>apache-mailet-base</artifactId> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>apache-mailet-base</artifactId> + <classifier>tests</classifier> <scope>test</scope> - <type>test-jar</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-lifecycle-api</artifactId> + <artifactId>james-server-filesystem-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-util</artifactId> + <artifactId>james-server-filesystem-api</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> - - <!-- RFC2822Headers constants imported from mailet-base (undetected by bytecode analyzers because constants are inlined) --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> + <artifactId>james-server-util</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -71,29 +84,16 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> </dependency> <dependency> - <groupId>${javax.activation.groupId}</groupId> - <artifactId>${javax.activation.artifactId}</artifactId> - <scope>provided</scope> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> - - <!-- Test dependencies --> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <classifier>tests</classifier> - <scope>test</scope> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/filesystem-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml index 528d51c..deb9258 100644 --- a/server/container/filesystem-api/pom.xml +++ b/server/container/filesystem-api/pom.xml @@ -43,8 +43,8 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> </dependency> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/cassandra-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index 7961e40..305b480 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> + <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -38,14 +38,8 @@ <cassandra.includes>empty</cassandra.includes> </properties> - <dependencies> <dependency> - <groupId>org.hdrhistogram</groupId> - <artifactId>HdrHistogram</artifactId> - <version>2.1.4</version> - </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-james-backends-cassandra</artifactId> <type>test-jar</type> @@ -63,8 +57,8 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-james-mailbox-cassandra</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -84,12 +78,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-icalendar</artifactId> - <version>${project.version}</version> + <artifactId>apache-james-mailbox-tika</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-james-mailbox-tika</artifactId> + <artifactId>apache-mailet-icalendar</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -101,11 +95,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>metrics-es-reporter</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>james-server-guice-common</artifactId> </dependency> <dependency> @@ -128,6 +117,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-guice-jmap</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-guice-jmx</artifactId> </dependency> <dependency> @@ -136,11 +131,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-pop</artifactId> + <artifactId>james-server-guice-managedsieve</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-managedsieve</artifactId> + <artifactId>james-server-guice-pop</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -174,15 +169,14 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-jmap</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> - <scope>test</scope> - <type>test-jar</type> + <artifactId>metrics-es-reporter</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -217,6 +211,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.hdrhistogram</groupId> + <artifactId>HdrHistogram</artifactId> + <version>2.1.4</version> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> @@ -228,15 +227,6 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>cassandra</id> - <properties> - <cassandra.includes>**/*.java</cassandra.includes> - </properties> - </profile> - </profiles> - <build> <plugins> <plugin> @@ -248,13 +238,13 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <exclude>**/suite/*.java</exclude> - <exclude>**/suite/**/*.java</exclude> - </excludes> - <includes> - <include>${cassandra.includes}</include> - </includes> + <excludes> + <exclude>**/suite/*.java</exclude> + <exclude>**/suite/**/*.java</exclude> + </excludes> + <includes> + <include>${cassandra.includes}</include> + </includes> </configuration> </plugin> <plugin> @@ -304,4 +294,13 @@ </plugin> </plugins> </build> + + <profiles> + <profile> + <id>cassandra</id> + <properties> + <cassandra.includes>**/*.java</cassandra.includes> + </properties> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/cassandra-ldap-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml index 38ea7f5..6510d26 100644 --- a/server/container/guice/cassandra-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-ldap-guice/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> + <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -70,9 +70,9 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-data-ldap-integration-testing</artifactId> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> - <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -93,8 +93,8 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-util-java8</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>com.jayway.awaitility</groupId> @@ -124,16 +124,6 @@ </dependency> </dependencies> - - <profiles> - <profile> - <id>cassandra</id> - <properties> - <cassandra.includes>**/*.java</cassandra.includes> - </properties> - </profile> - </profiles> - <build> <plugins> <plugin> @@ -190,15 +180,24 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <exclude>**/suite/*.java</exclude> - <exclude>**/suite/**/*.java</exclude> - </excludes> - <includes> - <include>${cassandra.includes}</include> - </includes> + <excludes> + <exclude>**/suite/*.java</exclude> + <exclude>**/suite/**/*.java</exclude> + </excludes> + <includes> + <include>${cassandra.includes}</include> + </includes> </configuration> </plugin> </plugins> </build> + + <profiles> + <profile> + <id>cassandra</id> + <properties> + <cassandra.includes>**/*.java</cassandra.includes> + </properties> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/configuration/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml index a45ec48..4cb99d3 100644 --- a/server/container/guice/configuration/pom.xml +++ b/server/container/guice/configuration/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-configuration</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/custom-mailets/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/custom-mailets/pom.xml b/server/container/guice/custom-mailets/pom.xml index 5acc265..e6d596e 100644 --- a/server/container/guice/custom-mailets/pom.xml +++ b/server/container/guice/custom-mailets/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-custom-mailets</artifactId> @@ -41,4 +41,4 @@ <artifactId>apache-mailet-base</artifactId> </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/guice-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml index 237db49..fdff922 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -18,32 +18,28 @@ 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-common</artifactId> <name>Apache James :: Server :: Guice Common</name> <description>Common modules for Guice implementation of James server</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>apache-mailet-base</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-core</artifactId> </dependency> <dependency> @@ -90,12 +86,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-pop</artifactId> - <scope>test</scope> + <artifactId>james-server-guice-mailet</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-mailet</artifactId> + <artifactId>james-server-guice-pop</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -113,35 +109,35 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>metrics-api</artifactId> + <artifactId>james-server-onami</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>metrics-logger</artifactId> + <artifactId>james-server-protocols-library</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>metrics-dropwizard</artifactId> + <artifactId>james-server-protocols-smtp</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-library</artifactId> + <artifactId>james-server-queue-activemq</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-protocols-smtp</artifactId> + <artifactId>james-server-queue-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-api</artifactId> + <artifactId>metrics-api</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-queue-activemq</artifactId> + <artifactId>metrics-dropwizard</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-onami</artifactId> + <artifactId>metrics-logger</artifactId> </dependency> <dependency> <groupId>com.github.steveash.guavate</groupId> @@ -174,12 +170,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <scope>test</scope> - <type>test-jar</type> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>test</scope> @@ -195,4 +185,14 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/jmx/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml index 4eae0ac..59cfeaf 100644 --- a/server/container/guice/jmx/pom.xml +++ b/server/container/guice/jmx/pom.xml @@ -18,29 +18,19 @@ 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-jmx</artifactId> - <name>Apache James :: Server :: Guice :: JMX </name> + <name>Apache James :: Server :: Guice :: JMX</name> <description>JMX for Guice implementation of James server</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -52,11 +42,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-configuration</artifactId> + <artifactId>james-server-guice-common</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-common</artifactId> + <artifactId>james-server-guice-configuration</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -75,6 +65,10 @@ <artifactId>james-server-util</artifactId> </dependency> <dependency> + <groupId>com.github.fge</groupId> + <artifactId>throwing-lambdas</artifactId> + </dependency> + <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> @@ -83,13 +77,19 @@ <artifactId>guice-multibindings</artifactId> </dependency> <dependency> - <groupId>com.github.fge</groupId> - <artifactId>throwing-lambdas</artifactId> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/jpa-common-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-common-guice/pom.xml b/server/container/guice/jpa-common-guice/pom.xml index 2bdb3db..7680b06 100644 --- a/server/container/guice/jpa-common-guice/pom.xml +++ b/server/container/guice/jpa-common-guice/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> + <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -48,15 +48,6 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>jpa</id> - <properties> - <jpa.includes>**/*.java</jpa.includes> - </properties> - </profile> - </profiles> - <build> <plugins> <plugin> @@ -68,15 +59,24 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <exclude>**/suite/*.java</exclude> - <exclude>**/suite/**/*.java</exclude> - </excludes> - <includes> - <include>${jpa.includes}</include> - </includes> + <excludes> + <exclude>**/suite/*.java</exclude> + <exclude>**/suite/**/*.java</exclude> + </excludes> + <includes> + <include>${jpa.includes}</include> + </includes> </configuration> </plugin> </plugins> </build> + + <profiles> + <profile> + <id>jpa</id> + <properties> + <jpa.includes>**/*.java</jpa.includes> + </properties> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/jpa-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml index 4230338..6554fc7 100644 --- a/server/container/guice/jpa-guice/pom.xml +++ b/server/container/guice/jpa-guice/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> + <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -40,19 +40,14 @@ <dependencies> <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-james-mailbox-jpa</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-james-mailbox-jpa</artifactId> - <scope>test</scope> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -94,11 +89,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-pop</artifactId> + <artifactId>james-server-guice-managedsieve</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-managedsieve</artifactId> + <artifactId>james-server-guice-pop</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -142,6 +137,11 @@ <artifactId>asyncretry</artifactId> </dependency> <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> @@ -153,15 +153,6 @@ </dependency> </dependencies> - <profiles> - <profile> - <id>jpa</id> - <properties> - <jpa.includes>**/*.java</jpa.includes> - </properties> - </profile> - </profiles> - <build> <plugins> <plugin> @@ -218,15 +209,24 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <exclude>**/suite/*.java</exclude> - <exclude>**/suite/**/*.java</exclude> - </excludes> - <includes> - <include>${jpa.includes}</include> - </includes> + <excludes> + <exclude>**/suite/*.java</exclude> + <exclude>**/suite/**/*.java</exclude> + </excludes> + <includes> + <include>${jpa.includes}</include> + </includes> </configuration> </plugin> </plugins> </build> + + <profiles> + <profile> + <id>jpa</id> + <properties> + <jpa.includes>**/*.java</jpa.includes> + </properties> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/jpa-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml index e716fa2..7e6034f 100644 --- a/server/container/guice/jpa-smtp/pom.xml +++ b/server/container/guice/jpa-smtp/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> + <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -38,15 +38,6 @@ <jpa.includes>empty</jpa.includes> </properties> - <profiles> - <profile> - <id>jpa</id> - <properties> - <jpa.includes>**/*.java</jpa.includes> - </properties> - </profile> - </profiles> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -79,15 +70,15 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-jpa-common-guice</artifactId> + <artifactId>james-server-guice-webadmin</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-webadmin</artifactId> + <artifactId>james-server-guice-webadmin-data</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-webadmin-data</artifactId> + <artifactId>james-server-jpa-common-guice</artifactId> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -112,8 +103,8 @@ <scope>test</scope> <exclusions> <exclusion> - <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> </exclusion> </exclusions> </dependency> @@ -194,15 +185,24 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <exclude>**/suite/*.java</exclude> - <exclude>**/suite/**/*.java</exclude> - </excludes> - <includes> - <include>${jpa.includes}</include> - </includes> + <excludes> + <exclude>**/suite/*.java</exclude> + <exclude>**/suite/**/*.java</exclude> + </excludes> + <includes> + <include>${jpa.includes}</include> + </includes> </configuration> </plugin> </plugins> </build> + + <profiles> + <profile> + <id>jpa</id> + <properties> + <jpa.includes>**/*.java</jpa.includes> + </properties> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml index 7ef8c7c..4ec9b92 100644 --- a/server/container/guice/mailbox/pom.xml +++ b/server/container/guice/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-mailbox</artifactId> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/mailet/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml index 20ea6fd..e3d7796 100644 --- a/server/container/guice/mailet/pom.xml +++ b/server/container/guice/mailet/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-mailet</artifactId> @@ -34,6 +34,12 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>apache-mailet-base</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>apache-mailet-standard</artifactId> </dependency> <dependency> @@ -70,12 +76,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/memory-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index 94610bb..7f6a4d1 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -22,8 +22,8 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.james</groupId> <artifactId>james-server-guice</artifactId> + <groupId>org.apache.james</groupId> <version>3.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -34,61 +34,6 @@ <name>Apache James :: Server :: Memory - guice injection</name> <description>An advanced email server - Memory backend with guice injection</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>${project.build.finalName}.lib/</classpathPrefix> - <mainClass>org.apache.james.MemoryJamesServerMain</mainClass> - <useUniqueVersions>false</useUniqueVersions> - </manifest> - </archive> - </configuration> - </execution> - <execution> - <id>test-jar</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -96,6 +41,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>apache-mailet-base</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-data-memory</artifactId> </dependency> <dependency> @@ -132,11 +83,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-pop</artifactId> + <artifactId>james-server-guice-managedsieve</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>james-server-guice-managedsieve</artifactId> + <artifactId>james-server-guice-pop</artifactId> </dependency> <dependency> <groupId>${project.groupId}</groupId> @@ -155,9 +106,8 @@ <artifactId>james-server-guice-webadmin-mailbox</artifactId> </dependency> <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - <type>test-jar</type> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> <scope>test</scope> </dependency> <dependency> @@ -170,11 +120,61 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>default-jar</id> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>${project.build.finalName}.lib/</classpathPrefix> + <mainClass>org.apache.james.MemoryJamesServerMain</mainClass> + <useUniqueVersions>false</useUniqueVersions> + </manifest> + </archive> + </configuration> + </execution> + <execution> + <id>test-jar</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 6638a24..50a99be 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -29,8 +29,36 @@ </parent> <artifactId>james-server-guice</artifactId> - <name>Apache James :: Server :: Guice</name> <packaging>pom</packaging> + <name>Apache James :: Server :: Guice</name> + + <modules> + <module>cassandra-guice</module> + <module>cassandra-ldap-guice</module> + <module>configuration</module> + <module>custom-mailets</module> + <module>es-metric-reporter</module> + <module>guice-common</module> + <module>jmx</module> + <module>jpa-common-guice</module> + <module>jpa-guice</module> + <module>jpa-smtp</module> + <module>mailbox</module> + <module>mailet</module> + <module>memory-guice</module> + <module>onami</module> + <module>protocols/imap</module> + <module>protocols/jmap</module> + <module>protocols/lmtp</module> + <module>protocols/managedsieve</module> + <module>protocols/pop</module> + <module>protocols/smtp</module> + <module>protocols/webadmin</module> + <module>protocols/webadmin-cassandra</module> + <module>protocols/webadmin-data</module> + <module>protocols/webadmin-mailbox</module> + <module>protocols/webadmin-swagger</module> + </modules> <dependencyManagement> <dependencies> @@ -139,32 +167,4 @@ </dependencies> </dependencyManagement> - <modules> - <module>configuration</module> - <module>guice-common</module> - <module>cassandra-guice</module> - <module>cassandra-ldap-guice</module> - <module>custom-mailets</module> - <module>es-metric-reporter</module> - <module>mailbox</module> - <module>mailet</module> - <module>memory-guice</module> - <module>jpa-common-guice</module> - <module>jpa-guice</module> - <module>jpa-smtp</module> - <module>jmx</module> - <module>onami</module> - <module>protocols/imap</module> - <module>protocols/jmap</module> - <module>protocols/lmtp</module> - <module>protocols/managedsieve</module> - <module>protocols/pop</module> - <module>protocols/smtp</module> - <module>protocols/webadmin</module> - <module>protocols/webadmin-cassandra</module> - <module>protocols/webadmin-data</module> - <module>protocols/webadmin-mailbox</module> - <module>protocols/webadmin-swagger</module> - </modules> -</project> - +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/dbd6223b/server/container/guice/protocols/imap/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/protocols/imap/pom.xml b/server/container/guice/protocols/imap/pom.xml index 7a6a50a..d895c84 100644 --- a/server/container/guice/protocols/imap/pom.xml +++ b/server/container/guice/protocols/imap/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-imap</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
