[jira] [Created] (JAMES-2508) RabbitMQ can also benefit from tmpfs

2018-07-30 Thread Tellier Benoit (JIRA)
Tellier Benoit created JAMES-2508:
-

 Summary: RabbitMQ can also benefit from tmpfs
 Key: JAMES-2508
 URL: https://issues.apache.org/jira/browse/JAMES-2508
 Project: James Server
  Issue Type: Improvement
  Components: rabbitmq, Mailet Contributions, Queue
Reporter: Tellier Benoit


Our forwardToAmqp mailet and rabbitMQ tests can benefit from TMPFS for testing 
speed, getting a little time improvement.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Closed] (JAMES-2501) SpamAssassin utilities needs their own backend project

2018-07-30 Thread Tellier Benoit (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2501?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit closed JAMES-2501.
-

> SpamAssassin utilities needs their own backend project
> --
>
> Key: JAMES-2501
> URL: https://issues.apache.org/jira/browse/JAMES-2501
> Project: James Server
>  Issue Type: Improvement
>  Components: spamassassin
>Reporter: Tellier Benoit
>Priority: Major
> Fix For: 3.2.0
>
>
> Currently, SpamAssassin utils and containers is located in James utils 
> project. 
>  - It brings significant dependencies
>  - It significantly increases James utils build time while this project is 
> inherited by many dependencies
> I do believe we would benefit from having a SpamAssassin backend project with 
> utilities AND test containers + mocks



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Resolved] (JAMES-2501) SpamAssassin utilities needs their own backend project

2018-07-30 Thread Tellier Benoit (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2501?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit resolved JAMES-2501.
---
   Resolution: Fixed
Fix Version/s: 3.2.0

https://github.com/linagora/james-project/pull/1599 solved this

> SpamAssassin utilities needs their own backend project
> --
>
> Key: JAMES-2501
> URL: https://issues.apache.org/jira/browse/JAMES-2501
> Project: James Server
>  Issue Type: Improvement
>  Components: spamassassin
>Reporter: Tellier Benoit
>Priority: Major
> Fix For: 3.2.0
>
>
> Currently, SpamAssassin utils and containers is located in James utils 
> project. 
>  - It brings significant dependencies
>  - It significantly increases James utils build time while this project is 
> inherited by many dependencies
> I do believe we would benefit from having a SpamAssassin backend project with 
> utilities AND test containers + mocks



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Resolved] (JAMES-2486) Update various libs

2018-07-30 Thread Tellier Benoit (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2486?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit resolved JAMES-2486.
---
   Resolution: Fixed
Fix Version/s: 3.2.0

https://github.com/linagora/james-project/pull/1566 solved the issue

> Update various libs
> ---
>
> Key: JAMES-2486
> URL: https://issues.apache.org/jira/browse/JAMES-2486
> Project: James Server
>  Issue Type: Improvement
>Reporter: Gautier DI FOLCO
>Priority: Minor
> Fix For: 3.2.0
>
>
> {code:java}
> com.thoughtworks.qdox:qdox .. 1.12.1 -> 2.0-M9 GDF 
> [lib] 2.0-M9 // Used once
> dnsjava:dnsjava ... 2.1.1 -> 2.1.8 GDF 
> [lib] 2.1.8 // 7 years old
> com.github.dpaukov:combinatoricslib3 .. 3.2.0 -> 3.3.0 GDF 
> [streams] 3.3.0 // used once
> com.jason-goodwin:better-monads ... 0.4.0 -> 0.4.1 GDF 
> [fp] remove // never used
> nl.jqno.equalsverifier:equalsverifier . 2.4.6 -> 2.4.8 GDF 
> [lib] 2.4.8
> joda-time:joda-time  2.9.4 -> 2.10 MBA 
> [lib] to be removed
> com.github.kongchen:swagger-maven-plugin .. 3.1.5 -> 3.1.7 GDF 
> [doc] 3.1.7
> com.jayway.awaitility:awaitility .. 1.6.5 -> 1.7.0 GDF 
> [async] 3.1.1
> org.jsoup:jsoup .. 1.9.2 -> 1.11.3 MBA 
> [html] 1.11.3 // many perf improvements
> {code}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Closed] (JAMES-2486) Update various libs

2018-07-30 Thread Tellier Benoit (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2486?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit closed JAMES-2486.
-

> Update various libs
> ---
>
> Key: JAMES-2486
> URL: https://issues.apache.org/jira/browse/JAMES-2486
> Project: James Server
>  Issue Type: Improvement
>Reporter: Gautier DI FOLCO
>Priority: Minor
> Fix For: 3.2.0
>
>
> {code:java}
> com.thoughtworks.qdox:qdox .. 1.12.1 -> 2.0-M9 GDF 
> [lib] 2.0-M9 // Used once
> dnsjava:dnsjava ... 2.1.1 -> 2.1.8 GDF 
> [lib] 2.1.8 // 7 years old
> com.github.dpaukov:combinatoricslib3 .. 3.2.0 -> 3.3.0 GDF 
> [streams] 3.3.0 // used once
> com.jason-goodwin:better-monads ... 0.4.0 -> 0.4.1 GDF 
> [fp] remove // never used
> nl.jqno.equalsverifier:equalsverifier . 2.4.6 -> 2.4.8 GDF 
> [lib] 2.4.8
> joda-time:joda-time  2.9.4 -> 2.10 MBA 
> [lib] to be removed
> com.github.kongchen:swagger-maven-plugin .. 3.1.5 -> 3.1.7 GDF 
> [doc] 3.1.7
> com.jayway.awaitility:awaitility .. 1.6.5 -> 1.7.0 GDF 
> [async] 3.1.1
> org.jsoup:jsoup .. 1.9.2 -> 1.11.3 MBA 
> [html] 1.11.3 // many perf improvements
> {code}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Resolved] (JAMES-2493) upgrade log related libraries

2018-07-30 Thread Tellier Benoit (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2493?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit resolved JAMES-2493.
---
   Resolution: Fixed
Fix Version/s: 3.2.0

https://github.com/linagora/james-project/pull/1611 soled the issue

> upgrade log related libraries
> -
>
> Key: JAMES-2493
> URL: https://issues.apache.org/jira/browse/JAMES-2493
> Project: James Server
>  Issue Type: Task
>Reporter: Matthieu Baechler
>Priority: Major
> Fix For: 3.2.0
>
>
> Upgrade logs releated libraries 
> {code}
> ch.qos.logback:logback-classic  1.1.11 -> 1.3.0-alpha4 GDF 
> [log] 1.2.3 // 1.3.0 is for java 9
> ch.qos.logback:logback-core ... 1.1.11 -> 1.3.0-alpha4 GDF 
> [log] 1.2.3 // 1.3.0 is for java 9
> com.internetitem:logback-elasticsearch-appender ... 1.5 -> 1.6 MBA 
> [log] used at runtime, should not require any work
> commons-logging:commons-logging ... 1.1 -> 1.2 GDF 
> [log] 1.2 // (6 years old, security issues) we should not use it at all, we 
> should use the slf4j adapter
> log4j:log4j . 1.2.16 -> 1.2.17 GDF 
> [log] 1.2.17 // we should use the slf4j bridge only
> {code}
> Also, try to remove use of slf4j-simple



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Closed] (JAMES-2493) upgrade log related libraries

