From 069a61e5c8159829b7dd7c31d5a4314ce2414c71 Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Mon, 30 Jul 2018 17:17:32 +0700
Subject: [PATCH 01/12] JAMES-2507 Webasite should advertise version 3.1.0

---
 src/homepage/howTo/mail-processing.html |  2 +-
 src/homepage/index.html                 |  4 ++--
 src/site/markdown/mailet/quickstart.md  |  2 +-
 src/site/xdoc/server/features.xml       |  2 +-
 src/site/xdoc/server/index.xml          | 12 ++++++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/homepage/howTo/mail-processing.html b/src/homepage/howTo/mail-processing.html
index ba09342a68f..d44c2899f42 100644
--- a/src/homepage/howTo/mail-processing.html
+++ b/src/homepage/howTo/mail-processing.html
@@ -72,7 +72,7 @@ <h2><b>Mail processing component overview</b></h2>
               Hence, we can arrange James standard components listed <a href="/server/dev-provided-mailets.html">here</a> to achieve basic logic. But what if our goals are more
               complex? What if we need our own processing components?</p>
 
-              <p>This page will propose a 'hands on practice' how-to using James 3.0.1. We will implement a custom mailet and a custom matcher,
+              <p>This page will propose a 'hands on practice' how-to using James 3.1.0. We will implement a custom mailet and a custom matcher,
               then deploy it in a James server.</p>
 
               <p>We need to choose our use case. We will, when a mail is delayed over one day, write a mail to the original sender
diff --git a/src/homepage/index.html b/src/homepage/index.html
index 333b3fa4c12..86e69f7cb2c 100644
--- a/src/homepage/index.html
+++ b/src/homepage/index.html
@@ -105,14 +105,14 @@ <h2>Get Started With James</h2>
             <ul class="james-ul no-padding">
               <li class="post-template"><span class="long-arrow-right">&#8594;</span><span><b>
 WHAT WILL YOU TRY:</b><br>
-              <span>Here you will try James server v 3.0 thanks to an image.This James image has a default configuration
+              <span>Here you will try James server v 3.1.0 thanks to an image.This James image has a default configuration
                 using JPA (hsqldb) and Lucene. It also includes a default domain named james.local and three default users:
                 user01, user02, user03, with their default password being <i>1234</i>.<br>
                 <i>Note: this James server will respond to IMAP port 143 and SMTP port 25.</i></span></span>
               </li>
               <li class="post-template"><span class="long-arrow-right">&#8594;</span><span><b>STEPS YOU HAVE TO FOLLOW:</b><br>
                 Pull and run the James image with the following single command:<br><br>
-                <code class="highlighter-rouge">docker run -p "25:25" -p "143:143" linagora/james-jpa-sample:3.0.1</code>
+                <code class="highlighter-rouge">docker run -p "25:25" -p "143:143" linagora/james-jpa-sample:3.1.0</code>
 
                 <br><br>
                 Then, connect this image with for instance, Thunderbird.<br>
diff --git a/src/site/markdown/mailet/quickstart.md b/src/site/markdown/mailet/quickstart.md
index 7e8e69994af..e858c1163a2 100644
--- a/src/site/markdown/mailet/quickstart.md
+++ b/src/site/markdown/mailet/quickstart.md
@@ -20,7 +20,7 @@ Just include something like this in your *pom.xml*
     <dependency>
         <groupId>org.apache.james</groupId>
         <artifactId>apache-mailet-api</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.0</version>
     </dependency>
     <!-- other dependencies -->
 </dependencies>
diff --git a/src/site/xdoc/server/features.xml b/src/site/xdoc/server/features.xml
index e9ed479f6f8..cd8cb1dffd4 100644
--- a/src/site/xdoc/server/features.xml
+++ b/src/site/xdoc/server/features.xml
@@ -30,7 +30,7 @@
                 <tr>
                     <th>Feature</th>
                     <th>Status</th>
-                    <th>3.0</th>
+                    <th>3.x</th>
                     <th>2.3.x</th>
                     <th>Since</th>
                     <th>First released</th>
diff --git a/src/site/xdoc/server/index.xml b/src/site/xdoc/server/index.xml
index f8a2309901d..b17d827e5ec 100644
--- a/src/site/xdoc/server/index.xml
+++ b/src/site/xdoc/server/index.xml
@@ -40,23 +40,23 @@
           <a href="manage.html">manage</a>, <a href="monitor.html">monitor</a>
           and <a href="dev.html">develop</a> Apache James Server.</p>
 
-        <p>Download Apache James Mail Server 3.0.1 and <a href="quick-start.html">quick-start</a> it!</p>
+        <p>Download Apache James Mail Server 3.1.0 and <a href="quick-start.html">quick-start</a> it!</p>
         <p>
           <span class="minibutton btn-download">
             <a href="http://james.apache.org/download.cgi#Apache_James_Server">
-              <span><span class="icon"></span>Apache James Server 3.0.1</span>
+              <span><span class="icon"></span>Apache James Server 3.1.0</span>
             </a>
           </span>
         </p>
          <p>You can also have a look to the last stable version</p>
 
-        <p>Apache James Server 3.0.1 represents the leading edge of development. This code stream has many more
+        <p>Apache James Server 3.1.0 represents the leading edge of development. This code stream has many more
           features than the 2.3 code, but is not be as well tested in production. Reasonable
           configuration compatibility has been retained with 2.3.2.</p>
           
