This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit fd963235893987b3cfd06cb310dd8767932dba58 Author: Benoit Tellier <[email protected]> AuthorDate: Wed Jan 26 11:30:40 2022 +0700 [RELEASE] Documentation should match 3.6.2 version --- README.adoc | 6 +++--- docs/modules/servers/pages/15-minute-demo.adoc | 2 +- docs/modules/servers/pages/5-minute-demo.adoc | 2 +- .../docs/modules/ROOT/pages/operate/index.adoc | 3 +++ .../docs/modules/ROOT/pages/run/run-docker.adoc | 2 +- src/homepage/howTo/custom-listeners.html | 2 +- src/homepage/howTo/mail-processing.html | 6 +++--- src/homepage/index.html | 6 +++--- src/site/markdown/mailet/quickstart.md | 2 +- src/site/xdoc/protocols/imap4.xml | 2 +- src/site/xdoc/server/config-elasticsearch.xml | 2 +- src/site/xdoc/server/index.xml | 10 +++++----- src/site/xdoc/server/install.xml | 8 ++++---- src/site/xdoc/server/packaging.xml | 16 ++++++++-------- 14 files changed, 36 insertions(+), 33 deletions(-) diff --git a/README.adoc b/README.adoc index c52e73e..b5e70fc 100644 --- a/README.adoc +++ b/README.adoc @@ -5,7 +5,7 @@ image:https://img.shields.io/badge/Join%20us-Mailing%20lists-purple.svg[link="ht link:https://gitter.im/apache/james-project[image:https://badges.gitter.im/apache/james-project.svg[Join the chat at link:https://gitter.im/apache/james-project]] image:https://img.shields.io/badge/CI-Jenkins-blue.svg[link="https://ci-builds.apache.org/job/james/job/ApacheJames/";] image:https://img.shields.io/badge/Documentation-green.svg[link="https://james.apache.org/documentation.html";] -image:https://img.shields.io/badge/Downloads-3.6.1-yellow.svg[link="https://james.apache.org/download.cgi";] +image:https://img.shields.io/badge/Downloads-3.6.2-yellow.svg[link="https://james.apache.org/download.cgi";] image:https://img.shields.io/badge/Images-docker-blue.svg[link="https://hub.docker.com/r/apache/james";] image:https://img.shields.io/badge/License-ApacheV2-orange.svg[link="https://www.apache.org/licenses/";] image:https://img.shields.io/badge/Latests-news-red.svg[link="https://james.apache.org/index.html#posts";] @@ -56,7 +56,7 @@ There is many other ways one can help us: packaging, communication, etc ... ==== Requirements: `docker` installed. -Here you will try James server version 3.6.1 thanks to a docker image. This James image has a default configuration using JPA +Here you will try James server version 3.6.2 thanks to a docker 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: [email protected], [email protected], [email protected], with their default password being 1234. @@ -64,7 +64,7 @@ Note: this James server will respond to IMAPS port 993 and SMTPS port 465. Pull and run the James image with the following single command: - $ docker run -p "465:465" -p "993:993" apache/james:demo-3.6.1 + $ docker run -p "465:465" -p "993:993" apache/james:demo-3.6.2 Then, connect this image with for instance, Thunderbird. link:https://james.apache.org/howTo/imap-server.html[This tutorial] covers more in depth user and domain creation, as well as Thunderbird setup. diff --git a/docs/modules/servers/pages/15-minute-demo.adoc b/docs/modules/servers/pages/15-minute-demo.adoc index aa50537..3a44637 100644 --- a/docs/modules/servers/pages/15-minute-demo.adoc +++ b/docs/modules/servers/pages/15-minute-demo.adoc @@ -34,7 +34,7 @@ Now run the James demo server using this command: [source,bash] ---- -docker run -d -p "25:25" -p "143:143" -p "127.0.0.1:8000:8000" -v $(pwd)/webadmin.properties:/root/conf/webadmin.properties --name james apache/james:demo-3.6.1 +docker run -d -p "25:25" -p "143:143" -p "127.0.0.1:8000:8000" -v $(pwd)/webadmin.properties:/root/conf/webadmin.properties --name james apache/james:demo-3.6.2q ---- Explanation: diff --git a/docs/modules/servers/pages/5-minute-demo.adoc b/docs/modules/servers/pages/5-minute-demo.adoc index ae98923..9f45ce8 100644 --- a/docs/modules/servers/pages/5-minute-demo.adoc +++ b/docs/modules/servers/pages/5-minute-demo.adoc @@ -15,7 +15,7 @@ To begin, run the James demo server using Docker: [source,bash] ---- -docker run -d -p "25:25" -p "143:143" --name james apache/james:demo-3.6.1 +docker run -d -p "25:25" -p "143:143" --name james apache/james:demo-3.6.2 ---- Explanation: diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/operate/index.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/operate/index.adoc index e2492ef..5bb5b2b 100644 --- a/server/apps/distributed-app/docs/modules/ROOT/pages/operate/index.adoc +++ b/server/apps/distributed-app/docs/modules/ROOT/pages/operate/index.adoc @@ -34,6 +34,9 @@ This section sums up and links upgrade instructions for people willing to upgrad |=== | Upgrade from | Recommended upgrade path to 3.7.0 (unreleased) +| 3.6.2 +| Rolling upgrade to 3.7.0 (unreleased). No specific upgrade instructions to perform. + | 3.6.1 | Rolling upgrade to 3.7.0 (unreleased). No specific upgrade instructions to perform. diff --git a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc b/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc index 093e8d3..d01b7c9 100644 --- a/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc +++ b/server/apps/distributed-app/docs/modules/ROOT/pages/run/run-docker.adoc @@ -44,7 +44,7 @@ Then load the distributed server docker image: Alternatively we provide convenience distribution for the latest release: - docker pull apache/james:distributed-3.6.1 + docker pull apache/james:distributed-3.6.2 === Running Firstly, create your own user network on Docker for the James environment: diff --git a/src/homepage/howTo/custom-listeners.html b/src/homepage/howTo/custom-listeners.html index f67de75..542728f 100644 --- a/src/homepage/howTo/custom-listeners.html +++ b/src/homepage/howTo/custom-listeners.html @@ -131,7 +131,7 @@ $ wget https://raw.githubusercontent.com/apache/james-project/master/dockerfiles services: james: ... - image: apache/james:jpa-3.6.1 + image: apache/james:jpa-3.6.2 </code></pre> <p>Add the following volumes for james service:</p> <pre><code> diff --git a/src/homepage/howTo/mail-processing.html b/src/homepage/howTo/mail-processing.html index 9d52ed0..4384f95 100644 --- a/src/homepage/howTo/mail-processing.html +++ b/src/homepage/howTo/mail-processing.html @@ -50,7 +50,7 @@ layout: howTo 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.6.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.6.2. 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 @@ -202,8 +202,8 @@ public void init() throws MessagingException { <pre><code>docker run -p "25:25" -p "143:143" \ -v "$PWD/src/main/resources/mailetcontainer.xml:/root/conf/mailetcontainer.xml" \ - -v "$PWD/target/custom-mailets-3.6.1.jar:/root/extensions-jars/custom-mailets.jar" \ - apache/james:jpa-3.6.1</code></pre> + -v "$PWD/target/custom-mailets-3.6.2.jar:/root/extensions-jars/custom-mailets.jar" \ + apache/james:jpa-3.6.2</code></pre> </div> <footer class="major"> diff --git a/src/homepage/index.html b/src/homepage/index.html index 868cc59..68f9955 100644 --- a/src/homepage/index.html +++ b/src/homepage/index.html @@ -119,14 +119,14 @@ layout: default <ul class="james-ul no-padding"> <li class="post-template"><span class="long-arrow-right">→</span><span><b> WHAT WILL YOU TRY:</b><br> - <span>Here you will try James server v 3.6.1 thanks to an image. This James image has a default configuration + <span>Here you will try James server v 3.6.2 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: [email protected], [email protected], [email protected], with their default password being <i>1234</i>.<br> <i>Note: this James server will respond to IMAPS port 993 and SMTPS port 465.</i></span></span> </li> <li class="post-template"><span class="long-arrow-right">→</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 "465:465" -p "993:993" apache/james:demo-3.6.1</code> + <code class="highlighter-rouge">docker run -p "465:465" -p "993:993" apache/james:demo-3.6.2</code> <br><br> Then, connect this image with for instance, Thunderbird. This <a href="howTo/imap-server.html">tutorial</a> covers more in depth user and domain creation, @@ -141,7 +141,7 @@ WHAT WILL YOU TRY:</b><br> using storage technologies like <a href="https://cassandra.apache.org/";>Cassandra</a>, <a href="https://www.elastic.co/elasticsearch/";>ElasticSearch</a>, <a href="https://www.rabbitmq.com/";>RabbitMQ</a>, and <a href="https://wiki.openstack.org/wiki/Swift";>objectStorage (S3/Swift)</a>.<br/><br/> - Feedback on this product, announced as a beta since 3.6.1 is welcome.<br/><br/> + Feedback on this product, announced as a beta since 3.5.0 is welcome.<br/><br/> This product can be executed via <a href="https://github.com/apache/james-project/blob/master/server/apps/distributed-app/docker-compose.yml";> docker-compose</a> or you can follow its<a href="/server/install/guice-cassandra-rabbitmq-swift.html"> standard installation guide</a> diff --git a/src/site/markdown/mailet/quickstart.md b/src/site/markdown/mailet/quickstart.md index 8c55568..6bdc7a2 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.6.1</version> + <version>3.6.2</version> </dependency> <!-- other dependencies --> </dependencies> diff --git a/src/site/xdoc/protocols/imap4.xml b/src/site/xdoc/protocols/imap4.xml index 947e29c..47366d0 100644 --- a/src/site/xdoc/protocols/imap4.xml +++ b/src/site/xdoc/protocols/imap4.xml @@ -76,7 +76,7 @@ </section> <section name='Apache James IMAP in Server and as component'> - <p><a href='http://james.apache.org/server'>Apache James Server 3.6.1</a> supports IMAP + <p><a href='http://james.apache.org/server'>Apache James Server 3.6.2</a> supports IMAP (using this library).</p> <p>The <a href="source-code.html">source code</a> page contains information on how to develop on James IMAP.</p> diff --git a/src/site/xdoc/server/config-elasticsearch.xml b/src/site/xdoc/server/config-elasticsearch.xml index 0560ae4..0cd6d13 100644 --- a/src/site/xdoc/server/config-elasticsearch.xml +++ b/src/site/xdoc/server/config-elasticsearch.xml @@ -128,7 +128,7 @@ For configuring the metric reporting on ElasticSearch : <p> - In server version 3.6.1 james moved from Elasticsearch 6 to 7 and the metric reporting on Elasticsearch is deprecated. + In server version 3.6.0 james moved from Elasticsearch 6 to 7 and the metric reporting on Elasticsearch is deprecated. You can still use metric reporting on Elasticsearch but that requires you to run a separate Elasticsearch 6 instance and use that in your Elasticsearch metric reporting configuration. </p> diff --git a/src/site/xdoc/server/index.xml b/src/site/xdoc/server/index.xml index 1c20608..8306dfd 100644 --- a/src/site/xdoc/server/index.xml +++ b/src/site/xdoc/server/index.xml @@ -40,22 +40,22 @@ <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.6.1 and <a href="quick-start.html">quick-start</a> it!</p> + <p>Download Apache James Mail Server 3.6.2 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.6.1</span> + <span><span class="icon"></span>Apache James Server 3.6.2</span> </a> </span> </p> <p>You can also have a look to the last stable version</p> - <p>Apache James Server 3.6.1 represents the leading edge of development. This code stream has many more + <p>Apache James Server 3.6.2 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.6.1 and following versions require Java 1.11. A migration guide for - users willing to upgrade from 2.3 to 3.6.1 is <a href="upgrade-2.3.html">available</a>. If relying on Guice + <p>Apache James Server 3.6.2 and following versions require Java 1.11. A migration guide for + users willing to upgrade from 2.3 to 3.6.2 is <a href="upgrade-2.3.html">available</a>. If relying on Guice wiring, you can use some additional components (Cassandra, ElasticSearch, ...).</p> diff --git a/src/site/xdoc/server/install.xml b/src/site/xdoc/server/install.xml index 76a348a..7fac6cd 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.6.1 requires a Java Runtime Environment. Java version 11 is required to run the + <p>James 3.6.2 requires a Java Runtime Environment. Java version 11 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.6.1 has been successfully tested on OpenJDK 11</p> + <p>James 3.6.2 has been successfully tested on OpenJDK 11</p> </subsection> @@ -72,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/james-project-3.6.1";> - GitHub</a>. Follow <a href="https://github.com/apache/james-project/blob/james-project-3.6.1/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.6.2";> + GitHub</a>. Follow <a href="https://github.com/apache/james-project/blob/james-project-3.6.2/README.adoc";>README instructions</a> about compilation.</p> <ul>Using these instructions, you can build the following images: <li>Guice + JPA + Lucene</li> diff --git a/src/site/xdoc/server/packaging.xml b/src/site/xdoc/server/packaging.xml index c024e32..d04b671 100644 --- a/src/site/xdoc/server/packaging.xml +++ b/src/site/xdoc/server/packaging.xml @@ -76,9 +76,9 @@ <tr> <td>Docker image</td> <td>Not available. Contributions welcomed for JIB support.</td> - <td>apache/james:cassandra-3.6.1</td> - <td>apache/james:distributed-3.6.1</td> - <td>apache/james:jpa-3.6.1</td> + <td>apache/james:cassandra-3.6.2</td> + <td>apache/james:distributed-3.6.2</td> + <td>apache/james:jpa-3.6.2</td> <td>None</td> </tr> <tr> @@ -230,7 +230,7 @@ <th>Supported protocols</th> </tr> <tr> - <td>apache/james:distributed-3.6.1</td> + <td>apache/james:distributed-3.6.2</td> <td>Multi-node</td> <td>Cassandra</td> <td>S3 or Cassandra</td> @@ -239,7 +239,7 @@ <td>SMTP, IMAP, JMAP, POP3, LMTP, WebAdmin</td> </tr> <tr> - <td>apache/james:jpa-3.6.1</td> + <td>apache/james:jpa-3.6.2</td> <td>Single node</td> <td>Embedded Derby database (JPA, SQL)</td> <td>Not applicable</td> @@ -248,7 +248,7 @@ <td>SMTP, IMAP, POP3, LMTP, WebAdmin</td> </tr> <tr> - <td>apache/james:demo-3.6.1</td> + <td>apache/james:demo-3.6.2</td> <td>Pre-provisioned Single node instance to ease project discovery</td> <td>Embedded Derby database (JPA, SQL)</td> <td>Not applicable</td> @@ -257,7 +257,7 @@ <td>SMTP, IMAP, POP3, LMTP, WebAdmin</td> </tr> <tr> - <td>apache/james:memory-3.6.1</td> + <td>apache/james:memory-3.6.2</td> <td>Single node for test purposes</td> <td>Memory (no persistence)</td> <td>Memory (no persistence)</td> @@ -266,7 +266,7 @@ <td>SMTP, IMAP, JMAP, POP3, LMTP, WebAdmin</td> </tr> <tr> - <td>apache/james:cassandra-3.6.1</td> + <td>apache/james:cassandra-3.6.2</td> <td>Single node on top of a shared database</td> <td>Cassandra</td> <td>Cassandra</td> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
![https://img.shields.io/badge/Join%20us-Mailing%20lists-purple.svg[link="ht](https://img.shields.io/badge/Join%20us-Mailing%20lists-purple.svg[link="ht){kind=link}
![https://img.shields.io/badge/CI-Jenkins-blue.svg[link="https://ci-builds.apache.org/job/james/job/ApacheJames/"](https://img.shields.io/badge/CI-Jenkins-blue.svg[link="https://ci-builds.apache.org/job/james/job/ApacheJames/"){kind=link}
![https://img.shields.io/badge/Documentation-green.svg[link="https://james.apache.org/documentation.html"](https://img.shields.io/badge/Documentation-green.svg[link="https://james.apache.org/documentation.html"){kind=link}
![https://img.shields.io/badge/Downloads-3.6.1-yellow.svg[link="https://james.apache.org/download.cgi"](https://img.shields.io/badge/Downloads-3.6.1-yellow.svg[link="https://james.apache.org/download.cgi"){kind=link}
![https://img.shields.io/badge/Downloads-3.6.2-yellow.svg[link="https://james.apache.org/download.cgi"](https://img.shields.io/badge/Downloads-3.6.2-yellow.svg[link="https://james.apache.org/download.cgi"){kind=link}
![https://img.shields.io/badge/Images-docker-blue.svg[link="https://hub.docker.com/r/apache/james"](https://img.shields.io/badge/Images-docker-blue.svg[link="https://hub.docker.com/r/apache/james"){kind=link}
![https://img.shields.io/badge/License-ApacheV2-orange.svg[link="https://www.apache.org/licenses/"](https://img.shields.io/badge/License-ApacheV2-orange.svg[link="https://www.apache.org/licenses/"){kind=link}
![https://img.shields.io/badge/Latests-news-red.svg[link="https://james.apache.org/index.html#posts"](https://img.shields.io/badge/Latests-news-red.svg[link="https://james.apache.org/index.html#posts"){kind=link}