2018-07-30 Thread Tellier Benoit (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2493?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit closed JAMES-2493.
-

> upgrade log related libraries
> -
>
> Key: JAMES-2493
> URL: https://issues.apache.org/jira/browse/JAMES-2493
> Project: James Server
>  Issue Type: Task
>Reporter: Matthieu Baechler
>Priority: Major
> Fix For: 3.2.0
>
>
> Upgrade logs releated libraries 
> {code}
> ch.qos.logback:logback-classic  1.1.11 -> 1.3.0-alpha4 GDF 
> [log] 1.2.3 // 1.3.0 is for java 9
> ch.qos.logback:logback-core ... 1.1.11 -> 1.3.0-alpha4 GDF 
> [log] 1.2.3 // 1.3.0 is for java 9
> com.internetitem:logback-elasticsearch-appender ... 1.5 -> 1.6 MBA 
> [log] used at runtime, should not require any work
> commons-logging:commons-logging ... 1.1 -> 1.2 GDF 
> [log] 1.2 // (6 years old, security issues) we should not use it at all, we 
> should use the slf4j adapter
> log4j:log4j . 1.2.16 -> 1.2.17 GDF 
> [log] 1.2.17 // we should use the slf4j bridge only
> {code}
> Also, try to remove use of slf4j-simple



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[24/24] james-project git commit: JAMES-2486 Upgrade com.jayway.awaitility to org.awaitility

2018-07-30 Thread btellier
JAMES-2486 Upgrade com.jayway.awaitility to org.awaitility


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0a356975
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0a356975
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0a356975

Branch: refs/heads/master
Commit: 0a356975a595674e119eac4ed992dc123e7d3bc6
Parents: 69bb4de
Author: Gautier DI FOLCO 
Authored: Thu Jul 19 14:24:56 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:35 2018 +0700

--
 backends-common/elasticsearch/pom.xml   |  8 
 .../es/ClientProviderImplConnectionTest.java|  3 +--
 .../backends/es/EmbeddedElasticSearch.java  |  6 +++---
 mailbox/cassandra/pom.xml   | 10 +-
 mailbox/tika/pom.xml| 10 +-
 mpt/core/pom.xml|  8 
 .../james/mpt/session/ExternalSession.java  |  5 ++---
 mpt/impl/imap-mailbox/cyrus/pom.xml |  2 +-
 .../mpt/imapmailbox/cyrus/host/Docker.java  |  3 ++-
 .../apache/james/mpt/smtp/ForwardSmtpTest.java  | 11 +--
 pom.xml |  5 +
 server/container/guice/cassandra-guice/pom.xml  |  8 
 .../CassandraMailRepositoryIntegrationTest.java |  9 -
 .../java/org/apache/james/ESReporterTest.java   | 12 ++--
 .../guice/cassandra-ldap-guice/pom.xml  | 10 +-
 .../james/CassandraLdapJamesServerTest.java |  9 -
 server/container/guice/guice-common/pom.xml |  8 
 server/container/guice/jpa-guice/pom.xml|  8 
 .../org/apache/james/JPAJamesServerTest.java|  6 +++---
 server/container/guice/jpa-smtp/pom.xml | 20 +++-
 .../apache/james/metric/es/ESReporterTest.java  |  4 ++--
 server/data/data-jmap-cassandra/pom.xml | 10 +-
 server/data/data-jmap/pom.xml   | 10 +-
 .../AbstractNotificationRegistryTest.java   |  2 +-
 ...ResolutionRemoteDeliveryIntegrationTest.java |  2 +-
 .../GatewayRemoteDeliveryIntegrationTest.java   |  3 +--
 .../james/mailets/configuration/Constants.java  | 10 +-
 .../james/smtp/SmtpAuthorizedAddressesTest.java |  3 +--
 .../mailets/GroupMappingRelayTest.java  |  3 +--
 .../james/transport/mailets/amqp/AmqpRule.java  |  2 +-
 .../org/apache/james/jmap/TestingConstants.java | 11 ++-
 .../jmap/VacationRelayIntegrationTest.java  |  2 +-
 .../integration/ForwardIntegrationTest.java |  8 
 .../integration/SetMessagesMethodTest.java  |  2 +-
 .../integration/SpamAssassinContract.java   |  2 +-
 server/protocols/jmap/pom.xml   | 10 +-
 server/queue/queue-rabbitmq/pom.xml |  8 
 .../queue/rabbitmq/RabbitMQClusterTest.java |  4 ++--
 .../james/queue/rabbitmq/RabbitMQFixture.java   | 10 +-
 server/testing/pom.xml  |  8 
 .../java/org/apache/james/utils/FakeSmtp.java   |  2 +-
 .../apache/james/utils/IMAPMessageReader.java   |  2 +-
 42 files changed, 144 insertions(+), 135 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/backends-common/elasticsearch/pom.xml
--
diff --git a/backends-common/elasticsearch/pom.xml 
b/backends-common/elasticsearch/pom.xml
index cd5a0bf..6d8d071 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -49,10 +49,6 @@
 throwing-lambdas
 
 
-com.jayway.awaitility
-awaitility
-
-
 junit
 junit
 
@@ -62,6 +58,10 @@
 test
 
 
+org.awaitility
+awaitility
+
+
 org.elasticsearch
 elasticsearch
 2.2.1

http://git-wip-us.apache.org/repos/asf/james-project/blob/0a356975/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java
--
diff --git 
a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java
 
b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java
index 7ff3b74..aa0a8e9 100644
--- 
a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java
+++ 
b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ClientProviderImplConnectionTest.java
@@ -22,6 +22,7 @@ package org.apache.james.backends.es;
 import java.util.concurrent.TimeUnit;

[03/24] james-project git commit: JAMES-2501 Add a missing license

2018-07-30 Thread btellier
JAMES-2501 Add a missing license


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a80003a9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a80003a9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a80003a9

Branch: refs/heads/master
Commit: a80003a9f5e8276035cc79ef0633b1bd52211df8
Parents: 241ce2d
Author: benwa 
Authored: Thu Jul 26 11:32:53 2018 +0700
Committer: benwa 
Committed: Tue Jul 31 09:24:17 2018 +0700

--
 backends-common/jpa/pom.xml | 18 ++
 1 file changed, 18 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/a80003a9/backends-common/jpa/pom.xml
--
diff --git a/backends-common/jpa/pom.xml b/backends-common/jpa/pom.xml
index 2db2a06..81f04fd 100644
--- a/backends-common/jpa/pom.xml
+++ b/backends-common/jpa/pom.xml
@@ -1,4 +1,22 @@
 
+
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
 4.0.0
 


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



[07/24] james-project git commit: JAMES-2501 Create a SpamAssassin backend project

2018-07-30 Thread btellier
http://git-wip-us.apache.org/repos/asf/james-project/blob/1fd63a7f/server/container/util/src/test/resources/spamassassin_db/ham/ham6
--
diff --git a/server/container/util/src/test/resources/spamassassin_db/ham/ham6 
b/server/container/util/src/test/resources/spamassassin_db/ham/ham6
deleted file mode 100644
index f3231fe..000
--- a/server/container/util/src/test/resources/spamassassin_db/ham/ham6
+++ /dev/null
@@ -1,74 +0,0 @@
-From mar...@srv0.ems.ed.ac.uk  Thu Aug 22 14:54:39 2002
-Return-Path: 
-Delivered-To: z...@localhost.netnoteinc.com
-Received: from localhost (localhost [127.0.0.1])
-   by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 16FC743F99
-   for ; Thu, 22 Aug 2002 09:54:38 -0400 (EDT)
-Received: from phobos [127.0.0.1]
-   by localhost with IMAP (fetchmail-5.9.0)
-   for @localhost (single-drop); Thu, 22 Aug 2002 14:54:39 +0100 (IST)
-Received: from n14.grp.scd.yahoo.com (n14.grp.scd.yahoo.com
-[66.218.66.69]) by dogma.slashnull.org (8.11.6/8.11.6) with SMTP id
-g7MDoxZ08960 for ; Thu, 22 Aug 2002 14:50:59 
+0100
-X-Egroups-Return: 
sentto-2242572-52737-1030024261-=spamassassin.taint@returns.groups.yahoo.com
-Received: from [66.218.66.95] by n14.grp.scd.yahoo.com with NNFMP;
-22 Aug 2002 13:51:01 -
-X-Sender: mar...@srv0.ems.ed.ac.uk
-X-Apparently-To: te...@yahoogroups.com
-Received: (EGP: mail-8_1_0_1); 22 Aug 2002 13:51:00 -
-Received: (qmail 71894 invoked from network); 22 Aug 2002 13:51:00 -
-Received: from unknown (66.218.66.218) by m7.grp.scd.yahoo.com with QMQP;
-22 Aug 2002 13:51:00 -
-Received: from unknown (HELO haymarket.ed.ac.uk) (129.215.128.53) by
-mta3.grp.scd.yahoo.com with SMTP; 22 Aug 2002 13:51:00 -
-Received: from srv0.ems.ed.ac.uk (srv0.ems.ed.ac.uk [129.215.117.0]) by
-haymarket.ed.ac.uk (8.11.6/8.11.6) with ESMTP id g7MDow310334 for
-; Thu, 22 Aug 2002 14:50:59 +0100 (BST)
-Received: from EMS-SRV0/SpoolDir by srv0.ems.ed.ac.uk (Mercury 1.44);
-22 Aug 02 14:50:58 +
-Received: from SpoolDir by EMS-SRV0 (Mercury 1.44); 22 Aug 02 14:50:31 +
-Organization: Management School
-To: te...@yahoogroups.com
-Message-Id: <3D64FA3C.13325.63A5960@localhost>
-Priority: normal
-In-Reply-To: <3d64e94e.8060...@ee.ed.ac.uk>
-X-Mailer: Pegasus Mail for Windows (v4.01)
-Content-Description: Mail message body
-From: "Martin Adamson" 
-MIME-Version: 1.0
-Mailing-List: list te...@yahoogroups.com; contact
-forteana-ow...@yahoogroups.com
-Delivered-To: mailing list te...@yahoogroups.com
-Precedence: bulk
-List-Unsubscribe: 
-Date: Thu, 22 Aug 2002 14:50:31 +0100
-Subject: Re: [teana] Nothing like mama used to make
-Reply-To: te...@yahoogroups.com
-Content-Type: text/plain; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-
-
-> I just had to jump in here as Carbonara is one of my favourites to make and 
-> ask 
-> what the hell are you supposed to use instead of cream? 
-
-Isn't it just basically a mixture of beaten egg and bacon (or pancetta, 
-really)? You mix in the raw egg to the cooked pasta and the heat of the pasta 
-cooks the egg. That's my understanding.
-
-Martin
-
- Yahoo! Groups Sponsor -~-->
-4 DVDs Free +s&p Join Now
-http://us.click.yahoo.com/pt6YBB/NXiEAA/mG3HAA/7gSolB/TM
--~->
-
-To unsubscribe from this group, send an email to:
-forteana-unsubscr...@egroups.com
-
- 
-
-Your use of Yahoo! Groups is subject to http://docs.yahoo.com/info/terms/ 
-
-
-

http://git-wip-us.apache.org/repos/asf/james-project/blob/1fd63a7f/server/container/util/src/test/resources/spamassassin_db/ham/ham7
--
diff --git a/server/container/util/src/test/resources/spamassassin_db/ham/ham7 
b/server/container/util/src/test/resources/spamassassin_db/ham/ham7
deleted file mode 100644
index a65f9b4..000
--- a/server/container/util/src/test/resources/spamassassin_db/ham/ham7
+++ /dev/null
@@ -1,88 +0,0 @@
-From mar...@srv0.ems.ed.ac.uk  Thu Aug 22 14:54:40 2002
-Return-Path: 
-Delivered-To: z...@localhost.netnoteinc.com
-Received: from localhost (localhost [127.0.0.1])
-   by phobos.labs.netnoteinc.com (Postfix) with ESMTP id E3D7B47C66
-   for ; Thu, 22 Aug 2002 09:54:39 -0400 (EDT)
-Received: from phobos [127.0.0.1]
-   by localhost with IMAP (fetchmail-5.9.0)
-   for @localhost (single-drop); Thu, 22 Aug 2002 14:54:40 +0100 (IST)
-Received: from n11.grp.scd.yahoo.com (n11.grp.scd.yahoo.com
-[66.218.66.66]) by dogma.slashnull.org (8.11.6/8.11.6) with SMTP id
-g7MDt8Z09193 for ; Thu, 22 Aug 2002 14:55:10 
+0100
-X-Egroups-Return: 
sentto-2242572-52738-1030024499-=spamassassin.taint@returns.groups.yahoo.com
-Received: from [66.218.66.94] by n11.grp.scd.yahoo.

[06/24] james-project git commit: JAMES-2501 Create a SpamAssassin backend project

2018-07-30 Thread btellier
http://git-wip-us.apache.org/repos/asf/james-project/blob/1fd63a7f/server/container/util/src/test/resources/spamassassin_db/spam/spam8
--
diff --git 
a/server/container/util/src/test/resources/spamassassin_db/spam/spam8 
b/server/container/util/src/test/resources/spamassassin_db/spam/spam8
deleted file mode 100644
index addf463..000
--- a/server/container/util/src/test/resources/spamassassin_db/spam/spam8
+++ /dev/null
@@ -1,321 +0,0 @@
-From or...@imail.ru  Sun Jul 15 04:56:31 2001
-Return-Path: 
-Delivered-To: y...@netnoteinc.com
-Received: from cccp.co.kr (unknown [211.218.149.105]) by
-mail.netnoteinc.com (Postfix) with SMTP id 789D51140BA for
-; Sun, 15 Jul 2001 03:56:28 + (Eire)
-Received: from imail.ru [210.14.5.95] by cccp.co.kr running [nMail 1.04
-(Windows NT/2000) SMTP Server]; Wed, 11 Jul 2001 02:41:35 +0900
-Message-Id: <0e0836ec$6b26$0...@imail.ru>
-To: <6...@163.net>
-From: or...@imail.ru
-Subject: FW:
-Date: Fri, 02 Jan 1998 04:30:44 -0400
-MIME-Version: 1.0
-Content-Transfer-Encoding: quoted-printable
-X-Priority: 3
-X-Msmail-Priority: Normal
-X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2910.0)
-
-
-
-
-
-
-
- Thank you for your interest!
-
-  
- 
-
-Judgment Courses offers an extensive Audio training
-course in 
- "How to Collect Money Judgments"
-  . 
-
- S6
-
- 
-
-If you are like many people, you are not even sure what a
-Money Judgment is and 
- why processing Money Judgments
-can earn you very substantial income
-  .
-
-If you ever sue a company or a person and you win then you
-will have a Money Judgment against them.
-
-You are happy you won but you will soon find out the
-shocking fact: "Its now up to you to collect on the
-Judgment". The court does not require the loser to pay you.
-The court will not even help you. You must trace the loser
-down, find their assets, their employment, bank accounts,
-real estate, stocks and bonds, etc.
-
-Very few people know how to find these assets or what to do
-when they are found. The result is that millions of
-Judgments are just sitting in files and being forgotten.
-
-"In 79% of the cases the winner of a Judgment never sees a
-dime."
-
-The non-payment of judicial debt has grown to epidemic
-proportions. Right now in the United States there is
-between 
- 200 and 300 billion dollars of uncollected Money<=
-BR>
-Judgment debt
-  . For every Judgment that is paid, 5 more
-Judgments take its place.
-
-We identified this massive market 8 years ago and have
-actively pursued Judicial Judgments since. We invented this
-business. We have perfected it into a well proven and solid
-profession in which only a select few will be trained in the
-techniques necessary to succeed.
-
-With our first hand experience we have built a course which
-teaches you how to start your business in this new unknown
-and exciting field of processing Money Judgments.
-
-By following the steps laid out in our course and with
-reasonable effort you can become very successful in the
-processing of Money Judgments.
-
-The income potential is substantial in this profession. 
- We
-have associates who have taken our course and are now
-working full time making $96,000.00 to over $200,000.00 per
-year. Part time associates are earning between $24,000.00
-and $100,000.00 per year 
- . Some choose to operate out of
-their home and work by themselves. Others build a sizable
-organization of 15 to 25 people in attractive business
-offices.
-
-Today our company and our associates have over 126
-million dollars in Money Judgments that we are currently
-processing. Of this 126 million, 25 million is in the form
-of joint ventures between our firm and our associates.
-Joint ventures are where we make our money. We only break
-even when our course is purchased. We make a 12% margin on
-the reports we supply to our associates. Our reporting
-capability is so extensive that government agencies, police
-officers, attorneys, credit agencies etc., all come to us
-for reports.
-
-
-Many of our associates already have real estate liens in
-force of between 5 million to over 15 million dollars.
-Legally this means that when the properties are sold or
-refinanced our associate must be paid off. The norm is 10%
-interest compounded annually on unpaid Money Judgments.
-Annual interest on 5 million at 10% translates to
-$500,000.00 annually in interest income, not counting the
-payment of the principal.
-
-Our associates earn half of this amount or $250,000.00 per
-year. This is just for interest, not counting principle
-and not counting the compounding of the interest which can
-add substantial additional income. Typically companies are
-sold for 10 times earnings. Just based on simple interest
-an associate with 5 million in real estate liens could sell
-their business for approximately 2.5 million dollars.
-
-
- 92% of all of our associates work out of the

[20/24] james-project git commit: JAMES-2486 Update nl.jqno.equalsverifier

2018-07-30 Thread btellier
JAMES-2486 Update nl.jqno.equalsverifier


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c4e0467a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c4e0467a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c4e0467a

Branch: refs/heads/master
Commit: c4e0467a822257300e540e1fab1557d7e0055d44
Parents: a28cfed
Author: Gautier DI FOLCO 
Authored: Wed Jul 18 14:41:41 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:23 2018 +0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/c4e0467a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ff10eef..b453fec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1966,7 +1966,7 @@
 
 nl.jqno.equalsverifier
 equalsverifier