-        <p>Apache James Server 3.0.1 requires Java 1.6. A migration guide for
-           users willing to upgrade from 2.3 to 3.0.1 is <a href="upgrade-2.3.html">available</a>. If relying on Guice
-           wiring, you can use some additional components (Cassandra, ElasticSearch, ...). Guice wiring requires java-8.</p>
+        <p>Apache James Server 3.1.0 requires Java 1.8. A migration guide for
+           users willing to upgrade from 2.3 to 3.1.0 is <a href="upgrade-2.3.html">available</a>. If relying on Guice
+           wiring, you can use some additional components (Cassandra, ElasticSearch, ...).</p>
     
 
 

From db7c2eee2d4ef09c2f05b9775d8811bcbe5e6ca1 Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Mon, 30 Jul 2018 17:42:04 +0700
Subject: [PATCH 02/12] JAMES-2507 Spring quickstart updates

---
 src/site/xdoc/server/quick-start.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/site/xdoc/server/quick-start.xml b/src/site/xdoc/server/quick-start.xml
index d691594c28b..daf77712edc 100644
--- a/src/site/xdoc/server/quick-start.xml
+++ b/src/site/xdoc/server/quick-start.xml
@@ -36,7 +36,7 @@
 Step 0: Requirements
 ####################
 
-  * JRE 1.6+
+  * JRE 1.8+
   * root (linux/unix) or Administrator (Windows)
   * libc6 (linux)
   * 512MB RAM (launches with -Xmx512M - can use less, can need more, depending on load)
@@ -44,16 +44,16 @@ Step 0: Requirements
 Step 1: Download
 #################
 
-  * Download apache-james-3.0.0-app.zip from http://james.apache.org/download.cgi#Apache_James_Server
+  * Download apache-james-3.1.0-app.zip from http://james.apache.org/download.cgi#Apache_James_Server
 
 Step 2: Deploy
 ##############
 
-  * Unzip apache-james-3.0.0-app.zip.
+  * Unzip apache-james-3.1.0-app.zip.
   * You should have a folder with sub-folders bin, conf, lib, log, var and four text files.
 
-$ unzip apache-james-3.0.0-app.zip
-$ cd apache-james-3.0.0-app
+$ unzip apache-james-3.1.0-app.zip
+$ cd apache-james-3.1.0-app
 $ ls (linux) / dir (windows)
 bin
 BUILD.txt

From 6f9cd244f590039c369398b5909654535d24446e Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Mon, 30 Jul 2018 17:55:56 +0700
Subject: [PATCH 03/12] JAMES-2507 JPA Guice install guides should rely on
 download

---
 .../markdown/server/install/guice-jpa-smtp.md | 23 +++++++++++-----
 src/site/markdown/server/install/guice-jpa.md | 26 +++++++++++++------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/site/markdown/server/install/guice-jpa-smtp.md b/src/site/markdown/server/install/guice-jpa-smtp.md
index fe422409d76..f3a51f3bd1f 100644
--- a/src/site/markdown/server/install/guice-jpa-smtp.md
+++ b/src/site/markdown/server/install/guice-jpa-smtp.md
@@ -6,9 +6,13 @@
 
  - Java 8 SDK
  - Docker
- - Maven
+ - Maven (optional)
 
