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 2016/04/06 11:21:46 UTC
[02/18] james-project git commit: MAILBOX-266 Update guava dependency
to 18.0 to satisfy ElasticSearch 2.2.1 dependency
MAILBOX-266 Update guava dependency to 18.0 to satisfy ElasticSearch 2.2.1 dependency
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/67882065
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/67882065
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/67882065
Branch: refs/heads/master
Commit: 67882065b0aa8a1f515973ec99d6e151a41e3359
Parents: 41ca575
Author: Benoit Tellier <bt...@apache.org>
Authored: Thu Feb 18 10:55:36 2016 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Wed Apr 6 16:18:41 2016 +0700
----------------------------------------------------------------------
backends-common/pom.xml | 2 +-
.../org/apache/james/mailbox/elasticsearch/json/EMailer.java | 6 +++---
mailbox/pom.xml | 2 +-
.../mailbox/store/mail/model/impl/SimpleMailboxMessage.java | 4 ++--
protocols/pom.xml | 2 +-
.../main/java/org/apache/james/http/jetty/Configuration.java | 3 ++-
.../src/main/java/org/apache/james/rrt/lib/MappingImpl.java | 3 ++-
.../src/main/java/org/apache/james/rrt/lib/MappingsImpl.java | 3 ++-
server/pom.xml | 2 +-
.../main/java/org/apache/james/jmap/methods/JmapResponse.java | 3 ++-
.../src/main/java/org/apache/james/jmap/methods/Method.java | 2 +-
.../java/org/apache/james/jmap/methods/ValidationResult.java | 3 ++-
.../main/java/org/apache/james/jmap/model/CreationMessage.java | 3 ++-
.../src/main/java/org/apache/james/jmap/model/Emailer.java | 3 ++-
.../main/java/org/apache/james/jmap/model/mailbox/Mailbox.java | 3 ++-
.../org/apache/james/jmap/model/mailbox/MailboxRequest.java | 3 ++-
.../main/java/org/apache/james/jmap/model/mailbox/Role.java | 3 ++-
.../java/org/apache/james/jmap/model/mailbox/SortOrder.java | 3 ++-
.../main/java/org/apache/james/jmap/model/message/EMailer.java | 3 ++-
19 files changed, 34 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/backends-common/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index e09819c..fc83424 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>16.0</version>
+ <version>18.0</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/EMailer.java
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/EMailer.java b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/EMailer.java
index 9545a0e..0ed87ac 100644
--- a/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/EMailer.java
+++ b/mailbox/elasticsearch/src/main/java/org/apache/james/mailbox/elasticsearch/json/EMailer.java
@@ -19,11 +19,11 @@
package org.apache.james.mailbox.elasticsearch.json;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.elasticsearch.common.base.MoreObjects;
-
import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.MoreObjects;
+
public class EMailer {
private final String name;
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 6596bc1..e7f50df 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -116,7 +116,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>16.0</guava.version>
+ <guava.version>18.0</guava.version>
<assertj.version>1.7.1</assertj.version>
<jackson-databinding.version>2.6.3</jackson-databinding.version>
<cassandra-driver-core.version>2.1.8</cassandra-driver-core.version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
index 0ae7aee..24ddb27 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java
@@ -32,7 +32,7 @@ import org.apache.james.mailbox.store.mail.model.DelegatingMailboxMessage;
import org.apache.james.mailbox.store.mail.model.MailboxId;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.primitives.Ints;
public class SimpleMailboxMessage<Id extends MailboxId> extends DelegatingMailboxMessage<Id> {
@@ -166,7 +166,7 @@ public class SimpleMailboxMessage<Id extends MailboxId> extends DelegatingMailbo
}
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("uid", this.uid)
.add("mailboxId", this.mailboxId)
.add("answered", this.answered)
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index e682f1f..470cb72 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -154,7 +154,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>16.0</version>
+ <version>18.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/container/jetty/src/main/java/org/apache/james/http/jetty/Configuration.java
----------------------------------------------------------------------
diff --git a/server/container/jetty/src/main/java/org/apache/james/http/jetty/Configuration.java b/server/container/jetty/src/main/java/org/apache/james/http/jetty/Configuration.java
index 445c507..362a1a2 100644
--- a/server/container/jetty/src/main/java/org/apache/james/http/jetty/Configuration.java
+++ b/server/container/jetty/src/main/java/org/apache/james/http/jetty/Configuration.java
@@ -24,6 +24,7 @@ import java.util.Optional;
import javax.servlet.Filter;
import javax.servlet.Servlet;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ImmutableMap;
@@ -171,7 +172,7 @@ public class Configuration {
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(getClass())
+ return MoreObjects.toStringHelper(getClass())
.add("mappings", mappings)
.add("filters", filters)
.add("port", port)
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
index 40c1550..113b83b 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingImpl.java
@@ -24,6 +24,7 @@ import java.io.Serializable;
import org.apache.james.rrt.api.RecipientRewriteTable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -113,7 +114,7 @@ public class MappingImpl implements Mapping, Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(getClass()).add("mapping", mapping).toString();
+ return MoreObjects.toStringHelper(getClass()).add("mapping", mapping).toString();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
index 0be86e0..8b421e5 100644
--- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
+++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/MappingsImpl.java
@@ -30,6 +30,7 @@ import org.apache.james.rrt.lib.Mapping.Type;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
@@ -234,6 +235,6 @@ public class MappingsImpl implements Mappings, Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(getClass()).add("mappings", mappings).toString();
+ return MoreObjects.toStringHelper(getClass()).add("mappings", mappings).toString();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 4b4863f..884c734 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -167,7 +167,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>16.0</guava.version>
+ <guava.version>18.0</guava.version>
<cucumber.version>1.2.3</cucumber.version>
<!-- karaf dependencies -->
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponse.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponse.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponse.java
index dbfdee9..bab4dbc 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponse.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/JmapResponse.java
@@ -26,6 +26,7 @@ import org.apache.james.jmap.model.ClientId;
import org.apache.james.jmap.model.Property;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -153,7 +154,7 @@ public class JmapResponse {
@Override
public String toString() {
- return Objects.toStringHelper(getClass())
+ return MoreObjects.toStringHelper(getClass())
.add("method", method)
.add("response", response)
.add("clientId", clientId)
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Method.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Method.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Method.java
index 5b83319..46cb307 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Method.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/Method.java
@@ -19,7 +19,7 @@
package org.apache.james.jmap.methods;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import java.util.Objects;
import java.util.stream.Stream;
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/ValidationResult.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/ValidationResult.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/ValidationResult.java
index 9540ce6..0683522 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/ValidationResult.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/ValidationResult.java
@@ -22,6 +22,7 @@ package org.apache.james.jmap.methods;
import java.util.Objects;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
public class ValidationResult {
@@ -85,7 +86,7 @@ public class ValidationResult {
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(getClass())
+ return MoreObjects.toStringHelper(getClass())
.add("property", property)
.add("errorMessage", errorMessage)
.toString();
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/CreationMessage.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/CreationMessage.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/CreationMessage.java
index 4fac7e8..de2453d 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/CreationMessage.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/CreationMessage.java
@@ -36,6 +36,7 @@ import org.apache.james.jmap.methods.ValidationResult;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
@@ -420,7 +421,7 @@ public class CreationMessage {
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("email", email.orElse("<unset>"))
.toString();
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Emailer.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Emailer.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Emailer.java
index 72b04e6..906a841 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Emailer.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/Emailer.java
@@ -24,6 +24,7 @@ import java.util.Objects;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -90,7 +91,7 @@ public class Emailer {
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("email", email)
.toString();
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java
index 6c3330d..52436c4 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Mailbox.java
@@ -28,6 +28,7 @@ import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -289,7 +290,7 @@ public class Mailbox {
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(getClass())
+ return MoreObjects.toStringHelper(getClass())
.add("id", id)
.add("name", name)
.add("sortOrder", sortOrder)
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxRequest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxRequest.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxRequest.java
index c625f7a..bb8cff3 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxRequest.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/MailboxRequest.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang.NotImplementedException;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -145,7 +146,7 @@ public class MailboxRequest {
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(getClass())
+ return MoreObjects.toStringHelper(getClass())
.add("id", id)
.add("name", name)
.add("parentId", parentId)
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
index 4c01a48..a29c168 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java
@@ -26,6 +26,7 @@ import java.util.stream.Collectors;
import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
@@ -94,6 +95,6 @@ public class Role {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("name", name).toString();
+ return MoreObjects.toStringHelper(this).add("name", name).toString();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/SortOrder.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/SortOrder.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/SortOrder.java
index fe5fb0b..6284381 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/SortOrder.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/SortOrder.java
@@ -21,6 +21,7 @@ package org.apache.james.jmap.model.mailbox;
import java.util.Optional;
import com.fasterxml.jackson.annotation.JsonValue;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
@@ -74,7 +75,7 @@ public class SortOrder implements Comparable<SortOrder> {
@Override
public String toString() {
- return Objects.toStringHelper(getClass()).add("order", sortOrder).toString();
+ return MoreObjects.toStringHelper(getClass()).add("order", sortOrder).toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/james-project/blob/67882065/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/EMailer.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/EMailer.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/EMailer.java
index 927119f..0126c73 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/EMailer.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/message/EMailer.java
@@ -20,6 +20,7 @@
package org.apache.james.jmap.model.message;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.MoreObjects;
import java.util.Objects;
@@ -60,7 +61,7 @@ public class EMailer {
@Override
public String toString() {
- return com.google.common.base.Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("address", address)
.toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org