james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From matth...@apache.org
Subject svn commit: r1722814 - in /james/project/trunk: backends-common/ backends-common/cassandra/ mailbox/ mailbox/api/ mailbox/caching/ mailbox/cassandra/ mailbox/elasticsearch/ mailbox/hbase/ mailbox/jcr/ mailbox/jpa/ mailbox/kafka/ mailbox/maildir/ mailbo...
Date Mon, 04 Jan 2016 09:40:50 GMT
Author: matthieu
Date: Mon Jan  4 09:40:49 2016
New Revision: 1722814

URL: http://svn.apache.org/viewvc?rev=1722814&view=rev
Log:
JAMES-1651 tidy all pom.xml

Modified:
    james/project/trunk/backends-common/cassandra/pom.xml
    james/project/trunk/backends-common/pom.xml
    james/project/trunk/mailbox/api/pom.xml
    james/project/trunk/mailbox/caching/pom.xml
    james/project/trunk/mailbox/cassandra/pom.xml
    james/project/trunk/mailbox/elasticsearch/pom.xml
    james/project/trunk/mailbox/hbase/pom.xml
    james/project/trunk/mailbox/jcr/pom.xml
    james/project/trunk/mailbox/jpa/pom.xml
    james/project/trunk/mailbox/kafka/pom.xml
    james/project/trunk/mailbox/maildir/pom.xml
    james/project/trunk/mailbox/memory/pom.xml
    james/project/trunk/mailbox/pom.xml
    james/project/trunk/mailbox/store/pom.xml
    james/project/trunk/mailbox/tika/pom.xml
    james/project/trunk/mailbox/tool/pom.xml
    james/project/trunk/mailet/pom.xml
    james/project/trunk/mpt/core/pom.xml
    james/project/trunk/mpt/impl/imap-mailbox/elasticsearch/pom.xml
    james/project/trunk/mpt/impl/imap-mailbox/hbase/pom.xml
    james/project/trunk/mpt/pom.xml
    james/project/trunk/protocols/imap/pom.xml
    james/project/trunk/protocols/managesieve/pom.xml
    james/project/trunk/protocols/pom.xml
    james/project/trunk/protocols/pop3/pom.xml
    james/project/trunk/server/container/cassandra-guice/pom.xml
    james/project/trunk/server/container/cli/pom.xml
    james/project/trunk/server/container/core/pom.xml
    james/project/trunk/server/container/filesystem-api/pom.xml
    james/project/trunk/server/container/mailbox-adapter/pom.xml
    james/project/trunk/server/container/spring/pom.xml
    james/project/trunk/server/data/data-cassandra/pom.xml
    james/project/trunk/server/data/data-file/pom.xml
    james/project/trunk/server/data/data-hbase/pom.xml
    james/project/trunk/server/data/data-jdbc/pom.xml
    james/project/trunk/server/data/data-jmap/pom.xml
    james/project/trunk/server/data/data-jpa/pom.xml
    james/project/trunk/server/data/data-library/pom.xml
    james/project/trunk/server/data/data-memory/pom.xml
    james/project/trunk/server/karaf/distribution/pom.xml
    james/project/trunk/server/karaf/integration/pom.xml
    james/project/trunk/server/mailet/mailets/pom.xml
    james/project/trunk/server/pom.xml
    james/project/trunk/server/protocols/jmap-integration-testing/pom.xml
    james/project/trunk/server/protocols/jmap/pom.xml
    james/project/trunk/server/protocols/protocols-managesieve/pom.xml
    james/project/trunk/server/queue/queue-api/pom.xml
    james/project/trunk/server/queue/queue-file/pom.xml
    james/project/trunk/server/queue/queue-jms/pom.xml

Modified: james/project/trunk/backends-common/cassandra/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/backends-common/cassandra/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/backends-common/cassandra/pom.xml (original)
+++ james/project/trunk/backends-common/cassandra/pom.xml Mon Jan  4 09:40:49 2016
@@ -148,11 +148,12 @@
                 <groupId>javax.inject</groupId>
                 <artifactId>javax.inject</artifactId>
             </dependency>
-		        <dependency>
-		            <groupId>org.assertj</groupId>
-		            <artifactId>assertj-core</artifactId>
-		            <scope>test</scope>
-		        </dependency>
+                <dependency>
+                    <groupId>org.assertj</groupId>
+                    <artifactId>assertj-core</artifactId>
+                    <version>${assertj-3.version}</version>
+                    <scope>test</scope>
+                </dependency>
 		        <dependency>
 		            <groupId>org.cassandraunit</groupId>
 		            <artifactId>cassandra-unit</artifactId>