-### Building the artifacts
+### Download the artifacts
+
+Download james-jpa-smtp-guice-3.1.0.zip from [the download page](http://james.apache.org/download.cgi#Apache_James_Server) and deflate it.
+
+### (alternative) Building the artifacts
 
 An usual compilation using maven of this [Git repository content](https://github.com/apache/james-project) will produce
 two artifacts into server/container/guice/jpa-smtp/target directory :
@@ -16,13 +20,16 @@ two artifacts into server/container/guice/jpa-smtp/target directory :
  - james-server-jpa-smtp-${version}.jar
  - james-server-jpa-smtp-${version}.lib
 
+ To run james, you have to create a directory containing required configuration files names **conf**.
+
+ A [sample directory](https://github.com/apache/james-project/tree/master/server/container/guice/jpa-smtp/sample-configuration) is provided with some default value you may need to replace.
+
+
 ## Running
 
 ### James Launch
 
-To run james, you have to create a directory containing required configuration files names **conf**.
-
-A [sample directory](https://github.com/apache/james-project/tree/master/server/container/guice/jpa-smtp/sample-configuration) is provided with some default value you may need to replace.
+Edit the configuration to match your needs.
 
 You also need to generate a keystore with the following command :
 
@@ -33,5 +40,9 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
 Once everything is set up, you just have to run the jar with :
 
 ```bash
-$ java -Dworking.directory=. -jar target/james-server-jpa-smtp-${version}.jar
+$ java -classpath 'james-server-jpa-smtp-guice.jar:james-server-jpa-smtp-guice.lib/*' \
+    -javaagent:james-server-jpa-smtp-guice.lib/openjpa-2.4.2.jar \
+    -Dlogback.configurationFile=conf/logback.xml \
+    -Dworking.directory=. \
+    org.apache.james.JPAJamesServerMain
 ```
\ No newline at end of file
diff --git a/src/site/markdown/server/install/guice-jpa.md b/src/site/markdown/server/install/guice-jpa.md
index b8e75874437..2b3947bd58e 100644
--- a/src/site/markdown/server/install/guice-jpa.md
+++ b/src/site/markdown/server/install/guice-jpa.md
@@ -5,10 +5,13 @@
 ### Requirements
 
  - Java 8 SDK
- - Docker
- - Maven 3
+ - Maven 3 (optional)
 
-### Building the artifacts
+### Download the artifacts
+
+Download james-jpa-guice-3.1.0.zip from [the download page](http://james.apache.org/download.cgi#Apache_James_Server) and deflate it.
+
+### (alternative) Building the artifacts
 
 An usual compilation using maven of this [Git repository content](https://github.com/apache/james-project) will produce
 two artifacts into server/container/guice/jpa-guice/target directory:
@@ -22,15 +25,18 @@ You can for example run in the base of this git repository:
 mvn clean install
 ```
 
-## Running
-
-### James Launch
-
 To run james, you have to create a directory containing required configuration files.
 
 James requires the configuration to be in a subfolder of working directory that is called **conf**. You can get a sample
 directory for configuration from [dockerfiles/run/guice/jpa/destination/conf](https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpa/destination/conf). You might need to adapt it to your needs.
 
+
+## Running
+
+### James Launch
+
+Edit the configuration to match your needs.
+
 You also need to generate a keystore in your conf folder with the following command:
 
 ```bash
@@ -40,5 +46,9 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
 Once everything is set up, you just have to run the jar with:
 
 ```bash
-$ java -Dworking.directory=. -jar target/james-server-jpa-guice.jar
+$ java -classpath 'james-server-jpa-guice.jar:james-server-jpa-guice.lib/*' \
+    -javaagent:james-server-jpa-guice.lib/openjpa-2.4.2.jar \
+    -Dlogback.configurationFile=conf/logback.xml \
+    -Dworking.directory=. \
+    org.apache.james.JPAJamesServerMain
 ```

From 6388a5903ad4dcdae251a7ab8b5deefcffc6ea47 Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Mon, 30 Jul 2018 18:00:03 +0700
Subject: [PATCH 04/12] JAMES-2507 Update installation instructions

---
 src/site/xdoc/server/install.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/site/xdoc/server/install.xml b/src/site/xdoc/server/install.xml
index edf8670e550..34e8ac9c186 100644
--- a/src/site/xdoc/server/install.xml
+++ b/src/site/xdoc/server/install.xml
@@ -29,13 +29,11 @@
 
   <subsection name="Java Virtual Machine">
   
-    <p>James 3.0 requires a Java Runtime Environment. Java version 1.6 or higher is required to run the
+    <p>James 3.1 requires a Java Runtime Environment. Java version 1.8 or higher is required to run the
        James application. The exact JREs available depends on the platform. In addition, the environment variable JAVA_HOME should be set to
        the JRE home directory before running James.</p>
-
-    <p>After James 3.0 release, James requires Java version 1.8 or higher.</p>
     
-    <p>James 3.0 has been successfully tested on OpenJDK, Sun JDK and IBM JDK</p>
+    <p>James 3.1 has been successfully tested on OpenJDK, Sun JDK and IBM JDK</p>
   
   </subsection>
   
@@ -74,8 +72,8 @@
   </section>
 
   <section name="Build instructions">
-      <p>Checkout code from the chosen version on <a href="https://github.com/apache/james-project/tree/9502cfebfd9a4eaebbba7dda802d1fe0ad3589b7">
-          GitHub</a>. Follow <a href="https://github.com/apache/james-project/blob/9502cfebfd9a4eaebbba7dda802d1fe0ad3589b7/README.adoc">README instructions</a> about compilation.</p>
+      <p>Checkout code from the chosen version on <a href="https://github.com/apache/james-project/tree/james-project-3.1.0">
+          GitHub</a>. Follow <a href="https://github.com/apache/james-project/blob/james-project-3.1.0/README.adoc">README instructions</a> about compilation.</p>
 
       <ul>Using these instructions, you can build the following images:
           <li>Guice + JPA + Lucene</li>
@@ -91,7 +89,7 @@
           <a href="install/jpa-guice.html">JPA-Guice</a> and <a href="install/jpa-smtp-guice.html">JPA-SMTP-Guice</a>.
       </p>
 
-      <p>A <a href="https://github.com/apache/james-project/blob/9502cfebfd9a4eaebbba7dda802d1fe0ad3589b7/dockerfiles/run/docker-compose.yml">
+      <p>A <a href="https://github.com/apache/james-project/blob/james-project-3.1.0/dockerfiles/run/docker-compose.yml">
           docker-compose</a> is available for Guice + Cassandra + ElasticSearch</p>
   </section>
 

From 9ff50c6db61183b4c9d69a0dd5ef94292eaf499d Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Tue, 31 Jul 2018 09:54:31 +0700
Subject: [PATCH 05/12] JAMES-2507 James Homepage logo should not reference 3.0

---
 src/homepage/images/james.svg | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/homepage/images/james.svg b/src/homepage/images/james.svg
index 7bf329d9611..e588d19e98f 100644
--- a/src/homepage/images/james.svg
+++ b/src/homepage/images/james.svg
@@ -172,22 +172,5 @@
 			c0.4-0.3,0.9-0.5,1.4-0.5c0.2,0,0.4,0,0.6,0.1c0.2,0,0.3,0.1,0.5,0.2l-0.2,1c0,0.1-0.1,0.2-0.2,0.2c-0.1,0-0.2,0-0.3-0.1
 			c-0.1-0.1-0.4-0.1-0.6-0.1c-0.5,0-0.9,0.1-1.2,0.4c-0.3,0.3-0.6,0.7-0.8,1.2v5L-63,499.3L-63,499.3z"/>
 	</g>
-	<g>
-		<path class="st2" d="M-92.4,406.3c1.2-0.9,2.6-1.3,4.4-1.3c1.8,0,3.2,0.5,4.2,1.4c1,1,1.6,2.2,1.6,3.6c0,1-0.3,2-0.9,2.8
-			c-0.6,0.8-1.4,1.4-2.4,1.7v0.1c1.2,0.3,2.1,0.9,2.7,1.8c0.7,0.9,1,2.1,1,3.6s-0.5,2.8-1.6,3.8c-1.1,1-2.6,1.6-4.5,1.6
-			c-1.9,0-3.5-0.5-4.7-1.4c-1.2-1-1.9-2.3-2.1-4h1.8c0.1,1.1,0.6,2,1.5,2.7c0.9,0.7,2,1.1,3.4,1.1c1.4,0,2.5-0.4,3.2-1.1
-			c0.8-0.7,1.1-1.7,1.1-2.9c0-1.6-0.5-2.7-1.5-3.4c-1-0.7-2.5-1-4.5-1h-0.6v-1.6h0.6c3.8,0,5.6-1.2,5.6-3.6c0-1.1-0.4-2-1.1-2.6
-			c-0.7-0.7-1.7-1-3-1c-1.3,0-2.3,0.3-3.1,0.8c-0.8,0.6-1.2,1.4-1.4,2.4h-1.8C-94.3,408.4-93.6,407.2-92.4,406.3z"/>
-		<path class="st2" d="M-69.7,405.9c0.8-0.3,1.7-0.5,2.8-0.5c1.1,0,2,0.2,2.8,0.5c0.8,0.3,1.4,0.8,1.9,1.4c0.5,0.6,0.9,1.3,1.2,2.2
-			s0.5,1.8,0.6,2.7c0.1,0.9,0.2,2,0.2,3.2c0,1.2-0.1,2.2-0.2,3.2c-0.1,0.9-0.3,1.8-0.6,2.7s-0.7,1.6-1.2,2.2c-0.5,0.6-1.1,1-1.9,1.4
-			c-0.8,0.3-1.7,0.5-2.8,0.5c-1.1,0-2-0.2-2.8-0.5c-0.8-0.3-1.4-0.8-1.9-1.4c-0.5-0.6-0.9-1.3-1.2-2.2c-0.3-0.9-0.5-1.8-0.6-2.7
-			c-0.1-0.9-0.2-2-0.2-3.2c0-1.2,0.1-2.2,0.2-3.2c0.1-0.9,0.3-1.8,0.6-2.7c0.3-0.9,0.7-1.6,1.2-2.2
-			C-71.1,406.7-70.5,406.2-69.7,405.9z M-64.7,407.5c-0.6-0.3-1.3-0.5-2.2-0.5c-0.8,0-1.6,0.2-2.2,0.5c-0.6,0.3-1.1,0.7-1.4,1.2
-			c-0.3,0.5-0.6,1.1-0.8,1.9c-0.2,0.8-0.3,1.5-0.4,2.2c-0.1,0.7-0.1,1.6-0.1,2.6c0,1,0,1.8,0.1,2.6c0.1,0.7,0.2,1.5,0.4,2.2
-			c0.2,0.8,0.5,1.4,0.8,1.9c0.3,0.5,0.8,0.9,1.4,1.2c0.6,0.3,1.3,0.5,2.2,0.5c0.8,0,1.6-0.2,2.2-0.5c0.6-0.3,1.1-0.7,1.4-1.2
-			s0.6-1.1,0.8-1.9c0.2-0.8,0.3-1.5,0.4-2.2c0.1-0.7,0.1-1.6,0.1-2.6c0-1,0-1.8-0.1-2.6c-0.1-0.7-0.2-1.5-0.4-2.2
-			c-0.2-0.8-0.5-1.4-0.8-1.9C-63.7,408.2-64.1,407.8-64.7,407.5z"/>
-		<text transform="matrix(1 0 0 1 -80.5244 424.9473)" class="st2 st7 st8">.</text>
-	</g>
 </g>
 </svg>

From a31a7fb52584adcb7c5797403602c2f9befb76c4 Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Tue, 31 Jul 2018 10:07:16 +0700
Subject: [PATCH 06/12] JAMES-2507 Use dist for keys hashes and signatures on
 download page

To state the Apache Foundation:

    Download links for source and binary artifacts must use the ASF mirror
system.
    They must not link directly to apache.org/dist... (except for
the KEYS, sigs and hashes).
---
 src/site/xdoc/download.xml | 112 ++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index 016926da889..4933c2e8b91 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -111,10 +111,10 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
       files using the PGP or SHA-1 signatures.</p>
       
       <p>The PGP signatures can be verified using PGP or GPG.  First
-      download the <a href="https://www.apache.org/dyn/closer.lua/james/KEYS">KEYS</a>
+      download the <a href="https://apache.org/dist/james/KEYS">KEYS</a>
       as well as the <code>asc</code> signature file for the particular
       distribution.  Make sure you get these files from the <a
-      href="https://www.apache.org/dyn/closer.lua/james/">main distribution
+      href="https://apache.org/dist/james/">main distribution
       directory</a>, rather than from a mirror. Then verify the signatures
       using</p>
       
@@ -160,13 +160,13 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
       <ul>
         <li>Source code (ZIP Format):
           <a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-sources-3.0.1.zip">apache-james-3.0.1-app.zip</a>
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-sources-3.0.1.zip.sha1">SHA-1</a>]
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-sources-3.0.1.zip.asc">PGP</a>]</li>
+          [<a href="https://apache.org/dist/james/server/james-server-sources-3.0.1.zip.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-server-sources-3.0.1.zip.asc">PGP</a>]</li>
 
         <li>Binary (ZIP Format):
           <a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-app-3.0.1-app.zip">apache-james-3.0.1-app.zip</a>
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-app-3.0.1-app.zip.sha1">SHA-1</a>]
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-app-3.0.1-app.zip.sig">PGP</a>]
+          [<a href="https://apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sig">PGP</a>]
         </li>
 
       </ul>
@@ -200,23 +200,23 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
       <ul>
 
         <li>Source (Unix TAR): <a href="[preferred]/james/server/james-2.3.2.1-src.tar.gz">james-2.3.2.1-src.tar.gz</a>
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-2.3.2.1-src.tar.gz.sha1">SHA-1</a>]
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-2.3.2.1-src.tar.gz.asc">PGP</a>]
+          [<a href="https://apache.org/dist/james/server/james-2.3.2.1-src.tar.gz.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-2.3.2.1-src.tar.gz.asc">PGP</a>]
         </li>
 
         <li>Source (ZIP Format): <a href="[preferred]/james/server/james-2.3.2.1-src.zip">james-2.3.2.1-src.zip</a>
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-2.3.2.1-src.zip.sha1">SHA-1</a>]
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-2.3.2.1-src.zip.asc">PGP</a>]
+          [<a href="https://apache.org/dist/james/server/james-2.3.2.1-src.zip.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-2.3.2.1-src.zip.asc">PGP</a>]
         </li>
       
         <li>Binary (Unix TAR): <a href="[preferred]/james/server/james-binary-2.3.2.1.tar.gz">james-binary-2.3.2.1.tar.gz</a>
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-binary-2.3.2.1.tar.gz.sha1">SHA-1</a>]
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-binary-2.3.2.1.tar.gz.asc">PGP</a>]
+          [<a href="https://apache.org/dist/james/server/james-binary-2.3.2.1.tar.gz.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-binary-2.3.2.1.tar.gz.asc">PGP</a>]
         </li>
       
         <li>Binary (ZIP Format): <a href="[preferred]/james/server/james-binary-2.3.2.1.zip">james-binary-2.3.2.1.zip</a>
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-binary-2.3.2.1.zip.sha1">SHA-1</a>]
-          [<a href="https://www.apache.org/dyn/closer.lua/james/server/james-binary-2.3.2.1.zip.asc">PGP</a>]
+          [<a href="https://apache.org/dist/james/server/james-binary-2.3.2.1.zip.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-binary-2.3.2.1.zip.asc">PGP</a>]
         </li>
       
       </ul>
@@ -237,8 +237,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Sources:
       <a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/james-mime4j-sources-0.8.2.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/james-mime4j-sources-0.8.2.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/james-mime4j-sources-0.8.2.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mime4j/0.8.2/james-mime4j-sources-0.8.2.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mime4j/0.8.2/james-mime4j-sources-0.8.2.zip.asc">PGP</a>]
     </p>
 
     <p>You can directly use the core library with maven:</p>
@@ -255,8 +255,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/apache-mime4j-core-0.8.2.jar">(Jar)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/apache-mime4j-core-0.8.2.jar.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/apache-mime4j-core-0.8.2.jar.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mime4j/0.8.2/apache-mime4j-core-0.8.2.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mime4j/0.8.2/apache-mime4j-core-0.8.2.jar.asc">PGP</a>]
       </p>
 
     <p>In order to use Mime-4j DOM:</p>
@@ -273,8 +273,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/apache-mime4j-dom-0.8.2.jar">(Jar)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/apache-mime4j-dom-0.8.2.jar.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/apache-mime4j-dom-0.8.2.jar.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mime4j/0.8.2/apache-mime4j-dom-0.8.2.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mime4j/0.8.2/apache-mime4j-dom-0.8.2.jar.asc">PGP</a>]
     </p>
 
     <p>An aggregator project is also available:</p>
@@ -291,8 +291,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/apache-mime4j-0.8.2-bin.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/apache-mime4j-0.8.2-bin.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mime4j/0.8.2/apache-mime4j-0.8.2-bin.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mime4j/0.8.2/apache-mime4j-0.8.2-bin.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mime4j/0.8.2/apache-mime4j-0.8.2-bin.zip.asc">PGP</a>]
     </p>
   
   </section>
@@ -303,8 +303,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Sources:
       <a href="https://www.apache.org/dyn/closer.lua/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.asc">PGP</a>]
     </p>
 
     <p>You can directly use it with maven:</p>
@@ -321,8 +321,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.asc">PGP</a>]
     </p>
   
   </section>
@@ -333,8 +333,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Sources:
       <a href="https://www.apache.org/dyn/closer.lua/james/jdkim/apache-jdkim-project-0.2-source-release.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jdkim/apache-jdkim-project-0.2-source-release.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jdkim/apache-jdkim-project-0.2-source-release.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip.asc">PGP</a>]
     </p>
 
     <p>You can directly use it with maven:</p>
@@ -351,8 +351,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/jdkim/apache-jdkim-0.2-bin.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jdkim/apache-jdkim-0.2-bin.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jdkim/apache-jdkim-0.2-bin.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip.asc">PGP</a>]
     </p>
   
   </section>
@@ -363,8 +363,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Sources:
       <a href="https://www.apache.org/dyn/closer.lua/james/jsieve/0.7/apache-jsieve-sources-0.7.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.asc">PGP</a>]
     </p>
 
     <p>You can directly use it with maven:</p>
@@ -381,8 +381,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/jsieve/0.7/apache-jsieve-core-0.7.jar">(Jar)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jsieve/0.7/apache-jsieve-core-0.7.jar.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jsieve/0.7/apache-jsieve-core-0.7.jar.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar.asc">PGP</a>]
     </p>
 
     <p>An aggregator project is also available:</p>
