Author: matthieu Date: Thu Oct 29 14:12:43 2015 New Revision: 1711264 URL: http://svn.apache.org/viewvc?rev=1711264&view=rev Log: JAMES-1588 Guava 16.0 is needed to launch Cassandra Session
Modified: james/project/trunk/mailbox/pom.xml james/project/trunk/mailbox/zoo-seq-provider/pom.xml james/project/trunk/server/container/core/pom.xml james/project/trunk/server/container/mailbox-adapter/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-jcr/pom.xml james/project/trunk/server/data/data-jdbc/pom.xml james/project/trunk/server/data/data-jpa/pom.xml james/project/trunk/server/data/data-library/pom.xml james/project/trunk/server/dns-service/dnsservice-dnsjava/pom.xml james/project/trunk/server/dns-service/dnsservice-library/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/queue/queue-activemq/pom.xml james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java Modified: james/project/trunk/mailbox/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/mailbox/pom.xml (original) +++ james/project/trunk/mailbox/pom.xml Thu Oct 29 14:12:43 2015 @@ -120,7 +120,7 @@ <junit.version>4.11</junit.version> <mockito-core.version>1.9.0</mockito-core.version> <jasypt.version>1.9.0</jasypt.version> - <guava.version>13.0</guava.version> + <guava.version>16.0</guava.version> <assertj.version>1.7.1</assertj.version> <jackson-databinding.version>2.3.3</jackson-databinding.version> <cassandra-driver-core.version>2.1.5</cassandra-driver-core.version> Modified: james/project/trunk/mailbox/zoo-seq-provider/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/mailbox/zoo-seq-provider/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/mailbox/zoo-seq-provider/pom.xml (original) +++ james/project/trunk/mailbox/zoo-seq-provider/pom.xml Thu Oct 29 14:12:43 2015 @@ -64,6 +64,11 @@ <version>${curator.version}</version> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>13.0</version> + </dependency> + <dependency> <groupId>com.netflix.curator</groupId> <artifactId>curator-framework</artifactId> <version>${curator.version}</version> Modified: james/project/trunk/server/container/core/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/container/core/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/container/core/pom.xml (original) +++ james/project/trunk/server/container/core/pom.xml Thu Oct 29 14:12:43 2015 @@ -61,6 +61,10 @@ <artifactId>apache-mailet-base</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </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=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/container/mailbox-adapter/pom.xml (original) +++ james/project/trunk/server/container/mailbox-adapter/pom.xml Thu Oct 29 14:12:43 2015 @@ -63,6 +63,10 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> 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=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/data/data-file/pom.xml (original) +++ james/project/trunk/server/data/data-file/pom.xml Thu Oct 29 14:12:43 2015 @@ -60,6 +60,10 @@ <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </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=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/data/data-hbase/pom.xml (original) +++ james/project/trunk/server/data/data-hbase/pom.xml Thu Oct 29 14:12:43 2015 @@ -98,6 +98,12 @@ </dependency> <!-- Test dependencies --> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <scope>test</scope> + <version>13.0</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: james/project/trunk/server/data/data-jcr/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/data/data-jcr/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/data/data-jcr/pom.xml (original) +++ james/project/trunk/server/data/data-jcr/pom.xml Thu Oct 29 14:12:43 2015 @@ -52,6 +52,10 @@ <artifactId>james-server-core</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> </dependency> 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=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/data/data-jdbc/pom.xml (original) +++ james/project/trunk/server/data/data-jdbc/pom.xml Thu Oct 29 14:12:43 2015 @@ -71,7 +71,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> <dependency> <groupId>${javax.mail.groupId}</groupId> <artifactId>${javax.mail.artifactId}</artifactId> 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=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/data/data-jpa/pom.xml (original) +++ james/project/trunk/server/data/data-jpa/pom.xml Thu Oct 29 14:12:43 2015 @@ -64,6 +64,10 @@ <artifactId>slf4j-log4j12</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> </dependency> 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=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/data/data-library/pom.xml (original) +++ james/project/trunk/server/data/data-library/pom.xml Thu Oct 29 14:12:43 2015 @@ -56,6 +56,10 @@ <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> </dependency> Modified: james/project/trunk/server/dns-service/dnsservice-dnsjava/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/dns-service/dnsservice-dnsjava/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/dns-service/dnsservice-dnsjava/pom.xml (original) +++ james/project/trunk/server/dns-service/dnsservice-dnsjava/pom.xml Thu Oct 29 14:12:43 2015 @@ -52,6 +52,10 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>dnsjava</groupId> <artifactId>dnsjava</artifactId> </dependency> Modified: james/project/trunk/server/dns-service/dnsservice-library/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/dns-service/dnsservice-library/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/dns-service/dnsservice-library/pom.xml (original) +++ james/project/trunk/server/dns-service/dnsservice-library/pom.xml Thu Oct 29 14:12:43 2015 @@ -52,6 +52,10 @@ <artifactId>${javax.mail.artifactId}</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: james/project/trunk/server/karaf/integration/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/karaf/integration/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/karaf/integration/pom.xml (original) +++ james/project/trunk/server/karaf/integration/pom.xml Thu Oct 29 14:12:43 2015 @@ -95,7 +95,10 @@ </exclusion> </exclusions> </dependency> - + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: james/project/trunk/server/mailet/mailets/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/mailet/mailets/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/mailet/mailets/pom.xml (original) +++ james/project/trunk/server/mailet/mailets/pom.xml Thu Oct 29 14:12:43 2015 @@ -111,6 +111,10 @@ <artifactId>apache-jspf-resolver</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> Modified: james/project/trunk/server/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/pom.xml (original) +++ james/project/trunk/server/pom.xml Thu Oct 29 14:12:43 2015 @@ -165,7 +165,7 @@ <geronimo-annotation-spec.version>1.0.1</geronimo-annotation-spec.version> <spring-osgi-extender.version>1.2.1</spring-osgi-extender.version> <org.osgi.core.version>5.0.0</org.osgi.core.version> - <guava.version>13.0</guava.version> + <guava.version>16.0</guava.version> <!-- karaf dependencies --> <exam.version>2.6.0</exam.version> @@ -1232,13 +1232,6 @@ </dependencies> </dependencyManagement> - <dependencies> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - </dependencies> - <build> <plugins> <plugin> Modified: james/project/trunk/server/queue/queue-activemq/pom.xml URL: http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-activemq/pom.xml?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/queue/queue-activemq/pom.xml (original) +++ james/project/trunk/server/queue/queue-activemq/pom.xml Thu Oct 29 14:12:43 2015 @@ -99,6 +99,10 @@ <artifactId>geronimo-annotation_1.1_spec</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> Modified: james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java (original) +++ james/project/trunk/server/queue/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java Thu Oct 29 14:12:43 2015 @@ -42,6 +42,7 @@ import javax.mail.MessagingException; import javax.mail.util.SharedFileInputStream; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.james.core.MimeMessageCopyOnWriteProxy; import org.apache.james.core.MimeMessageSource; import org.apache.james.lifecycle.api.Disposable; @@ -50,8 +51,6 @@ import org.apache.james.queue.api.Manage import org.apache.mailet.Mail; import org.slf4j.Logger; -import com.google.common.io.Closeables; - /** * {@link ManageableMailQueue} implementation which use the fs to store {@link Mail}'s * <p/> @@ -353,7 +352,7 @@ public class FileMailQueue implements Ma @Override public void dispose() { - Closeables.closeQuietly(in); + IOUtils.closeQuietly(in); file = null; } Modified: james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java URL: http://svn.apache.org/viewvc/james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java?rev=1711264&r1=1711263&r2=1711264&view=diff ============================================================================== --- james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java (original) +++ james/project/trunk/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java Thu Oct 29 14:12:43 2015 @@ -18,7 +18,6 @@ ****************************************************************/ package org.apache.james.queue.jms; -import com.google.common.io.Closeables; import org.apache.james.core.MailImpl; import org.apache.james.core.MimeMessageCopyOnWriteProxy; import org.apache.james.queue.api.MailPrioritySupport; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org