-2.4.6
+2.4.8
 
 
 org.apache.activemq


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



[23/24] james-project git commit: JAMES-2486 Update org.jsoup

2018-07-30 Thread btellier
JAMES-2486 Update org.jsoup


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f876c931
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f876c931
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f876c931

Branch: refs/heads/master
Commit: f876c931a2a3b330df018979ed86dcb9152c45dc
Parents: 0a35697
Author: Gautier DI FOLCO 
Authored: Thu Jul 19 14:33:27 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:35 2018 +0700

--
 mailbox/memory/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/f876c931/mailbox/memory/pom.xml
--
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index 99a3cd2..ffee6aa 100644
--- a/mailbox/memory/pom.xml
+++ b/mailbox/memory/pom.xml
@@ -84,7 +84,7 @@
 
 org.jsoup
 jsoup
-1.9.2
+1.11.3
 
 
 org.mockito


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



[15/24] james-project git commit: JAMES-2486 Update dnsjava

2018-07-30 Thread btellier
JAMES-2486 Update dnsjava


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/63dca36d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/63dca36d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/63dca36d

Branch: refs/heads/master
Commit: 63dca36d5baf6d93e5d7a4cd4c0e5a1a918ec34d
Parents: 0c641e7
Author: Gautier DI FOLCO 
Authored: Tue Jul 17 16:53:54 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:23 2018 +0700

--
 pom.xml |  2 +-
 .../main/licensing/app/license-for-binary.txt   | 51 ++--
 server/app/src/main/licensing/app/licensing.xml |  6 +--
 server/app/src/main/licensing/war/LICENSE   | 49 +--
 server/app/src/main/licensing/war/licensing.xml |  4 +-
 .../features/src/main/resources/features.xml|  8 +--
 6 files changed, 59 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/63dca36d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1ba0db8..19bf0fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,7 +608,7 @@
 2.4
 1.1.1
 
-2.1.1
+2.1.8
 4.12
 5.0.2
 1.0.2

http://git-wip-us.apache.org/repos/asf/james-project/blob/63dca36d/server/app/src/main/licensing/app/license-for-binary.txt
--
diff --git a/server/app/src/main/licensing/app/license-for-binary.txt 
b/server/app/src/main/licensing/app/license-for-binary.txt
index aeb5951..682a01f 100644
--- a/server/app/src/main/licensing/app/license-for-binary.txt
+++ b/server/app/src/main/licensing/app/license-for-binary.txt
@@ -372,39 +372,38 @@ Within the lib directory
 from OW2  http://www.ow2.org/ 
 asm-3.1.jar
 
-licensed under the BSD (3-clause) 
http://www.opensource.org/licenses/BSD-3-Clause  (as follows)
+licensed under the BSD (2-clause) 
http://www.opensource.org/licenses/BSD-2-Clause  (as follows)
 
 dnsjava is placed under the BSD license.  Several files are also 
under
 additional licenses; see the individual files for details.
 
-Copyright (c) 1999-2005, Brian Wellington
-All rights reserved. 
-
+Copyright (c) 1998-2011, Brian Wellington.
+All rights reserved.
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions 
are met:
-
-   * Redistributions of source code must retain the above 
copyright notice,
- this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above 
copyright notice,
- this list of conditions and the following disclaimer in the 
documentation
- and/or other materials provided with the distribution.
-   * Neither the name of the dnsjava project nor the names of its 
contributors
- may be used to endorse or promote products derived from this 
software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 
BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 
TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  * Redistributions of source code must retain the above copyright 
notice,
+this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above 
copyright notice,
+this list of conditions and the following disclaimer in the 
documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 
TO, THE
+

[13/24] james-project git commit: JAMES-2493 use log4j only as a slf4j binding in spring app

2018-07-30 Thread btellier
JAMES-2493 use log4j only as a slf4j binding in spring app


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0e7b9cf4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0e7b9cf4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0e7b9cf4

Branch: refs/heads/master
Commit: 0e7b9cf47bfa624b9df512407498e1b561d1f12c
Parents: 2887540
Author: Matthieu Baechler 
Authored: Wed Jul 25 15:18:51 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:22 2018 +0700

--
 .../java/org/apache/james/mpt/DiscardProtocol.java   | 12 ++--
 mpt/pom.xml  |  1 -
 pom.xml  |  6 --
 server/container/spring/pom.xml  |  1 +
 server/protocols/protocols-smtp/pom.xml  | 15 +--
 5 files changed, 12 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/0e7b9cf4/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
--
diff --git a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java 
b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
index d27bacc..2774079 100644
--- a/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
+++ b/mpt/core/src/test/java/org/apache/james/mpt/DiscardProtocol.java
@@ -30,9 +30,9 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.james.util.Port;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Simple RFC 863 
implementation.
@@ -45,7 +45,7 @@ public class DiscardProtocol {
 
 private static final int IDLE_TIMEOUT = 12;
 
-private static final Log LOG = LogFactory.getLog(DiscardProtocol.class);
+private static final Logger LOG = 
LoggerFactory.getLogger(DiscardProtocol.class);
 
 /** Serve on this port */
 private Port port;
@@ -162,7 +162,7 @@ public class DiscardProtocol {
 }
 }
 } catch (Exception e) {
-LOG.fatal("Cannot accept connection", e);
+LOG.error("Cannot accept connection", e);
 abort();
 }
 }