@@ -399,8 +399,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz">(Tar Gz)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.asc">PGP</a>]
     </p>
 
   
@@ -413,8 +413,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Sources:
       <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.asc">PGP</a>]
     </p>
 
     <p>You can use the mailet API using this maven dependency:</p>
@@ -431,8 +431,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar">(Jar)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.asc">PGP</a>]
     </p>
     
   </section>
@@ -443,8 +443,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Sources:
       <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.asc">PGP</a>]
     </p>
 
     <p>You can use the mailet API using this maven dependency:</p>
@@ -461,8 +461,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar">(Jar)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.asc">PGP</a>]
     </p>
 
   </section>
@@ -473,8 +473,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Sources:
       <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.asc">PGP</a>]
     </p>
 
     <p>You can use mailet Standard content using this maven dependency:</p>
@@ -491,8 +491,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar">(Jar)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.asc">PGP</a>]
     </p>
 
   </section>
@@ -517,8 +517,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Sources:
       <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-crypto-sources-3.0.1.zip">(Zip)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-crypto-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-crypto-sources-3.0.1.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-crypto-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-crypto-sources-3.0.1.zip.asc">PGP</a>]
     </p>
 
     <p>You can use Mailet AI content using this maven dependency:</p>
@@ -535,8 +535,8 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
     <p>Direct download link:
       <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-crypto-3.0.1.jar">(Jar)</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-crypto-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-crypto-3.0.1.jar.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-crypto-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-crypto-3.0.1.jar.asc">PGP</a>]
     </p>
     
   </section>