Modified: james/project/trunk/backends-common/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/backends-common/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/backends-common/pom.xml (original)
+++ james/project/trunk/backends-common/pom.xml Mon Jan  4 09:40:49 2016
@@ -33,6 +33,10 @@
     <description>Apache James Backends: common utils to access backends</description>
     <inceptionYear>2015</inceptionYear>
 
+    <properties>
+        <assertj-3.version>3.2.0</assertj-3.version>
+    </properties>
+
     <modules>
         <module>cassandra</module>
     </modules>
@@ -54,11 +58,6 @@
                 <artifactId>javax.inject</artifactId>
                 <version>1</version>
             </dependency>
-            <dependency>
-                <groupId>org.assertj</groupId>
-                <artifactId>assertj-core</artifactId>
-                <version>3.0.0</version>
-            </dependency>
         </dependencies>
 
     </dependencyManagement>

Modified: james/project/trunk/mailbox/api/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/api/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/api/pom.xml (original)
+++ james/project/trunk/mailbox/api/pom.xml Mon Jan  4 09:40:49 2016
@@ -63,6 +63,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: james/project/trunk/mailbox/caching/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/caching/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/caching/pom.xml (original)
+++ james/project/trunk/mailbox/caching/pom.xml Mon Jan  4 09:40:49 2016
@@ -34,6 +34,10 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.james</groupId>
+            <artifactId>apache-james-mailbox-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.james</groupId>
             <artifactId>apache-james-mailbox-store</artifactId>
         </dependency>
         <dependency>

Modified: james/project/trunk/mailbox/cassandra/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/cassandra/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/cassandra/pom.xml (original)
+++ james/project/trunk/mailbox/cassandra/pom.xml Mon Jan  4 09:40:49 2016
@@ -237,6 +237,7 @@
                 <dependency>
                     <groupId>org.assertj</groupId>
                     <artifactId>assertj-core</artifactId>