@@ -215,7 +215,7 @@ public class DiscardProtocol {
 public void run() {
 try {
 if (socketChannel == null) {
-LOG.fatal("Socket channel must be set before instance is 
run.");
+LOG.error("Socket channel must be set before instance is 
run.");
 } else {
 try {
 while (!socketChannel.finishConnect()) {
@@ -231,7 +231,7 @@ public class DiscardProtocol {
 }
 
 } catch (Exception e) {
-LOG.fatal("Socket communication failed", e);
+LOG.error("Socket communication failed", e);
 aborted = true;
 
 // Tidy up

http://git-wip-us.apache.org/repos/asf/james-project/blob/0e7b9cf4/mpt/pom.xml
--
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 4adef84..c2f6595 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -59,7 +59,6 @@
 0.94.27
 2.6.0
 4.11
-1.2.16
 3.6.0
 1.7.25
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/0e7b9cf4/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 28e4e91..4d2712f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -615,7 +615,6 @@
 4.12.2
 2.6.0
 1.3.4
-1.2.17
 2.0
 4.9
 3.10.6.Final
@@ -1964,11 +1963,6 @@
 ${junit.version}
 
 
-log4j
-log4j
-${log4j.version}
-
-
 net.javacrumbs.json-unit
 json-unit-assertj
 2.0.0.RC1

http://git-wip-us.apache.org/repos/asf/james-project/blob/0e7b9cf4/server/container/spring/pom.xml
--
diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml
index af76e95..00fc175 100644
--- a/server/container/spring/pom.xml
+++ b/server/container/spring/pom.xml
@@ -104,6 +104,7 @@
 
 log4j
 log4j
+1.2.17
 
 
 org.apache.activemq

http://git-wip-us.apache.org/repos/asf/james-pro

[21/24] james-project git commit: JAMES-2493 replace slf4j-simple with logback

2018-07-30 Thread btellier
JAMES-2493 replace slf4j-simple with logback


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6e1bbee8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6e1bbee8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6e1bbee8

Branch: refs/heads/master
Commit: 6e1bbee81c88c2439f0c1633a082ca162997468e
Parents: 0e7b9cf
Author: Matthieu Baechler 
Authored: Thu Jul 26 14:48:18 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:23 2018 +0700

--
 backends-common/elasticsearch/pom.xml   | 10 +-
 mailbox/api/pom.xml | 10 +-
 mailbox/caching/pom.xml | 10 +-
 mailbox/hbase/pom.xml   | 10 +-
 mailbox/jcr/pom.xml | 10 +-
 mailbox/jpa/pom.xml | 10 +-
 mailbox/maildir/pom.xml | 10 +-
 mailbox/memory/pom.xml  | 10 +-
 mailbox/spring/pom.xml  | 10 +-
 mailbox/store/pom.xml   | 10 +-
 mailbox/tool/pom.xml| 10 +-
 mailbox/zoo-seq-provider/pom.xml|  9 +
 mpt/impl/managesieve/core/pom.xml   |  9 -
 mpt/impl/smtp/cassandra/pom.xml |  8 
 pom.xml |  5 -
 server/container/cli-integration/pom.xml|  6 --
 server/container/cli/pom.xml|  9 -
 server/container/guice/guice-common/pom.xml | 10 +-
 server/container/guice/mailet/pom.xml   | 10 +-
 server/data/data-file/pom.xml   | 10 +-
 server/data/data-hbase/pom.xml  | 10 +-
 server/data/data-jcr/pom.xml| 10 +-
 server/data/data-jdbc/pom.xml   | 10 +-
 server/data/data-jmap/pom.xml   | 10 +-
 server/data/data-jpa/pom.xml| 10 +-
 server/data/data-ldap/pom.xml   | 10 +-
 server/data/data-library/pom.xml| 10 +-
 server/data/data-memory/pom.xml | 10 +-
 server/dns-service/dnsservice-dnsjava/pom.xml   | 10 +-
 server/mailet/mailetcontainer-camel/pom.xml | 10 +-
 server/protocols/jmap/pom.xml   | 16 +---
 server/protocols/webadmin-integration-test/pom.xml  | 10 +-
 server/protocols/webadmin/webadmin-core/pom.xml | 10 +-
 server/protocols/webadmin/webadmin-data/pom.xml | 10 +-
 server/protocols/webadmin/webadmin-mailbox/pom.xml  | 10 +-
 .../webadmin/webadmin-mailrepository/pom.xml| 10 +-
 server/queue/queue-activemq/pom.xml | 10 +-
 server/queue/queue-file/pom.xml | 10 +-
 server/queue/queue-jms/pom.xml  | 10 +-
 39 files changed, 182 insertions(+), 200 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/6e1bbee8/backends-common/elasticsearch/pom.xml
--
diff --git a/backends-common/elasticsearch/pom.xml 
b/backends-common/elasticsearch/pom.xml
index 73dad85..cd5a0bf 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -40,6 +40,11 @@
 test
 
 
+ch.qos.logback
+logback-classic
+test
+
+
 com.github.fge
 throwing-lambdas
 
@@ -73,11 +78,6 @@
 slf4j-api
 
 
-org.slf4j
-slf4j-simple
-test
-
-
 org.testcontainers
 testcontainers
 test

http://git-wip-us.apache.org/repos/asf/james-project/blob/6e1bbee8/mailbox/api/pom.xml
--
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index be9f011..d136e63 100644
--- a/mailbox/api/pom.xml
+++ b/mailbox/api/pom.xml
@@ -50,6 +50,11 @@
 apache-mime4j-dom
 
 
+ch.qos.logback
+logback-classic
+test
+
+
 com.github.fge
 throwing-lambdas
 
@@ -117,11 +122,6 @@
 org.slf4j
 slf4j-api
 
-
-org.slf4j
-slf4j-simple
-test
-
 
 
 

http://git-wip-us

[05/24] james-project git commit: JAMES-2501 Create a SpamAssassin backend project

2018-07-30 Thread btellier
http://git-wip-us.apache.org/repos/asf/james-project/blob/1fd63a7f/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/mock/MockSpamd.java
--
diff --git 
a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/mock/MockSpamd.java
 
b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/mock/MockSpamd.java
new file mode 100644
index 000..d98b5a0
--- /dev/null
+++ 
b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/mock/MockSpamd.java
@@ -0,0 +1,101 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+package org.apache.james.spamassassin.mock;
+
+import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * This class can be used to run a mocked SPAMD daemon
+ */
+public class MockSpamd implements Runnable {
+private static final Logger LOGGER = 
LoggerFactory.getLogger(MockSpamd.class);
+
+/**
+ * Mailcontent which is 100% spam
+ */
+public static final String GTUBE = "-SPAM-";
+public static final String NOT_SPAM = "Spam: False ; 3 / 5";
+public static final String SPAM = "Spam: True ; 1000 / 5";
+
+private ServerSocket socket;
+private boolean isBinded;
+
+public MockSpamd() {
+isBinded = false;
+}
+
+public int getPort() {
+Preconditions.checkState(isBinded, "SpamD mock server is not binded");
+return socket.getLocalPort();
+}
+
+public void bind() throws IOException {
+socket = new ServerSocket(0);
+isBinded = true;
+}
+
+@Override
+public void run() {
+try (ServerSocket serverSocket = socket;
+Socket spamd = serverSocket.accept();
+ BufferedReader in = new BufferedReader(new 
InputStreamReader(spamd.getInputStream()));
+ OutputStream out = spamd.getOutputStream()) {
+
+handleRequest(in, out);
+} catch (IOException e) {
+LOGGER.error("Exception while handling answer", e);
+}
+}
+
+private void handleRequest(BufferedReader in, OutputStream out) throws 
IOException {
+if (isSpam(in)) {
+out.write(SPAM.getBytes());
+} else {
+out.write(NOT_SPAM.getBytes());
+}
+out.flush();
+}
+
+private boolean isSpam(BufferedReader in) throws IOException {
+try {
+return in.lines()
+.anyMatch(line -> line.contains(GTUBE));
+} finally {
+consume(in);
+}
+}
+
+private void consume(BufferedReader in) throws IOException {
+IOUtils.copy(in, NULL_OUTPUT_STREAM, StandardCharsets.UTF_8);
+}
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/1fd63a7f/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/mock/MockSpamdTestRule.java
--
diff --git 
a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/mock/MockSpamdTestRule.java
 
b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/mock/MockSpamdTestRule.java
new file mode 100644
index 000..9712a42
--- /dev/null
+++ 
b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/mock/MockSpamdTestRule.java
@@ -0,0 +1,46 @@
+/
+ * Licensed to the Apache Software Foundati

[10/24] james-project git commit: JAMES-2493 remove duplicate dependencies

2018-07-30 Thread btellier
JAMES-2493 remove duplicate dependencies


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/da982f28
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/da982f28
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/da982f28

Branch: refs/heads/master
Commit: da982f288153ff810c211cfb16e9434f45510b50
Parents: 5f01439
Author: Matthieu Baechler 
Authored: Wed Jul 25 15:01:12 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:22 2018 +0700

--
 pom.xml | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/da982f28/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e090414..28e4e91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -851,12 +851,6 @@
 
 
 ${james.groupId}
-apache-james-mailbox-quota-mailing
-test-jar
-${project.version}
-
-
-${james.groupId}
 apache-james-mailbox-spring
 ${project.version}
 


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



[14/24] james-project git commit: JAMES-2493 try to drop commons-logging

2018-07-30 Thread btellier
JAMES-2493 try to drop commons-logging


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2135e5ee
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2135e5ee
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2135e5ee

Branch: refs/heads/master
Commit: 2135e5ee17ea8ef2d2f3b2e31e1c7d29812d982d
Parents: fa76974
Author: Matthieu Baechler 
Authored: Wed Jul 25 15:00:19 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:22 2018 +0700

--
 backends-common/cassandra/pom.xml   |  4 ++
 mailbox/plugin/quota-mailing/pom.xml|  4 ++
 mailbox/scanning-search/pom.xml |  4 ++
 mailbox/spring/pom.xml  |  4 ++
 mailbox/tika/pom.xml| 10 
 mpt/core/pom.xml|  4 --
 mpt/impl/imap-mailbox/cyrus/pom.xml |  6 ++
 pom.xml | 62 
 protocols/api/pom.xml   |  4 ++
 .../container/guice/es-metric-reporter/pom.xml  |  4 ++
 .../guice/mailbox-plugin-spamassassin/pom.xml   |  4 ++
 server/container/jetty/pom.xml  |  4 ++
 server/container/lifecycle-api/pom.xml  |  4 ++
 server/container/spring/pom.xml |  4 ++
 server/data/data-cassandra/pom.xml  |  4 ++
 server/data/data-file/pom.xml   |  4 ++
 server/data/data-hbase/pom.xml  |  4 ++
 server/data/data-jcr/pom.xml|  4 ++
 server/data/data-jdbc/pom.xml   |  4 ++
 server/data/data-jpa/pom.xml|  4 ++
 server/mailet/mailetcontainer-camel/pom.xml |  4 ++
 server/protocols/fetchmail/pom.xml  |  4 ++
 server/protocols/protocols-imap4/pom.xml|  8 +--
 server/protocols/protocols-library/pom.xml  |  4 ++
 server/protocols/protocols-lmtp/pom.xml |  4 ++
 server/protocols/protocols-managesieve/pom.xml  |  4 ++
 server/protocols/protocols-pop3/pom.xml |  4 ++
 server/protocols/protocols-smtp/pom.xml |  4 ++
 28 files changed, 174 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/2135e5ee/backends-common/cassandra/pom.xml
--
diff --git a/backends-common/cassandra/pom.xml 
b/backends-common/cassandra/pom.xml
index e779451..1b16ea0 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -128,6 +128,10 @@
 test
 
 
+org.slf4j
+jcl-over-slf4j
+
+
 org.testcontainers
 testcontainers
 test

http://git-wip-us.apache.org/repos/asf/james-project/blob/2135e5ee/mailbox/plugin/quota-mailing/pom.xml
--
diff --git a/mailbox/plugin/quota-mailing/pom.xml 
b/mailbox/plugin/quota-mailing/pom.xml
index a947bcb..ec85841 100644
--- a/mailbox/plugin/quota-mailing/pom.xml
+++ b/mailbox/plugin/quota-mailing/pom.xml
@@ -128,6 +128,10 @@
 mockito-core
 test
 
+
+org.slf4j
+jcl-over-slf4j
+
 
 
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/2135e5ee/mailbox/scanning-search/pom.xml
--
diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml
index 3836d38..0fc7b9c 100644
--- a/mailbox/scanning-search/pom.xml
+++ b/mailbox/scanning-search/pom.xml
@@ -85,6 +85,10 @@
 
 
 org.slf4j
+jcl-over-slf4j
+
+
+org.slf4j
 slf4j-api
 
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/2135e5ee/mailbox/spring/pom.xml
--
diff --git a/mailbox/spring/pom.xml b/mailbox/spring/pom.xml
index 1bbe6ac..fd0533b 100644
--- a/mailbox/spring/pom.xml
+++ b/mailbox/spring/pom.xml
@@ -151,6 +151,10 @@
 -->
 
 org.slf4j
+jcl-over-slf4j
+
+
+org.slf4j
 slf4j-api
 
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/2135e5ee/mailbox/tika/pom.xml
--
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index c7f6425..a4936fd 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -84,6 +84,12 @@
 org.apache.httpcomponents
 fluent-hc
 ${apache.httpcomponents.version}
+
+
+commons-logging

[08/24] james-project git commit: JAMES-2501 Create a SpamAssassin backend project

2018-07-30 Thread btellier
JAMES-2501 Create a SpamAssassin backend project


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1fd63a7f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1fd63a7f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1fd63a7f

Branch: refs/heads/master
Commit: 1fd63a7fb42283549ff987ad5fd9deb6136400fe
Parents: a80003a
Author: benwa 
Authored: Thu Jul 26 11:31:53 2018 +0700
Committer: benwa 
Committed: Tue Jul 31 09:24:17 2018 +0700

--
 mailbox/plugin/spamassassin/pom.xml |  10 +
 .../mailbox/spamassassin/SpamAssassin.java  |   2 +-
 mailbox/store/pom.xml   |   4 +
 pom.xml |  12 +
 server/container/util/pom.xml   |  23 -
 .../james/util/scanner/SpamAssassinInvoker.java | 251 ---
 .../james/util/scanner/SpamAssassinResult.java  | 109 -
 .../util/scanner/SpamAssassinExtension.java | 148 ---
 .../util/scanner/SpamAssassinInvokerTest.java   | 147 ---
 .../util/scanner/SpamAssassinResultTest.java|  96 -
 .../util/scanner/SpamAssassinWaitStrategy.java  |  67 ---
 .../resources/docker/spamassassin/Dockerfile|  43 --
 .../resources/docker/spamassassin/bayes_pg.sql  | 119 --
 .../test/resources/docker/spamassassin/local.cf |  97 -
 .../docker/spamassassin/rule-update.sh  |   7 -
 .../test/resources/docker/spamassassin/run.sh   |   9 -
 .../test/resources/docker/spamassassin/spamd.sh |  15 -
 .../util/src/test/resources/eml/spam.eml| 152 ---
 .../src/test/resources/spamassassin_db/ham/ham1 | 113 -
 .../src/test/resources/spamassassin_db/ham/ham2 |  73 
 .../src/test/resources/spamassassin_db/ham/ham3 |  82 
 .../src/test/resources/spamassassin_db/ham/ham4 |  78 
 .../src/test/resources/spamassassin_db/ham/ham5 |  77 
 .../src/test/resources/spamassassin_db/ham/ham6 |  74 
 .../src/test/resources/spamassassin_db/ham/ham7 |  88 
 .../src/test/resources/spamassassin_db/ham/ham8 |  85 
 .../src/test/resources/spamassassin_db/ham/ham9 | 176 
 .../test/resources/spamassassin_db/spam/spam1   | 108 -
 .../test/resources/spamassassin_db/spam/spam2   | 186 
 .../test/resources/spamassassin_db/spam/spam3   | 211 -
 .../test/resources/spamassassin_db/spam/spam4   | 213 --
 .../test/resources/spamassassin_db/spam/spam5   | 161 ---
 .../test/resources/spamassassin_db/spam/spam6   | 423 ---
 .../test/resources/spamassassin_db/spam/spam7   |  71 
 .../test/resources/spamassassin_db/spam/spam8   | 321 --
 .../test/resources/spamassassin_db/spam/spam9   | 142 ---
 .../transport/mailets/SpamAssassinTest.java |   2 +-
 server/mailet/mailets/pom.xml   |  10 +
 .../james/transport/mailets/SpamAssassin.java   |   4 +-
 .../transport/matchers/IsMarkedAsSpam.java  |   2 +-
 .../transport/mailets/SpamAssassinTest.java |   6 +-
 .../cassandra-jmap-integration-testing/pom.xml  |   6 +
 .../jmap/cassandra/CassandraJmapExtension.java  |   2 +-
 .../jmap-integration-testing-common/pom.xml |   6 +
 .../integration/JamesWithSpamAssassin.java  |   2 +-
 .../methods/integration/SpamAssassinModule.java |   4 +-
 .../memory-jmap-integration-testing/pom.xml |   6 +
 .../james/jmap/memory/MemoryJmapExtension.java  |   2 +-
 server/protocols/protocols-smtp/pom.xml |  10 +
 .../fastfail/SpamAssassinHandler.java   |   4 +-
 .../smtpserver/SpamAssassinHandlerTest.java |   6 +-
 .../java/org/apache/james/utils/MockSpamd.java  | 101 -
 .../apache/james/utils/MockSpamdTestRule.java   |  46 --
 third-party/pom.xml |  40 ++
 third-party/spamassassin/pom.xml|  93 
 .../james/spamassassin/SpamAssassinInvoker.java | 251 +++
 .../james/spamassassin/SpamAssassinResult.java  | 109 +
 .../spamassassin/SpamAssassinExtension.java | 148 +++
 .../spamassassin/SpamAssassinInvokerTest.java   | 147 +++
 .../spamassassin/SpamAssassinResultTest.java|  96 +
 .../spamassassin/SpamAssassinWaitStrategy.java  |  67 +++
 .../james/spamassassin/mock/MockSpamd.java  | 101 +
 .../spamassassin/mock/MockSpamdTestRule.java|  46 ++
 .../resources/docker/spamassassin/Dockerfile|  43 ++
 .../resources/docker/spamassassin/bayes_pg.sql  | 119 ++
 .../test/resources/docker/spamassassin/local.cf |  97 +
 .../docker/spamassassin/rule-update.sh  |   7 +
 .../test/resources/docker/spamassassin/run.sh   |   9 +
 .../test/resources/docker/spamassassin/spamd.sh |  15 +
 .../src/test/resources/eml/spam.eml | 152 +++
 .../src/test/resources/spamassassin_db/ham/ham1 | 113 +
 .../src/test/resources/spamassassin_db/ham/ham2 |  73 
 .../src/test/resources/spamassassin_db

[17/24] james-project git commit: JAMES-2486 Remove com.jason-goodwin

2018-07-30 Thread btellier
JAMES-2486 Remove com.jason-goodwin


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a28cfedb
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a28cfedb
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a28cfedb

Branch: refs/heads/master
Commit: a28cfedbc9f879446d31091bc447a42f8bc5b38c
Parents: 6763e32
Author: Gautier DI FOLCO 
Authored: Wed Jul 18 14:18:10 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:23 2018 +0700

--
 pom.xml | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/a28cfedb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8ff2e7f..ff10eef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1722,11 +1722,6 @@
 4.0
 
 
-com.jason-goodwin
-better-monads
-0.4.0
-
-
 com.jayway.awaitility
 awaitility
 1.6.5


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



[16/24] james-project git commit: JAMES-2486 Update com.github.dpaukov

2018-07-30 Thread btellier
JAMES-2486 Update com.github.dpaukov


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6763e322
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6763e322
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6763e322

Branch: refs/heads/master
Commit: 6763e32268ebe59eb47d1bbec5ab00bd3d9b36d8
Parents: 63dca36
Author: Gautier DI FOLCO 
Authored: Tue Jul 17 18:08:53 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:23 2018 +0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/6763e322/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 19bf0fc..8ff2e7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1684,7 +1684,7 @@
 
 com.github.dpaukov
 combinatoricslib3
-3.2.0
+3.3.0
 
 
 com.github.fge


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



[01/24] james-project git commit: JAMES-2493 upgrade logback-elasticsearch-appender to last version

2018-07-30 Thread btellier
Repository: james-project
Updated Branches:
  refs/heads/master 241ce2d0c -> f876c931a


JAMES-2493 upgrade logback-elasticsearch-appender to last 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/fa769746
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fa769746
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fa769746

Branch: refs/heads/master
Commit: fa769746451ea8bc1032f48236df488e38a2ebeb
Parents: 9bd0a1e
Author: Matthieu Baechler 
Authored: Mon Jul 23 15:32:08 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:24:17 2018 +0700

--
 server/container/guice/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/fa769746/server/container/guice/pom.xml
--
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 815f264..be8644d 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -189,7 +189,7 @@
 
 com.internetitem
 logback-elasticsearch-appender
-1.5
+1.6
 
 
 com.fasterxml.jackson.core


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



[19/24] james-project git commit: JAMES-2486 Update com.github.kongchen

2018-07-30 Thread btellier
JAMES-2486 Update com.github.kongchen


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/69bb4dee
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/69bb4dee
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/69bb4dee

Branch: refs/heads/master
Commit: 69bb4deea1263817e46837ccc58a0bcd9a388c9c
Parents: 1c69d37
Author: Gautier DI FOLCO 
Authored: Thu Jul 19 11:37:42 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:23 2018 +0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/69bb4dee/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8180a56..06ab442 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1693,7 +1693,7 @@
 
 com.github.kongchen
 swagger-maven-plugin
-3.1.5
+3.1.7
 
 
 com.github.spullara.mustache.java


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



[22/24] james-project git commit: JAMES-2486 Update com.thoughtworks.qdox:qdox

2018-07-30 Thread btellier
JAMES-2486 Update com.thoughtworks.qdox:qdox


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0c641e74
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0c641e74
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0c641e74

Branch: refs/heads/master
Commit: 0c641e74d8f207b331279e5dfbbd75475d28c376
Parents: 6e1bbee
Author: Gautier DI FOLCO 
Authored: Tue Jul 17 16:38:31 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:23 2018 +0700

--
 .../mailet/DefaultDescriptorsExtractor.java | 22 ++--
 pom.xml |  3 ++-
 2 files changed, 13 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/0c641e74/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
--
diff --git 
a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
 
b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
index 3ffe793..f43ae24 100644
--- 
a/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
+++ 
b/mailet/mailetdocs-maven-plugin/src/main/java/org/apache/james/mailet/DefaultDescriptorsExtractor.java
@@ -25,11 +25,10 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Stream;
 
 import org.apache.james.mailet.MailetMatcherDescriptor.Type;
 import org.apache.mailet.Experimental;
@@ -40,7 +39,8 @@ import 
org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 
-import com.thoughtworks.qdox.JavaDocBuilder;
+import com.thoughtworks.qdox.JavaProjectBuilder;
+import com.thoughtworks.qdox.model.JavaAnnotation;
 import com.thoughtworks.qdox.model.JavaClass;
 
 /**
@@ -67,7 +67,7 @@ public class DefaultDescriptorsExtractor {
 }
 
 public DefaultDescriptorsExtractor extract(MavenProject project, Log log) {
-final JavaClass[] classes = javaClasses(project);
+final Collection classes = javaClasses(project);
 
 final URLClassLoader classLoader = classLoader(project, log);
 logProjectDependencies(project, log);
@@ -182,8 +182,9 @@ public class DefaultDescriptorsExtractor {
 
 
 private boolean isExperimental(JavaClass javaClass) {
-return Stream.of(javaClass.getAnnotations())
-.anyMatch(annotation -> annotation.getType().getValue()
+return javaClass.getAnnotations()
+.stream()
+.anyMatch((JavaAnnotation annotation) -> 
annotation.getType().getCanonicalName()
 .equals(Experimental.class.getName()));
 }
 
@@ -252,8 +253,8 @@ public class DefaultDescriptorsExtractor {
 
 
 @SuppressWarnings("unchecked")
-private JavaClass[] javaClasses(MavenProject project) {
-JavaDocBuilder builder = new JavaDocBuilder();
+private Collection javaClasses(MavenProject project) {
+JavaProjectBuilder builder = new JavaProjectBuilder();
 for (String s : (Iterable) project.getCompileSourceRoots()) {
 builder.addSourceTree(new File(s));
 }
@@ -286,9 +287,8 @@ public class DefaultDescriptorsExtractor {
 
 private List getAllInterfacesQdox(JavaClass javaClass) {
 List res = new LinkedList<>();
-if (javaClass.getImplementedInterfaces() != null) {
-JavaClass[] interfaces = javaClass.getImplementedInterfaces();
-Collections.addAll(res, interfaces);
+if (javaClass.getInterfaces() != null) {
+res.addAll(javaClass.getInterfaces());
 }
 if (javaClass.getSuperJavaClass() != null) {
 res.addAll(getAllInterfacesQdox(javaClass.getSuperJavaClass()));

http://git-wip-us.apache.org/repos/asf/james-project/blob/0c641e74/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 90f543c..1ba0db8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -650,7 +650,8 @@
 3.2.5
 2.2
 3.0
-1.12.1
+2.0-M9
+2.0.2
 1.0.0
 javax.activation
 activation


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



[02/24] james-project git commit: JAMES-2493 upgrade logback to last version

2018-07-30 Thread btellier
JAMES-2493 upgrade logback to last 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/9bd0a1e1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9bd0a1e1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9bd0a1e1

Branch: refs/heads/master
Commit: 9bd0a1e1404569ce77956ddfa8472e71bd3681d6
Parents: 1fd63a7
Author: Matthieu Baechler 
Authored: Mon Jul 23 15:31:01 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:24:17 2018 +0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/9bd0a1e1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 29763a8..38ea4c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -665,7 +665,7 @@
 4.1.0
 2.5.2
 1.9.2
-1.1.11
+1.2.3
 
 
 


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



[11/24] james-project git commit: JAMES-2493 remove duplicate dependencies

2018-07-30 Thread btellier
JAMES-2493 remove duplicate dependencies


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5f014390
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5f014390
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5f014390

Branch: refs/heads/master
Commit: 5f01439096bf063dc7438d45bbe53a9006e92b29
Parents: 2135e5e
Author: Matthieu Baechler 
Authored: Wed Jul 25 15:00:43 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:22 2018 +0700

--
 mailbox/tool/pom.xml | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/5f014390/mailbox/tool/pom.xml
--
diff --git a/mailbox/tool/pom.xml b/mailbox/tool/pom.xml
index b5525d1..3e4fdd2 100644
--- a/mailbox/tool/pom.xml
+++ b/mailbox/tool/pom.xml
@@ -48,12 +48,6 @@
 
 
 ${james.groupId}
-apache-james-mailbox-api
-test-jar
-test
-
-
-${james.groupId}
 apache-james-mailbox-memory
 
 


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



[04/24] james-project git commit: JAMES-2501 Create a SpamAssassin backend project

2018-07-30 Thread btellier
http://git-wip-us.apache.org/repos/asf/james-project/blob/1fd63a7f/third-party/spamassassin/src/test/resources/spamassassin_db/spam/spam4
--
diff --git 
a/third-party/spamassassin/src/test/resources/spamassassin_db/spam/spam4 
b/third-party/spamassassin/src/test/resources/spamassassin_db/spam/spam4
new file mode 100644
index 000..13c3b13
--- /dev/null
+++ b/third-party/spamassassin/src/test/resources/spamassassin_db/spam/spam4
@@ -0,0 +1,213 @@
+From jorda...@mailexcite.com  Mon Jun 24 17:04:20 2002
+Return-Path: merchantsworld2...@juno.com
+Delivery-Date: Thu May 16 11:03:55 2002
+Received: from mandark.labs.netnoteinc.com ([213.105.180.140]) by
+dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id g4GA3qe29480 for
+; Thu, 16 May 2002 11:03:52 +0100
+Received: from webnote.net (mail.webnote.net [193.120.211.219]) by
+mandark.labs.netnoteinc.com (8.11.2/8.11.2) with ESMTP id g4GA3oD28650 for
+; Thu, 16 May 2002 11:03:51 +0100
+Received: from webcust2.hightowertech.com (webcust2.hightowertech.com
+[216.41.166.100]) by webnote.net (8.9.3/8.9.3) with ESMTP id BAA11067 for
+; Thu, 16 May 2002 01:58:00 +0100
+Received: from html ([199.35.236.73]) by webcust2.hightowertech.com  with
+Microsoft SMTPSVC(5.5.1877.197.19); Wed, 15 May 2002 13:50:57 -0700
+From: jorda...@mailexcite.com
+To: ranmo...@swbell.net
+Subject: New Improved Fat Burners, Now With TV Fat Absorbers! Time:7:20:54 AM
+Date: Thu, 31 Jul 1980 07:20:54
+MIME-Version: 1.0
+Message-Id: <0925c5750200f52webcu...@webcust2.hightowertech.com>
+X-Keywords: 
+Content-Type: text/html; charset="DEFAULT"
+
+
+
+
+
+
+*Bonus Fat Absorbers As Seen On TV, Included Free With Purchase Of 2 Or 
More Bottle, $24.95 Value*
+
+
+
+***TAKE $10.00 OFF 2 & 3 MONTH SUPPLY ORDERS, $5.00 OFF 1 MONTH SUPPLY!
+***AND STILL GET YOUR BONUS!  PRICE WILL BE DEDUCTED DURING PROCESSING.
+
+
+***FAT ABSORBERS ARE GREAT FOR THOSE WHO WANT TO LOSE WEIGHT,  BUT CAN'T STAY 
ON A DIET***
+
+
+***OFFER GOOD UNTIL MAY 27, 2002!  FOREIGN ORDERS INCLUDED!
+
+
+
+
+
+LOSE 30 POUNDS  IN 30 DAYS... GUARANTEED!!!
+
+
+
+All Natural Weight-Loss Program, Speeds Up The Metabolism Safely
+Rated #1 In Both Categories of SAFETY & EFFECTIVENESS In
+(THE United States Today)
+
+WE'LL HELP YOU GET THINNER!
+WE'RE GOING TO HELP YOU LOOK GOOD, FEEL GOOD AND TAKE CONTROL IN
+2002
+
+
+
+
+
+
+Why Use Our Amazing Weight Loss Capsules?
+
+*  They act like a natural magnet to attract fat.
+*  Stimulates the body's natural metabolism. 
+*  Controls appetite naturally and makes it easier to
+   eat the right foods consistently.
+*  Reduces craving for sweets.
+*  Aids in the absorption of fat and in overall digestion.
+*  Inhibits bad cholesterol and boosts good cholesterol.
+*  Aids in the process of weight loss and long-term weight management.
+*  Completely safe, UltraTrim New Century contains no banned
+   substances and has no known side effects.
+
+What Makes UltraTrim New Century Unique?
+
+A scientifically designed combination of natural ingredients that
+provide long-term weight management in a safe and effective manner.
+
+*
+Receive A Bonus Supply Of Ultra Trim New Century & A Bottle Of Fat Absorbers 
Listed Above, 
+With Every Order Of 2 Or More Bottles. Offer Good Until May. 27, 2002! 
+*
+
+WE GLADLY SHIP TO ALL FOREIGN COUNTRIES! 
+
+You will be losing by tomorrow!  Don't Wait, visit our web
+page below, and order now!
+
+Email Address:   mailto:ultratrimnow2...@aol.com";>ultratrimnow2...@aol.com
+
+Order by 24 Hour Fax!!!  775-257-6657.
+
+*
+http://www.geocities.com/ultra_weightloss_2002/";>http://www.geocities.com/ultra_weightloss_2002/
+*
+
+This is the easiest, fastest, and most effective way to lose both
+pounds and inches permanently!!!  This weight loss program is
+designed specifically to "boost" weight-loss efforts by assisting
+body metabolism, and helping the body's ability to manage weight.
+A powerful, safe, 30 Day Program.  This is one program you won't
+feel starved on.  Complete program for one amazing low price!
+Program includes: BONUS AMAZING FAT ABSORBER CAPSULES, 30 DAY -
+WEIGHT
+REDUCTION PLAN, PROGRESS REPORT!
+
+SPECIAL BONUS..."FAT ABSORBERS", AS SEEN ON TV
+With every order...AMAZING MELT AWAY FAT ABSORBER CAPSULES with
+directions ( Absolutely Free ) ...With these capsules
+you can eat what you enjoy, without the worry of fat in your diet.
+2 to 3 capsules 15 minutes before eating or snack, and the fat will be
+absorbed and passed through the body without the digestion of fat into
+the body. 
+
+You will be losing by tomorrow!  Don't Wait, visit our web
+page below, and order now!
+
+Email Address:  mailto:ultratrimnow2...@aol.com";>ultratrimnow2...@aol.com
+
+
+Order by 24 Hour Fax!!!  775-257-6657.
+
+*
+http://www.geocities.com/ultra_weightloss_2002/";>http://www.geocities.com/ultra_weightloss_2002/
+*

[12/24] james-project git commit: JAMES-2493 remove ${groupId} deprecated use

2018-07-30 Thread btellier
JAMES-2493 remove  ${groupId} deprecated use


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9389a2ca
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9389a2ca
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9389a2ca

Branch: refs/heads/master
Commit: 9389a2ca9f325f947edd244e4c0d238c7998104e
Parents: da982f2
Author: Matthieu Baechler 
Authored: Wed Jul 25 15:01:00 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:22 2018 +0700

--
 mailet/api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/9389a2ca/mailet/api/pom.xml
--
diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml
index 3c2e4de..18ee831 100644
--- a/mailet/api/pom.xml
+++ b/mailet/api/pom.xml
@@ -37,7 +37,7 @@
 
 
 
-${groupId}
+${project.groupId}
 james-core
 
 


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



[09/24] james-project git commit: JAMES-2493 remove redundant declaration of mime4j version

2018-07-30 Thread btellier
JAMES-2493 remove redundant declaration of 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/28875408
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/28875408
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/28875408

Branch: refs/heads/master
Commit: 288754087e81c08f96b9d5937a492858657d756d
Parents: 9389a2c
Author: Matthieu Baechler 
Authored: Wed Jul 25 15:01:35 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:22 2018 +0700

--
 server/protocols/jmap/pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/28875408/server/protocols/jmap/pom.xml
--
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 444571e..8c948ed 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -78,7 +78,6 @@
 
 ${james.groupId}
 apache-mime4j-core
-${apache-mime4j.version}
 
 
 ${james.groupId}


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



[18/24] james-project git commit: JAMES-2486 Drop joda-time

2018-07-30 Thread btellier
JAMES-2486 Drop joda-time


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1c69d370
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1c69d370
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1c69d370

Branch: refs/heads/master
Commit: 1c69d3708503d7d1481e690f3a378b1c7d58d924
Parents: c4e0467
Author: Gautier DI FOLCO 
Authored: Thu Jul 19 11:31:00 2018 +0200
Committer: benwa 
Committed: Tue Jul 31 09:25:23 2018 +0700

--
 pom.xml |  6 -
 server/data/data-api/pom.xml|  4 ---
 .../sieverepository/api/SieveRepository.java|  4 +--
 .../cassandra/CassandraActiveScriptDAO.java |  4 ++-
 .../cassandra/CassandraSieveRepository.java |  4 +--
 .../sieve/cassandra/model/ActiveScriptInfo.java | 11 
 .../file/SieveDefaultRepository.java|  8 +++---
 .../file/SieveFileRepository.java   |  8 +++---
 .../lib/AbstractSieveRepositoryTest.java|  6 +++--
 server/mailet/mailets/pom.xml   |  4 ---
 .../transport/mailets/jsieve/ActionContext.java |  6 ++---
 .../mailets/jsieve/ResourceLocator.java | 14 +-
 .../mailets/jsieve/SieveMailAdapter.java| 12 -
 .../mailets/jsieve/VacationAction.java  |  8 --
 .../james/transport/mailets/DSNBounceTest.java  | 28 +++-
 .../mailets/delivery/SieveIntegrationTest.java  | 15 +--
 .../redirect/NotifyMailetsMessageTest.java  |  5 ++--
 17 files changed, 72 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/1c69d370/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b453fec..8180a56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -634,7 +634,6 @@
 9.4.7.v20170914
 1.8.1
 3.2.6
-2.9.4
 3.3.0
 2.2.1
 2.2.0
@@ -1949,11 +1948,6 @@
 1.1.0
 
 
-joda-time
-joda-time
-${joda.version}
-
-
 junit
 junit
 ${junit.version}

http://git-wip-us.apache.org/repos/asf/james-project/blob/1c69d370/server/data/data-api/pom.xml
--
diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml
index cfbd462..36f68bd 100644
--- a/server/data/data-api/pom.xml
+++ b/server/data/data-api/pom.xml
@@ -59,10 +59,6 @@
 javax.mail
 
 
-joda-time
-joda-time
-
-
 nl.jqno.equalsverifier
 equalsverifier
 test

http://git-wip-us.apache.org/repos/asf/james-project/blob/1c69d370/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java
--
diff --git 
a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java
 
b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java
index ea50969..f9d8c0b 100644
--- 
a/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java
+++ 
b/server/data/data-api/src/main/java/org/apache/james/sieverepository/api/SieveRepository.java
@@ -21,6 +21,7 @@
 package org.apache.james.sieverepository.api;
 
 import java.io.InputStream;
+import java.time.ZonedDateTime;
 import java.util.List;
 
 import org.apache.james.core.User;
@@ -29,7 +30,6 @@ import 
org.apache.james.sieverepository.api.exception.IsActiveException;
 import org.apache.james.sieverepository.api.exception.QuotaExceededException;
 import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
 import org.apache.james.sieverepository.api.exception.StorageException;
-import org.joda.time.DateTime;
 
 
 /**
@@ -56,7 +56,7 @@ public interface SieveRepository extends SieveQuotaRepository 
{
 
 List listScripts(User user) throws StorageException;
 
-DateTime getActivationDateForActiveScript(User user) throws 
StorageException, ScriptNotFoundException;
+ZonedDateTime getActivationDateForActiveScript(User user) throws 
StorageException, ScriptNotFoundException;
 
 InputStream getActive(User user) throws ScriptNotFoundException, 
StorageException;
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/1c69d370/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraActiveScriptDAO.java
--
diff --git 
a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/Cassa

[jira] [Closed] (JAMES-2505) use docker-java built-in support for tmpfs

2018-07-30 Thread Matthieu Baechler (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2505?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Matthieu Baechler closed JAMES-2505.

   Resolution: Fixed
Fix Version/s: 3.2.0

merged

> use docker-java built-in support for tmpfs
> --
>
> Key: JAMES-2505
> URL: https://issues.apache.org/jira/browse/JAMES-2505
> Project: James Server
>  Issue Type: Task
>  Components: integrationTests
>Affects Versions: 3.1.0
>Reporter: Matthieu Baechler
>Priority: Major
> Fix For: 3.2.0
>
>
> Now that tmpfs support is merged into docker-java (see 
> https://github.com/docker-java/docker-java/pull/1022 ) and that testcontainer 
> has an up-to-date version of docker-java, we should get rid of manual TmpFs 
> volume handling in our docker tests.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



james-project git commit: JAMES-2505 remove manual TmpFs management

2018-07-30 Thread matthieu
Repository: james-project
Updated Branches:
  refs/heads/master 510f23421 -> 241ce2d0c


JAMES-2505 remove manual TmpFs management


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/241ce2d0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/241ce2d0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/241ce2d0

Branch: refs/heads/master
Commit: 241ce2d0c14113eebffc3092043fd67ea7325bee
Parents: 510f234
Author: Matthieu Baechler 
Authored: Fri Jul 27 17:39:06 2018 +0200
Committer: Matthieu Baechler 
Committed: Mon Jul 30 13:46:42 2018 +0200

--
 .../backends/cassandra/DockerCassandraRule.java | 34 ++--
 1 file changed, 3 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/241ce2d0/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
--
diff --git 
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
 
b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
index b31024b..6f634dd 100644
--- 
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
+++ 
b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
@@ -19,7 +19,6 @@
 
 package org.apache.james.backends.cassandra;
 
-import org.apache.commons.text.RandomStringGenerator;
 import org.apache.james.util.Host;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -33,11 +32,6 @@ import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.CreateVolumeCmd;
-import com.github.dockerjava.api.command.RemoveVolumeCmd;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.Binds;
-import com.github.dockerjava.api.model.Volume;
 
 
 public class DockerCassandraRule implements TestRule {
@@ -52,22 +46,10 @@ public class DockerCassandraRule implements TestRule {
 
 private final GenericContainer cassandraContainer;
 private final DockerClient client;
-private final CreateVolumeCmd createTmpsFsCmd;
-private final RemoveVolumeCmd deleteTmpsFsCmd;
 
 @SuppressWarnings("resource")
 public DockerCassandraRule() {
-String tmpFsName = "cassandraData" + new 
RandomStringGenerator.Builder().withinRange('a', 'z').build().generate(10);
 client = DockerClientFactory.instance().client();
-createTmpsFsCmd = client.createVolumeCmd()
-.withName(tmpFsName)
-.withDriver("local")
-.withDriverOpts(
-ImmutableMap.of(
-"type", "tmpfs",
-"device", "tmpfs",
-"o", "size=100m"));
-deleteTmpsFsCmd = client.removeVolumeCmd(tmpFsName);
 boolean deleteOnExit = false;
 cassandraContainer = new GenericContainer<>(
 new ImageFromDockerfile("cassandra_2_2_12", deleteOnExit)
@@ -92,8 +74,8 @@ public class DockerCassandraRule implements TestRule {
 .run("sed -i -e 
\"s/key_cache_size_in_mb:/key_cache_size_in_mb: 256/\" " + CASSANDRA_YAML)
 .run("sed -i -e \"s/row_cache_size_in_mb: 
0/row_cache_size_in_mb: 512/\" " + CASSANDRA_YAML)
 .build()))
-.withCreateContainerCmdModifier(cmd -> 
cmd.getHostConfig().withBinds(new Binds(new Bind(tmpFsName, new 
Volume("/var/lib/cassandra")
 .withCreateContainerCmdModifier(cmd -> cmd.withMemory(2000 * 1024 
* 1024L))
+.withCreateContainerCmdModifier(cmd -> 
cmd.getHostConfig().withTmpFs(ImmutableMap.of("/var/lib/cassandra", 
"rw,noexec,nosuid,size=100m")))
 .withExposedPorts(CASSANDRA_PORT)
 .withLogConsumer(this::displayDockerLog);
 cassandraContainer
@@ -109,27 +91,17 @@ public class DockerCassandraRule implements TestRule {
 return new Statement() {
 @Override
 public void evaluate() throws Throwable {
-try {
-createTmpsFsCmd.exec();
-cassandraContainer.apply(base, description).evaluate();
-} finally {
-deleteTmpsFsCmd.exec();
-}
+cassandraContainer.apply(base, description).evaluate();
 }
 };
 }
 
 public void start() {
-createTmpsFsCmd.exec();
 cassandraContainer.start();
 }
 
 public void stop() {
-tr

[jira] [Resolved] (JAMES-2503) Upgrade guava

2018-07-30 Thread Tellier Benoit (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2503?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit resolved JAMES-2503.
---
   Resolution: Fixed
Fix Version/s: 3.2.0

https://github.com/linagora/james-project/pull/1607 solved the issue

> Upgrade guava
> -
>
> Key: JAMES-2503
> URL: https://issues.apache.org/jira/browse/JAMES-2503
> Project: James Server
>  Issue Type: Improvement
>Reporter: Trần Tiến Đức
>Priority: Trivial
> Fix For: 3.2.0
>
>
>  
> {code:java}
> com.google.guava:guava  11.0.2 -> 25.1-jre MBA 
> [general purpose] // requires to drop hbase-server dep and use container 
> based tests instead or maybe shadowing 
> com.google.guava:guava .. 13.0 -> 25.1-jre MBA 
> [general purpose] // deprecation on guava are _fast_, we may need quite some 
> work and/or shadowing 
> com.google.guava:guava .. 18.0 -> 25.1-jre MBA 
> [general purpose] 
> com.google.guava:guava .. 19.0 -> 25.1-jre MBA 
> [general purpose]{code}
>  



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Closed] (JAMES-2503) Upgrade guava

2018-07-30 Thread Tellier Benoit (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2503?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit closed JAMES-2503.
-

> Upgrade guava
> -
>
> Key: JAMES-2503
> URL: https://issues.apache.org/jira/browse/JAMES-2503
> Project: James Server
>  Issue Type: Improvement
>Reporter: Trần Tiến Đức
>Priority: Trivial
> Fix For: 3.2.0
>
>
>  
> {code:java}
> com.google.guava:guava  11.0.2 -> 25.1-jre MBA 
> [general purpose] // requires to drop hbase-server dep and use container 
> based tests instead or maybe shadowing 
> com.google.guava:guava .. 13.0 -> 25.1-jre MBA 
> [general purpose] // deprecation on guava are _fast_, we may need quite some 
> work and/or shadowing 
> com.google.guava:guava .. 18.0 -> 25.1-jre MBA 
> [general purpose] 
> com.google.guava:guava .. 19.0 -> 25.1-jre MBA 
> [general purpose]{code}
>  



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Reopened] (JAMES-2481) Upgrade apache.httpcomponents

2018-07-30 Thread Tellier Benoit (JIRA)


 [ 
https://issues.apache.org/jira/browse/JAMES-2481?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tellier Benoit reopened JAMES-2481:
---

HTTP javax servlet API upgrade lead to incompatible version used between 
lonbook in JMAP and webadmin(relying on spark-java).

Test suite did not caught the issue, we reverted the commits as it lead to a 
broken JMAP server in runtime.

> Upgrade apache.httpcomponents
> -
>
> Key: JAMES-2481
> URL: https://issues.apache.org/jira/browse/JAMES-2481
> Project: James Server
>  Issue Type: Improvement
>Reporter: Trần Tiến Đức
>Priority: Trivial
> Fix For: 3.2.0
>
>
> {code:java}
> org.apache.httpcomponents:fluent-hc ... 4.5.3 -> 4.5.6 MBA 
> [http] should be updated
> org.apache.httpcomponents:httpclient-osgi . 4.5.1 -> 4.5.6 MBA 
> [http] should be updated{code}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[4/5] james-project git commit: Revert "JAMES-2481 Upgrade Jetty to 9.4.11.v20180605"

2018-07-30 Thread btellier
Revert "JAMES-2481 Upgrade Jetty to 9.4.11.v20180605"

This reverts commit 1cce5626d9b990836521d6c739717b7fd3980cd7.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/510f2342
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/510f2342
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/510f2342

Branch: refs/heads/master
Commit: 510f2342122e6700a909ded24986852057066518
Parents: 04d243c
Author: Matthieu Baechler 
Authored: Mon Jul 30 08:28:44 2018 +0200
Committer: benwa 
Committed: Mon Jul 30 18:22:27 2018 +0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/510f2342/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 13e4d1b..7d32655 100644
--- a/pom.xml
+++ b/pom.xml
@@ -631,7 +631,7 @@
 
2.3.0
 1.6.4
 2.9.6
-9.4.11.v20180605
+9.4.7.v20170914
 1.8.1
 3.2.6
 2.9.4


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



[5/5] james-project git commit: Revert "JAMES-2481 Replace Spark by Jetty in tests"

2018-07-30 Thread btellier
Revert "JAMES-2481 Replace Spark by Jetty in tests"

This reverts commit 2f3aaaeb83046c68058ff37fb5c380863c461da6.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7cf5cac1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7cf5cac1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7cf5cac1

Branch: refs/heads/master
Commit: 7cf5cac1f8e2d4da048a81b1c94d05d9feb67187
Parents: 6d3e177
Author: Matthieu Baechler 
Authored: Mon Jul 30 08:26:22 2018 +0200
Committer: benwa 
Committed: Mon Jul 30 18:22:27 2018 +0700

--
 server/container/core/pom.xml   | 20 ++-
 server/container/filesystem-api/pom.xml | 19 +-
 .../filesystem/api/AbstractFileSystemTest.java  | 63 ++--
 server/container/spring/pom.xml |  5 ++
 4 files changed, 30 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/7cf5cac1/server/container/core/pom.xml
--
diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml
index 4771b55..6f64917 100644
--- a/server/container/core/pom.xml
+++ b/server/container/core/pom.xml
@@ -82,6 +82,11 @@
 guava
 
 
+com.sparkjava
+spark-core
+test
+
+
 com.sun.mail
 javax.mail
 
@@ -104,21 +109,6 @@
 test
 
 
-org.eclipse.jetty
-jetty-http
-test
-
-
-org.eclipse.jetty
-jetty-server
-test
-
-
-org.eclipse.jetty
-jetty-servlet
-test
-
-
 pl.pragmatists
 JUnitParams
 test

http://git-wip-us.apache.org/repos/asf/james-project/blob/7cf5cac1/server/container/filesystem-api/pom.xml
--
diff --git a/server/container/filesystem-api/pom.xml 
b/server/container/filesystem-api/pom.xml
index e92f358..225ff0d 100644
--- a/server/container/filesystem-api/pom.xml
+++ b/server/container/filesystem-api/pom.xml
@@ -34,8 +34,8 @@
 
 
 
-com.google.guava
-guava
+com.sparkjava
+spark-core
 test
 
 
@@ -57,21 +57,6 @@
 test
 
 
-org.eclipse.jetty
-jetty-http
-test
-
-
-org.eclipse.jetty
-jetty-server
-test
-
-
-org.eclipse.jetty
-jetty-servlet
-test
-
-
 pl.pragmatists
 JUnitParams
 test

http://git-wip-us.apache.org/repos/asf/james-project/blob/7cf5cac1/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
--
diff --git 
a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
 
b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
index e8d2c54..cc9f420 100644
--- 
a/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
+++ 
b/server/container/filesystem-api/src/test/java/org/apache/james/filesystem/api/AbstractFileSystemTest.java
@@ -27,17 +27,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -45,10 +36,11 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 
-import com.google.common.base.Strings;
-
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
+import spark.Request;
+import spark.Response;
+import spark.Service;
 
 @RunWith(JUnitParamsRunner.class)
 public abstract class AbstractFileSystemTest {
@@ -62,47 +54,24 @@ public abstract class AbstractFileSystemTest {
 
 protected FileSystem fileSystem;
 
-private Server httpServer;
+private Service httpServer;
 private File rootD

[1/5] james-project git commit: JAMES-2503 Upgrade generic guava

2018-07-30 Thread btellier
Repository: james-project
Updated Branches:
  refs/heads/master 24a755865 -> 510f23421


JAMES-2503 Upgrade generic guava


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6d3e177b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6d3e177b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6d3e177b

Branch: refs/heads/master
Commit: 6d3e177bf2914c478524bc729aa50f37e9e36628
Parents: 24a7558
Author: duc 
Authored: Fri Jul 27 11:47:07 2018 +0700
Committer: benwa 
Committed: Mon Jul 30 18:22:26 2018 +0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/6d3e177b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e37be8a..5c5be3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -637,7 +637,7 @@
 3.3.0
 2.2.1
 2.2.0
-19.0
+25.1-jre
 
 1.0.0
 0.1


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



[3/5] james-project git commit: Revert "JAMES-2481 Upgrade Javax HTTP related APIs"

2018-07-30 Thread btellier
Revert "JAMES-2481 Upgrade Javax HTTP related APIs"

This reverts commit 622c540e5a32d1d7978f8fe41d05d5242347084e.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/04d243c0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/04d243c0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/04d243c0

Branch: refs/heads/master
Commit: 04d243c0da3ffccaabaacc555c90931814e1115e
Parents: 8598891
Author: Matthieu Baechler 
Authored: Mon Jul 30 08:26:24 2018 +0200
Committer: benwa 
Committed: Mon Jul 30 18:22:27 2018 +0700

--
 pom.xml | 12 +++-
 server/protocols/webadmin/webadmin-core/pom.xml |  7 +--
 2 files changed, 12 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/04d243c0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e305604..13e4d1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,6 +604,7 @@
 
1.1
 1.8.3
 1.7.25
+2.4
 1.1.1
 
 2.1.1
@@ -1827,6 +1828,10 @@
 log4j
 log4j
 
+
+javax.servlet
+servlet-api
+
 
 
 
@@ -1902,7 +1907,12 @@
 
 javax.servlet
 javax.servlet-api
-4.0.1
+3.1.0
+
+
+javax.servlet
+servlet-api
+${servlet-api.version}
 
 
 jmock

http://git-wip-us.apache.org/repos/asf/james-project/blob/04d243c0/server/protocols/webadmin/webadmin-core/pom.xml
--
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml 
b/server/protocols/webadmin/webadmin-core/pom.xml
index 45edf66..b94ba11 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -101,14 +101,9 @@
 javax.inject
 
 
-javax.servlet
-servlet-api
-2.4
-
-
 javax.ws.rs
 javax.ws.rs-api
-2.1
+2.0.1
 
 
 junit


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



[2/5] james-project git commit: Revert "JAMES-2481 Upgrade Spark Java to 2.7.2"

2018-07-30 Thread btellier
Revert "JAMES-2481 Upgrade Spark Java to 2.7.2"

This reverts commit aaa2d08a7698fddafcbe308ee7f2da225fd43f21.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8598891c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8598891c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8598891c

Branch: refs/heads/master
Commit: 8598891c7a4ed92f6a0df3ff7c5395ddee741058
Parents: 7cf5cac
Author: Matthieu Baechler 
Authored: Mon Jul 30 08:26:24 2018 +0200
Committer: benwa 
Committed: Mon Jul 30 18:22:27 2018 +0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/8598891c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5c5be3a..e305604 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1735,7 +1735,7 @@
 
 com.sparkjava
 spark-core
-2.7.2
+2.6.0
 
 
 com.sun.mail


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



[jira] [Created] (JAMES-2507) Release James 3.1.0

2018-07-30 Thread Tellier Benoit (JIRA)
Tellier Benoit created JAMES-2507:
-

 Summary: Release James 3.1.0
 Key: JAMES-2507
 URL: https://issues.apache.org/jira/browse/JAMES-2507
 Project: James Server
  Issue Type: Task
Affects Versions: 3.1.0
Reporter: Tellier Benoit
 Fix For: 3.1.0


The goal of this task is to go the end of the 3.1.0 release process.

You will:

 - Compile and release maven modules
 - Upload downloadable artefacts, including guice projects

Note that guice installation instructions are contained in README, that points 
to outdated website page.  We need to update these website page to assume the 
artefact is downloadable, and instructions up to date.

You will additionnaly prepare communication materials, including:

 - A blog post
 - A mail for announcing the release at the APache level
 - A mail to james users
 - A tweet

Finally, docker images should be tagged and updated.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



svn commit: r28428 - /release/james/server/

2018-07-30 Thread btellier
Author: btellier
Date: Mon Jul 30 10:03:05 2018
New Revision: 28428

Log:
Upload proposed artefact for 3.1.0 release

Added:
release/james/server/james-cassandra-guice-3.1.0.zip   (with props)
release/james/server/james-cassandra-guice-3.1.0.zip.asc   (with props)
release/james/server/james-cassandra-guice-3.1.0.zip.sha1
release/james/server/james-cassandra-ldap-guice-3.1.0.zip   (with props)
release/james/server/james-cassandra-ldap-guice-3.1.0.zip.asc   (with props)
release/james/server/james-cassandra-ldap-guice-3.1.0.zip.sha1
release/james/server/james-jpa-guice-3.1.0.zip   (with props)
release/james/server/james-jpa-guice-3.1.0.zip.asc   (with props)
release/james/server/james-jpa-guice-3.1.0.zip.sha1
release/james/server/james-jpa-smtp-guice-3.1.0.zip   (with props)
release/james/server/james-jpa-smtp-guice-3.1.0.zip.asc   (with props)
release/james/server/james-jpa-smtp-guice-3.1.0.zip.sha1
release/james/server/james-server-app-3.1.0-app.zip   (with props)
release/james/server/james-server-app-3.1.0-app.zip.asc   (with props)
release/james/server/james-server-app-3.1.0-app.zip.sha1
release/james/server/james-server-sources-3.1.0.zip   (with props)
release/james/server/james-server-sources-3.1.0.zip.asc   (with props)
release/james/server/james-server-sources-3.1.0.zip.sha1
Modified:
release/james/server/james-server-sources-3.0.1.zip
release/james/server/james-server-sources-3.0.1.zip.asc
release/james/server/james-server-sources-3.0.1.zip.sha1

Added: release/james/server/james-cassandra-guice-3.1.0.zip
==
Binary file - no diff available.

Propchange: release/james/server/james-cassandra-guice-3.1.0.zip
--
svn:mime-type = application/zip

Added: release/james/server/james-cassandra-guice-3.1.0.zip.asc
==
Binary file - no diff available.

Propchange: release/james/server/james-cassandra-guice-3.1.0.zip.asc
--
svn:mime-type = application/octet-stream

Added: release/james/server/james-cassandra-guice-3.1.0.zip.sha1
==
--- release/james/server/james-cassandra-guice-3.1.0.zip.sha1 (added)
+++ release/james/server/james-cassandra-guice-3.1.0.zip.sha1 Mon Jul 30 
10:03:05 2018
@@ -0,0 +1 @@
+947e5d4c45fb7028862971c5226fd9166f03527b  james-cassandra-guice-3.1.0.zip

Added: release/james/server/james-cassandra-ldap-guice-3.1.0.zip
==
Binary file - no diff available.

Propchange: release/james/server/james-cassandra-ldap-guice-3.1.0.zip
--
svn:mime-type = application/zip

Added: release/james/server/james-cassandra-ldap-guice-3.1.0.zip.asc
==
Binary file - no diff available.

Propchange: release/james/server/james-cassandra-ldap-guice-3.1.0.zip.asc
--
svn:mime-type = application/octet-stream

Added: release/james/server/james-cassandra-ldap-guice-3.1.0.zip.sha1
==
--- release/james/server/james-cassandra-ldap-guice-3.1.0.zip.sha1 (added)
+++ release/james/server/james-cassandra-ldap-guice-3.1.0.zip.sha1 Mon Jul 30 
10:03:05 2018
@@ -0,0 +1 @@
+49b06a3d82b2a7967b8d321bd146f7649b21e60e  james-cassandra-ldap-guice-3.1.0.zip

Added: release/james/server/james-jpa-guice-3.1.0.zip
==
Binary file - no diff available.

Propchange: release/james/server/james-jpa-guice-3.1.0.zip
--
svn:mime-type = application/zip

Added: release/james/server/james-jpa-guice-3.1.0.zip.asc
==
Binary file - no diff available.

Propchange: release/james/server/james-jpa-guice-3.1.0.zip.asc
--
svn:mime-type = application/octet-stream

Added: release/james/server/james-jpa-guice-3.1.0.zip.sha1
==
--- release/james/server/james-jpa-guice-3.1.0.zip.sha1 (added)
+++ release/james/server/james-jpa-guice-3.1.0.zip.sha1 Mon Jul 30 10:03:05 2018
@@ -0,0 +1 @@
+605c980afcf0e51f68e7668fd2a349c829690983  james-jpa-guice-3.1.0.zip

Added: release/james/server/james-jpa-smtp-guice-3.1.0.zip
=

james-project git commit: checkstyle fixes

2018-07-30 Thread matthieu
Repository: james-project
Updated Branches:
  refs/heads/master 2d6d69eca -> 24a755865


checkstyle fixes


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/24a75586
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/24a75586
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/24a75586

Branch: refs/heads/master
Commit: 24a755865ac3410eff79aaea291aa7d03650d280
Parents: 2d6d69e
Author: Matthieu Baechler 
Authored: Mon Jul 30 10:33:57 2018 +0200
Committer: Matthieu Baechler 
Committed: Mon Jul 30 10:33:57 2018 +0200

--
 .../james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java  | 1 +
 .../mailbox/cassandra/user/CassandraSubscriptionMapperTest.java| 1 +
 .../james/mailbox/elasticsearch/json/IndexableMessageTest.java | 2 +-
 .../mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java | 2 +-
 .../java/org/apache/james/mailbox/jpa/mail/JPAMapperProvider.java  | 1 -
 .../org/apache/james/transport/mailets/GroupMappingRelayTest.java  | 1 -
 .../java/org/apache/james/transport/mailets/GroupMappingTest.java  | 2 --
 7 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/james-project/blob/24a75586/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java
--
diff --git 
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java
 
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java
index 1488a0b..db054cd 100644
--- 
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java
+++ 
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxPathDAOTest.java
@@ -58,6 +58,7 @@ public abstract class CassandraMailboxPathDAOTest {
 protected CassandraMailboxPathDAO testee;
 
 abstract CassandraMailboxPathDAO testee();
+
 @BeforeClass
 public static void setUpClass() {
 cassandra = CassandraCluster.create(CassandraMailboxModule.MODULE, 
cassandraServer.getHost());

http://git-wip-us.apache.org/repos/asf/james-project/blob/24a75586/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
--
diff --git 
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
 
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
index 34fb043..f3c127b 100644
--- 
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
+++ 
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/user/CassandraSubscriptionMapperTest.java
@@ -39,6 +39,7 @@ public class CassandraSubscriptionMapperTest extends 
SubscriptionMapperTest {
 public static void setUpClass() {
 cassandra = 
CassandraCluster.create(CassandraSubscriptionModule.MODULE, 
cassandraServer.getHost());
 }
+
 @Override
 protected SubscriptionMapper createSubscriptionMapper() {
 return new CassandraSubscriptionMapper(cassandra.getConf(), 
CassandraUtils.WITH_DEFAULT_CONFIGURATION);

http://git-wip-us.apache.org/repos/asf/james-project/blob/24a75586/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
--
diff --git 
a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
 
b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
index 67535ff..60390c9 100644
--- 
a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
+++ 
b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/IndexableMessageTest.java
@@ -33,7 +33,6 @@ import javax.mail.Flags;
 
 import org.apache.james.mailbox.MessageUid;
 import org.apache.james.mailbox.elasticsearch.IndexAttachments;
-import org.apache.james.mailbox.tika.TikaContainerSingletonRule;
 import org.apache.james.mailbox.extractor.ParsedContent;
 import org.apache.james.mailbox.extractor.TextExtractor;
 import org.apache.james.mailbox.inmemory.InMemoryMessageId;
@@ -45,6 +44,7 @@ import 
org.apache.james.mailbox.store.mail.model.MailboxMessage;
 import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
 import org.apache.james.mailbox.store.mail.model.impl.SimpleProperty;
 import org.apache.james.mailbox.tika.TikaConf

[jira] [Created] (JAMES-2506) Upgrade mock libraries

2018-07-30 Thread JIRA
Trần Tiến Đức created JAMES-2506:


 Summary: Upgrade mock libraries
 Key: JAMES-2506
 URL: https://issues.apache.org/jira/browse/JAMES-2506
 Project: James Server
  Issue Type: Improvement
Reporter: Trần Tiến Đức


 
{code:java}
jmock:jmock . 1.1.0 -> 20031129.200437 MBA 
[mocking] changed to org.jmock for 2.x // could we migrate everything to 
mockito ? summer work? 

org.easymock:easymock ... 3.3.1 -> 3.6 MBA 
[mock] used only once, should be replaced by 

mockito org.jmock:jmock ... 2.6.0 -> 2.8.4 
MBA [mocking] could we migrate everything to mockito ? 

org.jmock:jmock-junit4  2.6.0 -> 2.8.4 MBA 
[mocking] could we migrate everything to mockito ? 

org.mockito:mockito-core . 1.9.0 -> 2.19.1 MBA 
[mock] 2.19.1 // probably some work but well documented 
(https://github.com/mockito/mockito/wiki/What%27s-new-in-Mockito-2), java8 and 
junit5 !{code}
 



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Commented] (JAMES-2500) Upgrade cassandra driver & testcontainers & docker-client

2018-07-30 Thread Tellier Benoit (JIRA)


[ 
https://issues.apache.org/jira/browse/JAMES-2500?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16561553#comment-16561553
 ] 

Tellier Benoit commented on JAMES-2500:
---

https://github.com/linagora/james-project/pull/1604 solved a build instability

> Upgrade cassandra driver & testcontainers & docker-client
> -
>
> Key: JAMES-2500
> URL: https://issues.apache.org/jira/browse/JAMES-2500
> Project: James Server
>  Issue Type: Improvement
>Reporter: Trần Tiến Đức
>Priority: Minor
> Fix For: 3.2.0
>
>
>  
> {code:java}
> com.datastax.cassandra:cassandra-driver-core .. 3.5.0 -> 3.5.1 GDF 
> [cassandra] 3.5.1 
> org.cassandraunit:cassandra-unit .. 2.1.9.2 -> 3.5.0.1 MBA 
> [cassandra] should be dropped entirely 
> org.testcontainers:mariadb  1.7.3 -> 1.8.1 MBA 
> [test]  
> org.testcontainers:testcontainers . 1.1.7 -> 1.8.1 MBA 
> [test]  
> org.testcontainers:testcontainers . 1.7.3 -> 1.8.1 MBA 
> [test] 1.8.1 would be great to use cassandra support but rabbitmq tests were 
> not happy last time we tried migration 
> com.spotify:docker-client ... 3.5.10 -> 8.11.7 GDF 
> [docker] 8.11.7 // Will hurt // we may have a conflict with 
> testcontainer{code}
>  



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Commented] (JAMES-2498) JDBCMailRepository should not materialize entities for counting them.

2018-07-30 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/JAMES-2498?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16561551#comment-16561551
 ] 

ASF GitHub Bot commented on JAMES-2498:
---

Github user nstdio closed the pull request at:

https://github.com/apache/james-project/pull/132


> JDBCMailRepository should not materialize entities for counting them.
> -
>
> Key: JAMES-2498
> URL: https://issues.apache.org/jira/browse/JAMES-2498
> Project: James Server
>  Issue Type: Improvement
>  Components: JDBC, MailStore & MailRepository
>Affects Versions: master, 3.2.0
>Reporter: Edgar Asatryan
>Priority: Major
>  Labels: performance
> Fix For: 3.2.0
>
>
> *JDBCMailRepository* can significantly save time and memory when 
> *JDBCMailRepository#size()* is invoked by executing SQL query.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Commented] (JAMES-2303) JDBC Mail repository do not persist Per recipient headers

2018-07-30 Thread ASF GitHub Bot (JIRA)


[ 
https://issues.apache.org/jira/browse/JAMES-2303?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16561550#comment-16561550
 ] 

ASF GitHub Bot commented on JAMES-2303:
---

Github user nstdio closed the pull request at:

https://github.com/apache/james-project/pull/131


> JDBC Mail repository do not persist Per recipient headers
> -
>
> Key: JAMES-2303
> URL: https://issues.apache.org/jira/browse/JAMES-2303
> Project: James Server
>  Issue Type: Bug
>  Components: JDBC, MailStore & MailRepository
>Affects Versions: 3.0.0, master, 3.0.1
>Reporter: Tellier Benoit
>Priority: Major
> Fix For: 3.2.0
>
>
> Per recipient headers are not persisted by JDBC Mail repository.
> See related tests



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Commented] (JAMES-2470) Cassandra testing strategy

2018-07-30 Thread Tellier Benoit (JIRA)


[ 
https://issues.apache.org/jira/browse/JAMES-2470?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16561548#comment-16561548
 ] 

Tellier Benoit commented on JAMES-2470:
---

https://github.com/linagora/james-project/pull/1597 Applied static singleton 
approach to tika & hbase

> Cassandra testing strategy
> --
>
> Key: JAMES-2470
> URL: https://issues.apache.org/jira/browse/JAMES-2470
> Project: James Server
>  Issue Type: Improvement
>  Components: Build System, cassandra, tests
>Reporter: Tellier Benoit
>Priority: Major
>
> Currently, Cassandra testing is really long due to table creation on a 
> per-test bases (on different keyspace).
> Reusing the same keyspace, with a table cleanup strategy (registered resource 
> cleaner probe) allow some significant test time reduction.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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



[jira] [Commented] (JAMES-2492) Make james-karaf an external project

2018-07-30 Thread Tellier Benoit (JIRA)


[ 
https://issues.apache.org/jira/browse/JAMES-2492?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16561547#comment-16561547
 ] 

Tellier Benoit commented on JAMES-2492:
---

https://github.com/linagora/james-project/pull/1609 cut off maven links

> Make james-karaf an external project
> 
>
> Key: JAMES-2492
> URL: https://issues.apache.org/jira/browse/JAMES-2492
> Project: James Server
>  Issue Type: New Feature
>Reporter: Antoine Duprat
>Priority: Major
>
> James Karaf is apart of the James itself, we should make it an external 
> project.
> The first step should be to cut off the maven links.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

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