@@ -565,13 +565,13 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
     
     <li>Source (Unix TAR):
       <a href="https://www.apache.org/dyn/closer.lua/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz">apache-james-mpt-0.1-src.tar.gz</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.asc">PGP</a>]
     </li>
     
     <li>Source (ZIP Format): <a href="https://www.apache.org/dyn/closer.lua/james/mpt/0.1/apache-james-mpt-0.1-src.zip">apache-james-mpt-0.1-src.zip</a>
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mpt/0.1/apache-james-mpt-0.1-src.zip.sha1">SHA-1</a>]
-      [<a href="https://www.apache.org/dyn/closer.lua/james/mpt/0.1/apache-james-mpt-0.1-src.zip.asc">PGP</a>]
+      [<a href="https://apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip.asc">PGP</a>]
     </li>
     
     <li>Jars (including source and javadocs) for the modules are distributed through the standard 

From ea44f4216f1ad2d959e51ded620fa681c24ab1c8 Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Tue, 31 Jul 2018 10:17:17 +0700
Subject: [PATCH 07/12] JAMES-2507 Download page should link James server 3.1.0
 artifacts

---
 src/site/xdoc/download.xml | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index 4933c2e8b91..e486ed105ef 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -139,7 +139,7 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
   <section name='Apache James Server'>
 
