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/06/05 10:01:46 UTC
[1/2] james-project git commit: JAMES-2045 All James subproject
should rely on the same mime4j version
Repository: james-project
Updated Branches:
refs/heads/master b432e3c41 -> 173303649
JAMES-2045 All James subproject should rely on the same mime4j version
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/17330364
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/17330364
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/17330364
Branch: refs/heads/master
Commit: 173303649d1408727656535a07f0ed70f8b25754
Parents: b9382c4
Author: benwa <bt...@linagora.com>
Authored: Mon Jun 5 13:27:52 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Mon Jun 5 17:00:49 2017 +0700
----------------------------------------------------------------------
mailbox/pom.xml | 2 +-
mailet/pom.xml | 2 +-
protocols/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/17330364/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index f82bd78..fc7f1c1 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -77,7 +77,7 @@
<javax.activation.artifactId>activation</javax.activation.artifactId>
<javax.persistence.version>1.0.2</javax.persistence.version>
<javax.inject.version>1</javax.inject.version>
- <apache-mime4j.version>0.8.0</apache-mime4j.version>
+ <apache-mime4j.version>0.8.1-SNAPSHOT</apache-mime4j.version>
<activation.version>1.1.1</activation.version>
<jmock.version>2.5.1</jmock.version>
<hbase.version>0.94.27</hbase.version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/17330364/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 2edce4f..5ad41f4 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -53,7 +53,7 @@
<maven-plugin-api.version>3.2.5</maven-plugin-api.version>
<maven-reporting-impl.version>2.2</maven-reporting-impl.version>
<maven-reporting-api.version>3.0</maven-reporting-api.version>
- <mime4j.version>0.8.0</mime4j.version>
+ <mime4j.version>0.8.1-SNAPSHOT</mime4j.version>
<qdox.version>1.12.1</qdox.version>
<assertj-1.version>1.7.1</assertj-1.version>
<assertj-3.version>3.3.0</assertj-3.version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/17330364/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index a8c21f4..4c15e6e 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -48,7 +48,7 @@
<target.jdk>1.6</target.jdk>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<netty.version>3.10.6.Final</netty.version>
- <apache-mime4j.version>0.8.0</apache-mime4j.version>
+ <apache-mime4j.version>0.8.1-SNAPSHOT</apache-mime4j.version>
<commons-net.version>3.2</commons-net.version>
<commons-lang.version>2.6</commons-lang.version>
<commons-codec.version>1.7</commons-codec.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: JAMES-2045 Add test on date head
without century
Posted by bt...@apache.org.
JAMES-2045 Add test on date head without century
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b9382c45
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b9382c45
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b9382c45
Branch: refs/heads/master
Commit: b9382c45c8037af2b22fd47aa9b0cf790a0de8ed
Parents: b432e3c
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Jun 2 15:30:51 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Mon Jun 5 17:00:49 2017 +0700
----------------------------------------------------------------------
.../james/jmap/model/MessageFactoryTest.java | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b9382c45/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
index cc65cc7..76e3cd5 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
@@ -361,6 +361,32 @@ public class MessageFactoryTest {
}
@Test
+ public void dateFromHeaderShouldUseCurrentCenturyWhenNone() throws Exception {
+ String headers = "From: user <userdomain>\n"
+ + "To: user1 <user1domain>, user2 <user2domain>\n"
+ + "Cc: usercc <userccdomain>\n"
+ + "Bcc: userbcc <userbccdomain>\n"
+ + "Date: Wed, 17 May 17 14:18:52 +0300\n"
+ + "Subject: test subject\n";
+
+ MetaDataWithContent testMail = MetaDataWithContent.builder()
+ .uid(MessageUid.of(2))
+ .flags(new Flags(Flag.SEEN))
+ .size(headers.length())
+ .internalDate(INTERNAL_DATE)
+ .content(new ByteArrayInputStream(headers.getBytes(Charsets.UTF_8)))
+ .attachments(ImmutableList.of())
+ .mailboxId(MAILBOX_ID)
+ .messageId(new TestMessageId.Factory().generate())
+ .build();
+
+ Message testee = messageFactory.fromMetaDataWithContent(testMail);
+
+ assertThat(testee.getDate())
+ .isEqualTo(Instant.parse("2017-05-17T11:18:52.000Z"));
+ }
+
+ @Test
public void internalDateShouldBeUsedIfNoDateInHeaders() throws Exception {
String headers = "From: user <userdomain>\n"
+ "To: user1 <user1domain>, user2 <user2domain>\n"
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org