You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/25 11:21:51 UTC
[26/29] james-project git commit: JAMES-2124 Respect maven sorting
order conventions
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 961f04c..cc781a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache</artifactId>
<groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
<version>18</version>
<relativePath />
</parent>
@@ -903,8 +903,8 @@
<classifier>tests</classifier>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -914,8 +914,8 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -926,8 +926,8 @@
<classifier>tests</classifier>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1469,8 +1469,8 @@
<version>1.5.4</version>
<exclusions>
<exclusion>
- <artifactId>activation</artifactId>
<groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1505,28 +1505,28 @@
<version>${commons-configuration.version}</version>
<exclusions>
<exclusion>
- <artifactId>dom4j</artifactId>
<groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
</exclusion>
<exclusion>
- <artifactId>servletapi</artifactId>
<groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
</exclusion>
<exclusion>
- <artifactId>xerces</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-digester</artifactId>
<groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-beanutils-core</artifactId>
<groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-beanutils-bean-collections</artifactId>
<groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-bean-collections</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1541,8 +1541,8 @@
<version>${commons-dbcp.version}</version>
<exclusions>
<exclusion>
- <artifactId>xercesImpl</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1562,20 +1562,20 @@
<version>1.1</version>
<exclusions>
<exclusion>
- <artifactId>logkit</artifactId>
<groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
</exclusion>
<exclusion>
- <artifactId>avalon-framework</artifactId>
<groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
</exclusion>
<exclusion>
- <artifactId>log4j</artifactId>
<groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1590,16 +1590,16 @@
<version>${commons-pool.version}</version>
<exclusions>
<exclusion>
- <artifactId>xercesImpl</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
- <artifactId>xerces</artifactId>
<groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
</exclusion>
<exclusion>
- <artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1709,18 +1709,18 @@
<version>${activemq.version}</version>
<exclusions>
<exclusion>
- <artifactId>spring-osgi-core</artifactId>
<groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
</exclusion>
<!-- exlude this, its only used in the authentication plugin which we don't use -->
<exclusion>
- <artifactId>icu4j</artifactId>
<groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
</exclusion>
<!-- exclude this, we don't use osgi yet -->
<exclusion>
- <artifactId>org.osgi.core</artifactId>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1750,8 +1750,8 @@
<version>${camel.version}</version>
<exclusions>
<exclusion>
- <artifactId>spring-web</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1827,8 +1827,8 @@
<version>${httpclient-osgi.version}</version>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1838,12 +1838,12 @@
<version>${jackrabbit.version}</version>
<exclusions>
<exclusion>
- <artifactId>pdfbox</artifactId>
<groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
</exclusion>
<exclusion>
- <artifactId>netcdf</artifactId>
<groupId>edu.ucar</groupId>
+ <artifactId>netcdf</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1864,12 +1864,12 @@
<type>tar.gz</type>
<exclusions>
<exclusion>
- <artifactId>org.apache.karaf.client</artifactId>
<groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.eclipse.osgi</artifactId>
<groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1885,21 +1885,21 @@
<version>${apache-jspf-resolver.version}</version>
<exclusions>
<exclusion>
- <artifactId>log4j</artifactId>
<groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <artifactId>dnsjava</artifactId>
<groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-cli</artifactId>
<groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
</exclusion>
<!-- only used for the asynchronous executors -->
<exclusion>
- <artifactId>dnsjnio</artifactId>
<groupId>uk.nominet</groupId>
+ <artifactId>dnsjnio</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1998,8 +1998,8 @@
<version>${xbean-spring.version}</version>
<exclusions>
<exclusion>
- <artifactId>spring-web</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -2174,24 +2174,24 @@
<version>${spring.version}</version>
<exclusions>
<exclusion>
- <artifactId>toplink</artifactId>
<groupId>com.oracle.toplink</groupId>
+ <artifactId>toplink</artifactId>
</exclusion>
<exclusion>
- <artifactId>toplink-essentials</artifactId>
<groupId>com.oracle</groupId>
+ <artifactId>toplink-essentials</artifactId>
</exclusion>
<exclusion>
- <artifactId>hibernate</artifactId>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
</exclusion>
<exclusion>
- <artifactId>hibernate-entitymanager</artifactId>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-web</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -2211,20 +2211,20 @@
<version>${spring-osgi-extender.version}</version>
<exclusions>
<exclusion>
- <artifactId>org.springframework.core</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>org.springframework.core</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.springframework.aop</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>org.springframework.aop</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.springframework.context</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>org.springframework.context</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.springframework.beans</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>org.springframework.beans</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -2252,14 +2252,6 @@
</dependencyManagement>
<build>
- <extensions>
- <extension>
- <!-- Adding a Protocol to Deploy the Site (support for ssh/scp) -->
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>2.0</version>
- </extension>
- </extensions>
<pluginManagement>
<plugins>
<!-- Order by groupId / artifactId / scope -->
@@ -2465,6 +2457,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>attach-descriptor</id>
@@ -2473,13 +2472,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>2.0</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -2687,10 +2679,10 @@
<executions>
<execution>
<id>jar</id>
- <phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
+ <phase>package</phase>
<configuration>
<archive>
<manifest>
@@ -2702,10 +2694,10 @@
</execution>
<execution>
<id>test-jar</id>
- <phase>package</phase>
<goals>
<goal>test-jar</goal>
</goals>
+ <phase>package</phase>
<configuration>
<archive>
<manifest>
@@ -2736,24 +2728,16 @@
<executions>
<execution>
<id>site</id>
- <phase>site</phase>
<goals>
<goal>generate</goal>
</goals>
+ <phase>site</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
<configuration>
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
@@ -2783,28 +2767,44 @@
</plugin>
</reportPlugins>
</configuration>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java18</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
<executions>
<execution>
<id>check_java_8</id>
- <phase>test</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>test</phase>
</execution>
</executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
</plugin>
</plugins>
+ <extensions>
+ <extension>
+ <!-- Adding a Protocol to Deploy the Site (support for ssh/scp) -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>2.0</version>
+ </extension>
+ </extensions>
</build>
<profiles>
@@ -2814,6 +2814,13 @@
-->
<profile>
<id>site-reports</id>
+ <properties>
+ <!--
+ This property contains the directory where to deploy when running using "-Psite-reports" profile
+ to avoid accidently overriding the common modules website
+ -->
+ <deployTechnicalSiteDirectory>technical-reports/</deployTechnicalSiteDirectory>
+ </properties>
<build>
<pluginManagement>
@@ -2821,13 +2828,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-markdown</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
<configuration>
<siteDirectory>${basedir}/src/reporting-site</siteDirectory>
<reportPlugins combine.children="append">
@@ -3010,17 +3010,17 @@
-->
</reportPlugins>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-markdown</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>
- <properties>
- <!--
- This property contains the directory where to deploy when running using "-Psite-reports" profile
- to avoid accidently overriding the common modules website
- -->
- <deployTechnicalSiteDirectory>technical-reports/</deployTechnicalSiteDirectory>
- </properties>
</profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/api/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/api/pom.xml b/protocols/api/pom.xml
index f53e17f..9521fac 100644
--- a/protocols/api/pom.xml
+++ b/protocols/api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index 54e7dde..b3add62 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -130,8 +130,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>junit-dep</artifactId>
<groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/lmtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/lmtp/pom.xml b/protocols/lmtp/pom.xml
index 90da688..c600ec4 100644
--- a/protocols/lmtp/pom.xml
+++ b/protocols/lmtp/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/managesieve/pom.xml b/protocols/managesieve/pom.xml
index 0b85749..6fe4f15 100644
--- a/protocols/managesieve/pom.xml
+++ b/protocols/managesieve/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/netty/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/netty/pom.xml b/protocols/netty/pom.xml
index a7ad855..4c028ef 100644
--- a/protocols/netty/pom.xml
+++ b/protocols/netty/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -62,4 +62,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 3b5d39b..8b90a14 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-project</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/pop3/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pop3/pom.xml b/protocols/pop3/pom.xml
index 30fc2ce..91481d7 100644
--- a/protocols/pop3/pom.xml
+++ b/protocols/pop3/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index b27986e..497ff47 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>protocols</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>protocols</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -106,10 +106,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<artifactSet>
<includes>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 5e0d744..65af04e 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -77,8 +77,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -88,8 +88,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -99,8 +99,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -110,16 +110,16 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
</exclusion>
<exclusion>
- <artifactId>hadoop-core</artifactId>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -132,8 +132,8 @@
<artifactId>james-server-core</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -142,8 +142,8 @@
<artifactId>james-server-data-api</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -154,8 +154,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -165,24 +165,24 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</exclusion>
<exclusion>
- <artifactId>hsqldb</artifactId>
<groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
</exclusion>
<exclusion>
- <artifactId>hbase</artifactId>
<groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
</exclusion>
<exclusion>
- <artifactId>hadoop-core</artifactId>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -192,8 +192,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -203,8 +203,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -224,8 +224,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -244,8 +244,8 @@
<artifactId>james-server-dnsservice-library</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -255,8 +255,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -274,8 +274,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -284,8 +284,8 @@
<artifactId>james-server-mailetcontainer-api</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -295,8 +295,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -306,8 +306,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -327,8 +327,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -343,8 +343,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -355,8 +355,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -366,8 +366,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -376,8 +376,8 @@
<artifactId>james-server-queue-api</artifactId>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -387,8 +387,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -398,8 +398,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -408,16 +408,16 @@
<artifactId>james-server-spring</artifactId>
<exclusions>
<exclusion>
- <artifactId>spring-osgi-extender</artifactId>
<groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
</exclusion>
<exclusion>
- <artifactId>org.osgi.core</artifactId>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
</exclusion>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -427,8 +427,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -454,8 +454,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>tools</artifactId>
<groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -465,8 +465,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>tools</artifactId>
<groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -564,8 +564,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -575,8 +575,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -600,8 +600,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -634,8 +634,8 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -650,20 +650,20 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>mail</artifactId>
<groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
</exclusion>
<exclusion>
- <artifactId>lucene-core</artifactId>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>lucene-analyzers</artifactId>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers</artifactId>
</exclusion>
<exclusion>
- <artifactId>lucene-smartcn</artifactId>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-smartcn</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -680,16 +680,6 @@
<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>
@@ -928,6 +918,16 @@
</daemon>
</daemons>
</configuration>
+ <executions>
+ <execution>
+ <id>make-appassemble</id>
+ <goals>
+ <goal>assemble</goal>
+ <goal>generate-daemons</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -935,10 +935,10 @@
<version>1.2</version>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>run</goal>
</goals>
+ <phase>package</phase>
<configuration>
<tasks>
@@ -967,19 +967,19 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
<executions>
<execution>
<id>make-assembly</id>
- <phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
- <configuration>
- <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
</plugin>
<!--
The signing process excludes the artifact created by this plugin.
@@ -990,15 +990,6 @@
<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>
@@ -1047,6 +1038,15 @@
</resource>
</webResources>
</configuration>
+ <executions>
+ <execution>
+ <id>make-war</id>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/cli-integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli-integration/pom.xml b/server/container/cli-integration/pom.xml
index 394b7c2..617239c 100644
--- a/server/container/cli-integration/pom.xml
+++ b/server/container/cli-integration/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/cli/pom.xml b/server/container/cli/pom.xml
index fb94d41..934d9f7 100644
--- a/server/container/cli/pom.xml
+++ b/server/container/cli/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -81,6 +81,9 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>org.apache.james.cli.ServerCmd</mainClass>
+ </configuration>
<executions>
<execution>
<goals>
@@ -88,9 +91,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <mainClass>org.apache.james.cli.ServerCmd</mainClass>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -103,10 +103,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/core/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index 7fdc7f5..f415824 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/filesystem-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/filesystem-api/pom.xml b/server/container/filesystem-api/pom.xml
index deb9258..6391a76 100644
--- a/server/container/filesystem-api/pom.xml
+++ b/server/container/filesystem-api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 305b480..6b4c2ae 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>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -253,10 +253,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 6510d26..f434eaf 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>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -132,10 +132,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/configuration/pom.xml b/server/container/guice/configuration/pom.xml
index 4cb99d3..51a505b 100644
--- a/server/container/guice/configuration/pom.xml
+++ b/server/container/guice/configuration/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 e6d596e..6b99f1c 100644
--- a/server/container/guice/custom-mailets/pom.xml
+++ b/server/container/guice/custom-mailets/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 fdff922..25a67c7 100644
--- a/server/container/guice/guice-common/pom.xml
+++ b/server/container/guice/guice-common/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/jmx/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jmx/pom.xml b/server/container/guice/jmx/pom.xml
index 59cfeaf..df9326f 100644
--- a/server/container/guice/jmx/pom.xml
+++ b/server/container/guice/jmx/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 7680b06..3aa275f 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>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 6554fc7..99e7030 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>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -161,10 +161,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 7e6034f..1d6e2b5 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>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -103,8 +103,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -137,10 +137,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailbox/pom.xml b/server/container/guice/mailbox/pom.xml
index 4ec9b92..e64a86a 100644
--- a/server/container/guice/mailbox/pom.xml
+++ b/server/container/guice/mailbox/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/mailet/pom.xml b/server/container/guice/mailet/pom.xml
index e3d7796..25cddf2 100644
--- a/server/container/guice/mailet/pom.xml
+++ b/server/container/guice/mailet/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 7f6a4d1..5f07851 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>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -136,10 +136,10 @@
<executions>
<execution>
<id>copy-dependencies</id>
- <phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
+ <phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.build.finalName}.lib</outputDirectory>
</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/onami/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/onami/pom.xml b/server/container/guice/onami/pom.xml
index a9036fd..9e14e6f 100644
--- a/server/container/guice/onami/pom.xml
+++ b/server/container/guice/onami/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
</parent>
@@ -55,4 +55,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 50a99be..07380bf 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -22,8 +22,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 d895c84..578b51c 100644
--- a/server/container/guice/protocols/imap/pom.xml
+++ b/server/container/guice/protocols/imap/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 fb72ece..68e2c14 100644
--- a/server/container/guice/protocols/jmap/pom.xml
+++ b/server/container/guice/protocols/jmap/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 cda2c6e..8c3a35c 100644
--- a/server/container/guice/protocols/lmtp/pom.xml
+++ b/server/container/guice/protocols/lmtp/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 78066ba..4df5111 100644
--- a/server/container/guice/protocols/managedsieve/pom.xml
+++ b/server/container/guice/protocols/managedsieve/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 fad870c..b5375c1 100644
--- a/server/container/guice/protocols/pop/pom.xml
+++ b/server/container/guice/protocols/pop/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 3928544..3b1e6a1 100644
--- a/server/container/guice/protocols/smtp/pom.xml
+++ b/server/container/guice/protocols/smtp/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 3f438ad..170d5a3 100644
--- a/server/container/guice/protocols/webadmin-cassandra/pom.xml
+++ b/server/container/guice/protocols/webadmin-cassandra/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 5e5d068..2e4f2ec 100644
--- a/server/container/guice/protocols/webadmin-data/pom.xml
+++ b/server/container/guice/protocols/webadmin-data/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 9ca7ef9..1a8bbac 100644
--- a/server/container/guice/protocols/webadmin-mailbox/pom.xml
+++ b/server/container/guice/protocols/webadmin-mailbox/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 3cd8701..43e5507 100644
--- a/server/container/guice/protocols/webadmin-swagger/pom.xml
+++ b/server/container/guice/protocols/webadmin-swagger/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 33b26d1..8797883 100644
--- a/server/container/guice/protocols/webadmin/pom.xml
+++ b/server/container/guice/protocols/webadmin/pom.xml
@@ -20,8 +20,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-guice</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-guice</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/jetty/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/jetty/pom.xml b/server/container/jetty/pom.xml
index 33cbf0c..ae4a65c 100644
--- a/server/container/jetty/pom.xml
+++ b/server/container/jetty/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/lifecycle-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/lifecycle-api/pom.xml b/server/container/lifecycle-api/pom.xml
index 6c81796..de2ff8c 100644
--- a/server/container/lifecycle-api/pom.xml
+++ b/server/container/lifecycle-api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/mailbox-adapter/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/mailbox-adapter/pom.xml b/server/container/mailbox-adapter/pom.xml
index b8e94f5..14dd278 100644
--- a/server/container/mailbox-adapter/pom.xml
+++ b/server/container/mailbox-adapter/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/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 b40cb91..6c1a197 100644
--- a/server/container/metrics/metrics-es-reporter/pom.xml
+++ b/server/container/metrics/metrics-es-reporter/pom.xml
@@ -20,8 +20,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>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/spring/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index f8299fe..e28ba6e 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -115,8 +115,8 @@
<version>${activemq.version}</version>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -155,20 +155,20 @@
<scope>compile</scope>
<exclusions>
<exclusion>
- <artifactId>spring-core</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-beans</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-aop</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
</exclusion>
<exclusion>
- <artifactId>spring-tx</artifactId>
<groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/util-java8/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util-java8/pom.xml b/server/container/util-java8/pom.xml
index 7da0ffe..d98a650 100644
--- a/server/container/util-java8/pom.xml
+++ b/server/container/util-java8/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/container/util/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml
index 1577010..8e0d38b 100644
--- a/server/container/util/pom.xml
+++ b/server/container/util/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-api/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index 7b3ffa9..4ba82a0 100644
--- a/server/data/data-api/pom.xml
+++ b/server/data/data-api/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index 62a3cd6..e4e8377 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-file/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml
index aea1655..264365a 100644
--- a/server/data/data-file/pom.xml
+++ b/server/data/data-file/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml
index 2a37e64..027ad55 100644
--- a/server/data/data-hbase/pom.xml
+++ b/server/data/data-hbase/pom.xml
@@ -20,8 +20,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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -113,8 +113,8 @@
<artifactId>hadoop-core</artifactId>
<exclusions>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -128,20 +128,20 @@
<artifactId>hbase</artifactId>
<exclusions>
<exclusion>
- <artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</exclusion>
<exclusion>
- <artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
- <artifactId>log4j</artifactId>
<groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
- <artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -152,8 +152,8 @@
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
</exclusion>
</exclusions>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/2a8b24d1/server/data/data-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/pom.xml b/server/data/data-jcr/pom.xml
index 06c988d..457da4e 100644
--- a/server/data/data-jcr/pom.xml
+++ b/server/data/data-jcr/pom.xml
@@ -21,8 +21,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server</artifactId>
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org