-    <subsection name="Apache James 3.0.1 is the stable version">
+    <subsection name="Apache James 3.1.0 is the stable version">
 
       <div class="ui-widget">
         <div class="ui-priority-secondary ui-corner-all apache-james-crypto-notice">
@@ -159,14 +159,26 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
       <ul>
         <li>Source code (ZIP Format):
-          <a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-sources-3.0.1.zip">apache-james-3.0.1-app.zip</a>
-          [<a href="https://apache.org/dist/james/server/james-server-sources-3.0.1.zip.sha1">SHA-1</a>]
-          [<a href="https://apache.org/dist/james/server/james-server-sources-3.0.1.zip.asc">PGP</a>]</li>
-
-        <li>Binary (ZIP Format):
-          <a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-app-3.0.1-app.zip">apache-james-3.0.1-app.zip</a>
-          [<a href="https://apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sha1">SHA-1</a>]
-          [<a href="https://apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sig">PGP</a>]
+          <a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-sources-3.1.0.zip">apache-james-3.1.0-app.zip</a>
+          [<a href="https://apache.org/dist/james/server/james-server-sources-3.1.0.zip.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-server-sources-3.1.0.zip.asc">PGP</a>]</li>
+
+        <li>Binary (ZIP Format) for Spring wiring:
+          <a href="https://www.apache.org/dyn/closer.lua/james/server/james-server-app-3.1.0-app.zip">apache-james-3.1.0-app.zip</a>
+          [<a href="https://apache.org/dist/james/server/james-server-app-3.1.0-app.zip.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-server-app-3.1.0-app.zip.asc">PGP</a>]
+        </li>
+
+        <li>Binary (ZIP Format) for JPA guice wiring:
+          <a href="https://www.apache.org/dyn/closer.lua/james/server/james-jpa-guice-3.1.0.zip">james-jpa-guice-3.1.0.zip</a>
+          [<a href="https://apache.org/dist/james/server/james-jpa-guice-3.1.0.zip.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-jpa-guice-3.1.0.zip.asc">PGP</a>]
+        </li>
+
+        <li>Binary (ZIP Format) for JPA SMTP guice wiring:
+          <a href="https://www.apache.org/dyn/closer.lua/james/server/james-jpa-smtp-guice-3.1.0.zip">james-jpa-smtp-guice-3.1.0.zip</a>
+          [<a href="https://apache.org/dist/james/server/james-jpa-smtp-guice-3.1.0.zip.sha1">SHA-1</a>]
+          [<a href="https://apache.org/dist/james/server/james-jpa-smtp-guice-3.1.0.zip.asc">PGP</a>]
         </li>
 
       </ul>