+                    <version>${assertj-1.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>

Modified: james/project/trunk/mailbox/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/elasticsearch/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/elasticsearch/pom.xml (original)
+++ james/project/trunk/mailbox/elasticsearch/pom.xml Mon Jan  4 09:40:49 2016
@@ -234,7 +234,7 @@
                 <dependency>
                     <groupId>org.assertj</groupId>
                     <artifactId>assertj-core</artifactId>
-                    <version>3.0.0</version>
+                    <version>${assertj-3.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

Modified: james/project/trunk/mailbox/hbase/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/hbase/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/hbase/pom.xml (original)
+++ james/project/trunk/mailbox/hbase/pom.xml Mon Jan  4 09:40:49 2016
@@ -33,6 +33,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>11.0.2</version>
+        </dependency>
+        <dependency>
             <groupId>${javax.mail.groupId}</groupId>
             <artifactId>${javax.mail.artifactId}</artifactId>
         </dependency>
@@ -92,12 +97,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-            <version>13.0</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase</artifactId>
             <type>test-jar</type>
@@ -121,6 +120,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/mailbox/jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jcr/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/jcr/pom.xml (original)
+++ james/project/trunk/mailbox/jcr/pom.xml Mon Jan  4 09:40:49 2016
@@ -101,6 +101,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: james/project/trunk/mailbox/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/jpa/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/jpa/pom.xml (original)
+++ james/project/trunk/mailbox/jpa/pom.xml Mon Jan  4 09:40:49 2016
@@ -76,6 +76,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/mailbox/kafka/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/kafka/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/kafka/pom.xml (original)
+++ james/project/trunk/mailbox/kafka/pom.xml Mon Jan  4 09:40:49 2016
@@ -163,6 +163,7 @@
                 <dependency>
                     <groupId>org.assertj</groupId>
                     <artifactId>assertj-core</artifactId>
+                    <version>${assertj-3.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

Modified: james/project/trunk/mailbox/maildir/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/maildir/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/maildir/pom.xml (original)
+++ james/project/trunk/mailbox/maildir/pom.xml Mon Jan  4 09:40:49 2016
@@ -89,6 +89,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: james/project/trunk/mailbox/memory/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/memory/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/memory/pom.xml (original)
+++ james/project/trunk/mailbox/memory/pom.xml Mon Jan  4 09:40:49 2016
@@ -77,6 +77,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: james/project/trunk/mailbox/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/pom.xml (original)
+++ james/project/trunk/mailbox/pom.xml Mon Jan  4 09:40:49 2016
@@ -128,6 +128,8 @@
         <cassandra-driver-core.version>2.1.8</cassandra-driver-core.version>
         <cassandra-unit.version>2.1.9.2</cassandra-unit.version>
         <apache-backends-cassandra.version>1.8.3-SNAPSHOT</apache-backends-cassandra.version>
+        <assertj-1.version>1.7.1</assertj-1.version>
+        <assertj-3.version>3.2.0</assertj-3.version>
     </properties>
 
     <dependencyManagement>
@@ -441,11 +443,6 @@
                 <artifactId>commons-io</artifactId>
                 <version>${commons-io.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.assertj</groupId>
-                <artifactId>assertj-core</artifactId>
-                <version>${assertj.version}</version>
-            </dependency>
             <!--
                 END Testing
             -->

Modified: james/project/trunk/mailbox/store/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/store/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/store/pom.xml (original)
+++ james/project/trunk/mailbox/store/pom.xml Mon Jan  4 09:40:49 2016
@@ -131,6 +131,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: james/project/trunk/mailbox/tika/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/tika/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/tika/pom.xml (original)
+++ james/project/trunk/mailbox/tika/pom.xml Mon Jan  4 09:40:49 2016
@@ -175,6 +175,8 @@
                 <dependency>
                     <groupId>org.assertj</groupId>
                     <artifactId>assertj-core</artifactId>
+                    <version>${assertj-3.version}</version>
+                    <scope>test</scope>
                 </dependency>
             </dependencies>
             <build>

Modified: james/project/trunk/mailbox/tool/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/tool/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailbox/tool/pom.xml (original)
+++ james/project/trunk/mailbox/tool/pom.xml Mon Jan  4 09:40:49 2016
@@ -84,6 +84,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         

Modified: james/project/trunk/mailet/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mailet/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mailet/pom.xml (original)
+++ james/project/trunk/mailet/pom.xml Mon Jan  4 09:40:49 2016
@@ -161,7 +161,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.7</version>
                 <extensions>true</extensions>
             </plugin>
             <plugin>
@@ -221,7 +220,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.2</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.doxia</groupId>

Modified: james/project/trunk/mpt/core/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/core/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mpt/core/pom.xml (original)
+++ james/project/trunk/mpt/core/pom.xml Mon Jan  4 09:40:49 2016
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>1.7.1</version>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/mpt/impl/imap-mailbox/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/elasticsearch/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mpt/impl/imap-mailbox/elasticsearch/pom.xml (original)
+++ james/project/trunk/mpt/impl/imap-mailbox/elasticsearch/pom.xml Mon Jan  4 09:40:49 2016
@@ -150,7 +150,6 @@
                 <dependency>
                     <groupId>junit</groupId>
                     <artifactId>junit</artifactId>
-                    <version>${junit.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>

Modified: james/project/trunk/mpt/impl/imap-mailbox/hbase/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/impl/imap-mailbox/hbase/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mpt/impl/imap-mailbox/hbase/pom.xml (original)
+++ james/project/trunk/mpt/impl/imap-mailbox/hbase/pom.xml Mon Jan  4 09:40:49 2016
@@ -48,6 +48,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>13.0</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase</artifactId>
             <type>test-jar</type>

Modified: james/project/trunk/mpt/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/mpt/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/mpt/pom.xml (original)
+++ james/project/trunk/mpt/pom.xml Mon Jan  4 09:40:49 2016
@@ -110,7 +110,8 @@
         <lucene-core.version>3.6.0</lucene-core.version>
         <onami.version>1.4.1-incubating-SNAPSHOT</onami.version>
         <slf4j.version>1.6.6</slf4j.version>
-
+        <assertj-1.version>1.7.1</assertj-1.version>
+        <assertj-3.version>3.2.0</assertj-3.version>
 
         <javax.mail.groupId>javax.mail</javax.mail.groupId>
         <javax.mail.artifactId>mail</javax.mail.artifactId>
@@ -357,7 +358,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.8.2</version>
+                <version>4.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.onami</groupId>

Modified: james/project/trunk/protocols/imap/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/imap/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/protocols/imap/pom.xml (original)
+++ james/project/trunk/protocols/imap/pom.xml Mon Jan  4 09:40:49 2016
@@ -84,9 +84,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
         </dependency>
-            
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock</artifactId>

Modified: james/project/trunk/protocols/managesieve/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/managesieve/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/protocols/managesieve/pom.xml (original)
+++ james/project/trunk/protocols/managesieve/pom.xml Mon Jan  4 09:40:49 2016
@@ -23,8 +23,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>protocols</artifactId>
         <groupId>org.apache.james</groupId>
+        <artifactId>protocols</artifactId>
         <version>1.6.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -45,8 +45,8 @@
             <artifactId>james-server-data-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
@@ -58,15 +58,19 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito-core.version}</version>
-            <scope>test</scope>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
+            <version>${assertj-1.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

Modified: james/project/trunk/protocols/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/protocols/pom.xml (original)
+++ james/project/trunk/protocols/pom.xml Mon Jan  4 09:40:49 2016
@@ -56,7 +56,6 @@
         <commons-codec.version>1.7</commons-codec.version>
         <commons-collections.version>3.2.1</commons-collections.version>
         <apache-commons-io.version>1.3.2</apache-commons-io.version>
-        <guava.version>13.0</guava.version>
         <jmock.version>2.5.1</jmock.version>
         <jutf7.version>1.0.0</jutf7.version>
         <junit.version>4.10</junit.version>
@@ -65,6 +64,8 @@
         <james-server-data-api.version>3.0.0-beta5-SNAPSHOT</james-server-data-api.version>
         <jsieve.version>0.6-SNAPSHOT</jsieve.version>
         <mockito-core.version>1.9.0</mockito-core.version>
+        <assertj-1.version>1.7.1</assertj-1.version>
+        <assertj-3.version>3.2.0</assertj-3.version>
     </properties>
 
     <dependencyManagement>
@@ -154,7 +155,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
+                <version>16.0</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
@@ -255,11 +256,6 @@
                 <artifactId>mockito-core</artifactId>
                 <version>${mockito-core.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.assertj</groupId>
-                <artifactId>assertj-core</artifactId>
-                <version>1.7.1</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -268,7 +264,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.7</version>
                 <extensions>true</extensions>
             </plugin>
             <plugin>

Modified: james/project/trunk/protocols/pop3/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/protocols/pop3/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/protocols/pop3/pom.xml (original)
+++ james/project/trunk/protocols/pop3/pom.xml Mon Jan  4 09:40:49 2016
@@ -62,7 +62,8 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>1.7.1</version>
+            <version>${assertj-1.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

Modified: james/project/trunk/server/container/cassandra-guice/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cassandra-guice/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/container/cassandra-guice/pom.xml (original)
+++ james/project/trunk/server/container/cassandra-guice/pom.xml Mon Jan  4 09:40:49 2016
@@ -396,7 +396,6 @@
                 <dependency>
                     <groupId>com.jayway.restassured</groupId>
                     <artifactId>rest-assured</artifactId>
-                    <version>2.5.0</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
@@ -430,7 +429,7 @@
                 <dependency>
                     <groupId>org.assertj</groupId>
                     <artifactId>assertj-core</artifactId>
-                    <version>3.0.0</version>
+                    <version>${assertj-3.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

Modified: james/project/trunk/server/container/cli/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/cli/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/container/cli/pom.xml (original)
+++ james/project/trunk/server/container/cli/pom.xml Mon Jan  4 09:40:49 2016
@@ -57,6 +57,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/server/container/core/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/container/core/pom.xml (original)
+++ james/project/trunk/server/container/core/pom.xml Mon Jan  4 09:40:49 2016
@@ -68,6 +68,10 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+        </dependency>
+        <dependency>
             <groupId>${javax.mail.groupId}</groupId>
             <artifactId>${javax.mail.artifactId}</artifactId>
         </dependency>
@@ -92,6 +96,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/server/container/filesystem-api/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/filesystem-api/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/container/filesystem-api/pom.xml (original)
+++ james/project/trunk/server/container/filesystem-api/pom.xml Mon Jan  4 09:40:49 2016
@@ -49,6 +49,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/server/container/mailbox-adapter/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/mailbox-adapter/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/container/mailbox-adapter/pom.xml (original)
+++ james/project/trunk/server/container/mailbox-adapter/pom.xml Mon Jan  4 09:40:49 2016
@@ -78,6 +78,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/server/container/spring/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/spring/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/container/spring/pom.xml (original)
+++ james/project/trunk/server/container/spring/pom.xml Mon Jan  4 09:40:49 2016
@@ -144,6 +144,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/server/data/data-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-cassandra/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/data/data-cassandra/pom.xml (original)
+++ james/project/trunk/server/data/data-cassandra/pom.xml Mon Jan  4 09:40:49 2016
@@ -49,6 +49,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: james/project/trunk/server/data/data-file/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-file/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/data/data-file/pom.xml (original)
+++ james/project/trunk/server/data/data-file/pom.xml Mon Jan  4 09:40:49 2016
@@ -105,11 +105,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.james</groupId>
             <artifactId>james-server-data-library</artifactId>
             <type>test-jar</type>
@@ -130,6 +125,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/server/data/data-hbase/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-hbase/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/data/data-hbase/pom.xml (original)
+++ james/project/trunk/server/data/data-hbase/pom.xml Mon Jan  4 09:40:49 2016
@@ -123,11 +123,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.james</groupId>
             <artifactId>james-server-data-library</artifactId>
             <type>test-jar</type>
@@ -170,6 +165,8 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: james/project/trunk/server/data/data-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jdbc/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/data/data-jdbc/pom.xml (original)
+++ james/project/trunk/server/data/data-jdbc/pom.xml Mon Jan  4 09:40:49 2016
@@ -112,6 +112,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/server/data/data-jmap/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jmap/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/data/data-jmap/pom.xml (original)
+++ james/project/trunk/server/data/data-jmap/pom.xml Mon Jan  4 09:40:49 2016
@@ -178,6 +178,10 @@
                     <artifactId>james-server-data-api</artifactId>
                 </dependency>
                 <dependency>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </dependency>
+                <dependency>
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-collections4</artifactId>
                 </dependency>
@@ -193,6 +197,7 @@
                 <dependency>
                     <groupId>org.assertj</groupId>
                     <artifactId>assertj-core</artifactId>
+                    <version>${assertj-3.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

Modified: james/project/trunk/server/data/data-jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jpa/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/data/data-jpa/pom.xml (original)
+++ james/project/trunk/server/data/data-jpa/pom.xml Mon Jan  4 09:40:49 2016
@@ -101,11 +101,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.james</groupId>
             <artifactId>james-server-data-library</artifactId>
             <type>test-jar</type>
@@ -125,6 +120,8 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>

Modified: james/project/trunk/server/data/data-library/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-library/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/data/data-library/pom.xml (original)
+++ james/project/trunk/server/data/data-library/pom.xml Mon Jan  4 09:40:49 2016
@@ -94,6 +94,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/server/data/data-memory/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-memory/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/data/data-memory/pom.xml (original)
+++ james/project/trunk/server/data/data-memory/pom.xml Mon Jan  4 09:40:49 2016
@@ -64,6 +64,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/project/trunk/server/karaf/distribution/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/karaf/distribution/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/karaf/distribution/pom.xml (original)
+++ james/project/trunk/server/karaf/distribution/pom.xml Mon Jan  4 09:40:49 2016
@@ -33,7 +33,6 @@
         <dependency>
             <groupId>org.apache.james.karaf</groupId>
             <artifactId>james-karaf-features</artifactId>
-            <version>${project.version}</version>
             <type>pom</type>
         </dependency>
     </dependencies>

Modified: james/project/trunk/server/karaf/integration/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/karaf/integration/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/karaf/integration/pom.xml (original)
+++ james/project/trunk/server/karaf/integration/pom.xml Mon Jan  4 09:40:49 2016
@@ -81,7 +81,6 @@
         <dependency>
             <groupId>org.apache.james.karaf</groupId>
             <artifactId>james-karaf-distribution</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
             <type>tar.gz</type>
             <exclusions>

Modified: james/project/trunk/server/mailet/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/mailet/mailets/pom.xml (original)
+++ james/project/trunk/server/mailet/mailets/pom.xml Mon Jan  4 09:40:49 2016
@@ -173,6 +173,8 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
+            <version>${assertj-1.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

Modified: james/project/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/pom.xml (original)
+++ james/project/trunk/server/pom.xml Mon Jan  4 09:40:49 2016
@@ -188,10 +188,11 @@
         <mockito-core.version>1.9.0</mockito-core.version>
         <backends.version>1.8.3-SNAPSHOT</backends.version>
         <apache-backends-cassandra.version>1.8.3-SNAPSHOT</apache-backends-cassandra.version>
-        <assertj3>3.2.0</assertj3>
         <jackson-data.version>2.6.3</jackson-data.version>
         <jetty.version>9.3.5.v20151012</jetty.version>
         <cassandra-unit.version>2.1.9.2</cassandra-unit.version>
+        <assertj-1.version>1.7.1</assertj-1.version>
+        <assertj-3.version>3.2.0</assertj-3.version>
     </properties>
 
     <dependencyManagement>
@@ -975,12 +976,6 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.assertj</groupId>
-                <artifactId>assertj-core</artifactId>
-                <version>1.7.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
                 <groupId>pl.pragmatists</groupId>
                 <artifactId>JUnitParams</artifactId>
                 <version>1.0.4</version>

Modified: james/project/trunk/server/protocols/jmap-integration-testing/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap-integration-testing/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap-integration-testing/pom.xml (original)
+++ james/project/trunk/server/protocols/jmap-integration-testing/pom.xml Mon Jan  4 09:40:49 2016
@@ -196,6 +196,12 @@
                     <scope>test</scope>
                 </dependency>
                 <dependency>
+                    <groupId>org.assertj</groupId>
+                    <artifactId>assertj-core</artifactId>
+                    <version>${assertj-3.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
                     <groupId>org.cassandraunit</groupId>
                     <artifactId>cassandra-unit</artifactId>
                     <version>${cassandra-unit.version}</version>

Modified: james/project/trunk/server/protocols/jmap/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/pom.xml (original)
+++ james/project/trunk/server/protocols/jmap/pom.xml Mon Jan  4 09:40:49 2016
@@ -256,7 +256,7 @@
                 <dependency>
                     <groupId>org.assertj</groupId>
                     <artifactId>assertj-core</artifactId>
-                    <version>${assertj3}</version>
+                    <version>${assertj-3.version}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

Modified: james/project/trunk/server/protocols/protocols-managesieve/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-managesieve/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/protocols/protocols-managesieve/pom.xml (original)
+++ james/project/trunk/server/protocols/protocols-managesieve/pom.xml Mon Jan  4 09:40:49 2016
@@ -23,42 +23,38 @@
             <groupId>org.apache.james</groupId>
             <artifactId>james-server-filesystem-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.james.protocols</groupId>
             <artifactId>protocols-managesieve</artifactId>
-            <version>${protocols.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.james.protocols</groupId>
             <artifactId>protocols-netty</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
         </dependency>
         <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
         </dependency>
         <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.1_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
 
-
 </project>
\ No newline at end of file

Modified: james/project/trunk/server/queue/queue-api/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-api/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/queue/queue-api/pom.xml (original)
+++ james/project/trunk/server/queue/queue-api/pom.xml Mon Jan  4 09:40:49 2016
@@ -39,14 +39,18 @@
             <artifactId>apache-mailet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${javax.mail.groupId}</groupId>
-            <artifactId>${javax.mail.artifactId}</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.james</groupId>
             <artifactId>james-server-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.james</groupId>
+            <artifactId>james-server-lifecycle-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${javax.mail.groupId}</groupId>
+            <artifactId>${javax.mail.artifactId}</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: james/project/trunk/server/queue/queue-file/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-file/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/queue/queue-file/pom.xml (original)
+++ james/project/trunk/server/queue/queue-file/pom.xml Mon Jan  4 09:40:49 2016
@@ -48,6 +48,10 @@
             <artifactId>james-server-core</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.james</groupId>
+            <artifactId>james-server-lifecycle-api</artifactId>
+        </dependency>
+        <dependency>
           <groupId>javax.inject</groupId>
           <artifactId>javax.inject</artifactId>
         </dependency>

Modified: james/project/trunk/server/queue/queue-jms/pom.xml
URL: http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-jms/pom.xml?rev=1722814&r1=1722813&r2=1722814&view=diff
==============================================================================
--- james/project/trunk/server/queue/queue-jms/pom.xml (original)
+++ james/project/trunk/server/queue/queue-jms/pom.xml Mon Jan  4 09:40:49 2016
@@ -51,6 +51,10 @@
             <artifactId>apache-mailet-api</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>




---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message