From 9b103ab426fd7c7195072d1c55300c6478fc00d0 Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Tue, 31 Jul 2018 15:08:05 +0700
Subject: [PATCH 08/12] JAMES-2507 Reference 3.1.0 downloadable artifacts for
 mailets

---
 src/site/xdoc/download.xml | 68 +++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index e486ed105ef..5e465260628 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -420,13 +420,13 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 
   <section name="Apache Mailet">
   
-    <p>Apache Mailet 3.0.1 is the latest stable version. </p>
+    <p>Apache Mailet 3.1.0 is the latest stable version. </p>
 
 
     <p>Sources:
-      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip">(Zip)</a>
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.1.0/apache-mailet-api-3.1.0-sources.jar">(Jar)</a>
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-api-3.1.0-sources.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-api-3.1.0-sources.jar.asc">PGP</a>]
     </p>
 
     <p>You can use the mailet API using this maven dependency:</p>
@@ -436,57 +436,57 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
   &lt;dependency&gt;
     &lt;groupId&gt;org.apache.james&lt;/groupId&gt;
     &lt;artifactId&gt;apache-mailet-api&lt;/artifactId&gt;
-    &lt;version&gt;3.0.1&lt;/version&gt;
+    &lt;version&gt;3.1.0&lt;/version&gt;
   &lt;/dependency&gt;
       </code>
     </pre>
 
     <p>Direct download link:
-      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar">(Jar)</a>
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.1.0/apache-mailet-api-3.1.0.jar">(Jar)</a>
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-api-3.1.0.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-api-3.1.0.jar.asc">PGP</a>]
     </p>
     
   </section>
 
   <section name="Apache Mailet Base">
 
-    <p>Apache Mailet Base 3.0.1 is the latest stable version.</p>
+    <p>Apache Mailet Base 3.1.0 is the latest stable version.</p>
 
     <p>Sources:
-      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip">(Zip)</a>
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.1.0/apache-mailet-base-3.1.0-sources.jar">(Jar)</a>
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-base-3.1.0-sources.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-base-3.1.0-sources.jar.asc">PGP</a>]
     </p>
 
-    <p>You can use the mailet API using this maven dependency:</p>
+    <p>You can use the mailet Base using this maven dependency:</p>
 
     <pre>
       <code>
   &lt;dependency&gt;
     &lt;groupId&gt;org.apache.james&lt;/groupId&gt;
     &lt;artifactId&gt;apache-mailet-base&lt;/artifactId&gt;
-    &lt;version&gt;3.0.1&lt;/version&gt;
+    &lt;version&gt;3.1.0&lt;/version&gt;
   &lt;/dependency&gt;
       </code>
     </pre>
 
     <p>Direct download link:
-      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar">(Jar)</a>
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.1.0/apache-mailet-base-3.1.0.jar">(Jar)</a>
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-base-3.1.0.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-base-3.1.0.jar.asc">PGP</a>]
     </p>
 
   </section>
 
   <section name="Apache Mailet Standard">
 
-    <p>Apache Mailet Standard 3.0.1 is the latest stable version. </p>
+    <p>Apache Mailet Standard 3.1.0 is the latest stable version. </p>
 
     <p>Sources:
-      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip">(Zip)</a>
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.1.0/apache-mailet-standard-3.1.0-sources.jar">(Jar)</a>
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-standard-3.1.0-sources.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-standard-3.1.0-sources.jar.asc">PGP</a>]
     </p>
 
     <p>You can use mailet Standard content using this maven dependency:</p>
@@ -496,22 +496,22 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
   &lt;dependency&gt;
     &lt;groupId&gt;org.apache.james&lt;/groupId&gt;
     &lt;artifactId&gt;apache-mailet-standard&lt;/artifactId&gt;
-    &lt;version&gt;3.0.1&lt;/version&gt;
+    &lt;version&gt;3.1.0&lt;/version&gt;
   &lt;/dependency&gt;
       </code>
     </pre>
 
     <p>Direct download link:
-      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar">(Jar)</a>
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.1.0/apache-mailet-standard-3.1.0.jar">(Jar)</a>
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-standard-3.1.0.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-standard-3.1.0.jar.asc">PGP</a>]
     </p>
 
   </section>
 
   <section name="Apache Crypto Mailets">
   
-    <p>Apache Crypto Mailets 3.0.1 is the latest stable version.</p>
+    <p>Apache Crypto Mailets 3.1.0 is the latest stable version.</p>
     
   <div class="ui-widget">
     <div class="ui-priority-secondary ui-corner-all apache-james-crypto-notice">
@@ -528,27 +528,27 @@ is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
   </div>
 
     <p>Sources:
-      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-james-mailet-crypto-sources-3.0.1.zip">(Zip)</a>
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-crypto-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-james-mailet-crypto-sources-3.0.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.1.0/apache-mailet-crypto-3.1.0-sources.jar">(Jar)</a>
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-crypto-3.1.0-sources.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-crypto-3.1.0-sources.jar.asc">PGP</a>]
     </p>
 
-    <p>You can use Mailet AI content using this maven dependency:</p>
+    <p>You can use Mailet Crypto content using this maven dependency:</p>
 
     <pre>
       <code>
   &lt;dependency&gt;
     &lt;groupId&gt;org.apache.james&lt;/groupId&gt;
     &lt;artifactId&gt;apache-mailet-crypto&lt;/artifactId&gt;
-    &lt;version&gt;3.0.1&lt;/version&gt;
+    &lt;version&gt;3.1.0&lt;/version&gt;
   &lt;/dependency&gt;
       </code>
     </pre>
 
     <p>Direct download link:
-      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.0.1/apache-mailet-crypto-3.0.1.jar">(Jar)</a>
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-crypto-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="https://apache.org/dist/james/mailets/3.0.1/apache-mailet-crypto-3.0.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dyn/closer.lua/james/mailets/3.1.0/apache-mailet-crypto-3.1.0.jar">(Jar)</a>
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-crypto-3.1.0.jar.sha1">SHA-1</a>]
+      [<a href="https://apache.org/dist/james/mailets/3.1.0/apache-mailet-crypto-3.1.0.jar.asc">PGP</a>]
     </p>
     
   </section>

From e868521998ca61ac9cf9da2f33d94a048229aab0 Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Tue, 31 Jul 2018 15:26:20 +0700
Subject: [PATCH 09/12] JAMES-2507 Write a blog post for 3.1.0 release

---
 .../_posts/2018-07-31-james-3.1.0.markdown    | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 src/homepage/_posts/2018-07-31-james-3.1.0.markdown

diff --git a/src/homepage/_posts/2018-07-31-james-3.1.0.markdown b/src/homepage/_posts/2018-07-31-james-3.1.0.markdown
new file mode 100644
index 00000000000..af882f86205
--- /dev/null
+++ b/src/homepage/_posts/2018-07-31-james-3.1.0.markdown
@@ -0,0 +1,39 @@
+---
+layout: post
+title:  "Apache James Server 3.1.0"
+date:   2018-07-31 16:13:22 +0200
+categories: james update
+---
+
+James server 3.1.0 had been releases.
+
+Here are some points w worked on:
+
+### Added
+
+- Introduce an object store
+- Configurable listeners
+- MDN (Message Disposition notification) parsing and handling
+- SpamAssassin support with per user reports
+- Search in attachments
+- Data Leak Prevention
+- JPA SMTP Guice product
+- Cassandra migration process
+- Structured logging
+- RPM packaging (in addition to deb packaging)
+- Delegating folders
+
+### Changed
+
+- Move to Java 8
+- Improve Mail Repositories handling, including a nice web API
+- Improve Mail Queues handling, including a nice web API
+- Improve RRT (Recipient Rewrite Table) implementation
+- Quota handling improvements, and in particular users can receive an email when they are near the limit of their quota
+- Many performances enhancement, in particular on Cassandra backend
+- Documentation updates
+
+Early adopters can [download it][download], any issue can be reported on our issue [tracker][tracker].
+
+[tracker]: https://issues.apache.org/jira/browse/JAMES
+[download]: http://james.apache.org/download.cgi#Apache_James_Server
\ No newline at end of file

From 41dad41eb515171ca490abdd8ffff1f836f65e79 Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Tue, 31 Jul 2018 15:57:12 +0700
Subject: [PATCH 10/12] fixup! JAMES-2507 Write a blog post for 3.1.0 release

---
 src/homepage/_posts/2018-07-31-james-3.1.0.markdown | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/homepage/_posts/2018-07-31-james-3.1.0.markdown b/src/homepage/_posts/2018-07-31-james-3.1.0.markdown
index af882f86205..34274e56476 100644
--- a/src/homepage/_posts/2018-07-31-james-3.1.0.markdown
+++ b/src/homepage/_posts/2018-07-31-james-3.1.0.markdown
@@ -5,9 +5,9 @@ date:   2018-07-31 16:13:22 +0200
 categories: james update
 ---
 
-James server 3.1.0 had been releases.
+James server 3.1.0 has been releases.
 
-Here are some points w worked on:
+Here are some points we worked on:
 
 ### Added
 

From 72441eef250b1fb27f7bfa624cd49aba15b4a1da Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Tue, 31 Jul 2018 15:58:59 +0700
Subject: [PATCH 11/12] fixup! JAMES-2507 Update installation instructions

---
 src/site/xdoc/server/install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/site/xdoc/server/install.xml b/src/site/xdoc/server/install.xml
index 34e8ac9c186..567a4d5f0f2 100644
--- a/src/site/xdoc/server/install.xml
+++ b/src/site/xdoc/server/install.xml
@@ -29,11 +29,11 @@
 
   <subsection name="Java Virtual Machine">
   
-    <p>James 3.1 requires a Java Runtime Environment. Java version 1.8 or higher is required to run the
+    <p>James 3.1 requires a Java Runtime Environment. Java version 1.8 is required to run the
        James application. The exact JREs available depends on the platform. In addition, the environment variable JAVA_HOME should be set to
        the JRE home directory before running James.</p>
     
-    <p>James 3.1 has been successfully tested on OpenJDK, Sun JDK and IBM JDK</p>
+    <p>James 3.1 has been successfully tested on OpenJDK</p>
   
   </subsection>
   

From 773b71f6a93676e3552ed22f5667b1462664f2d1 Mon Sep 17 00:00:00 2001
From: benwa <btellier@linagora.com>
Date: Tue, 31 Jul 2018 15:59:20 +0700
Subject: [PATCH 12/12] fixup! JAMES-2507 Spring quickstart updates

---
 src/site/xdoc/server/quick-start.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/site/xdoc/server/quick-start.xml b/src/site/xdoc/server/quick-start.xml
index daf77712edc..f7438d82ea1 100644
--- a/src/site/xdoc/server/quick-start.xml
+++ b/src/site/xdoc/server/quick-start.xml
@@ -36,7 +36,7 @@
 Step 0: Requirements
 ####################
 
-  * JRE 1.8+
+  * JRE 1.8
   * root (linux/unix) or Administrator (Windows)
   * libc6 (linux)
   * 512MB RAM (launches with -Xmx512M - can use less, can need more, depending on load)