This is an automated email from the ASF dual-hosted git repository. matthieu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9ccedc4594f779411b4de44fe6126cdf3b2b2743 Author: Matthieu Baechler <matth...@apache.org> AuthorDate: Mon Sep 30 15:04:15 2019 +0200 JAMES-2932 use Java 11 for compile and run by default --- CHANGELOG.md | 1 + README.adoc | 28 +++++++++++----------- pom.xml | 2 +- server/container/guice/memory-guice/README.adoc | 2 +- src/homepage/index.html | 2 +- .../install/guice-cassandra-rabbitmq-swift.md | 2 +- .../markdown/server/install/guice-cassandra.md | 2 +- src/site/markdown/server/install/guice-jpa-smtp.md | 2 +- src/site/markdown/server/install/guice-jpa.md | 2 +- src/site/xdoc/server/packaging.xml | 8 ------- src/site/xdoc/server/quick-start-cassandra.xml | 2 +- 11 files changed, 23 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32b6ff1..5f70328 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ of tasks being currently executed. - JAMES-3117 Add PeriodicalHealthChecks for periodical calling all health checks ### Changed +- Switch to Java 11 for build and run - Multiple changes have been made to enhance ElasticSearch performance: - Use of routing keys to collocate documents per mailbox - Under some configuration, html was not extracted before document indexing diff --git a/README.adoc b/README.adoc index 43a9eea..6b2cbee 100644 --- a/README.adoc +++ b/README.adoc @@ -44,10 +44,10 @@ There is many other ways one can help us: packaging, communication, etc ... * link:#how-to-release-via-maven-release-plugin[How to release via maven release plugin] * link:#how-to-check-the-compilation[How to check the compilation] * link:#how-to-run-james-in-docker[How to run James in Docker] - ** link:#run-james-with-java-8-%2Dguice-%2Dcassandra-%2Drabbitmq-%2Dswift-%2Delasticsearch[Run James with Java 8 + Guice + Cassandra + RabbitMQ + Swift + ElasticSearch] - ** link:#run-james-with-java-8-%2Dguice-%2Dcassandra-%2Delasticsearch[Run James with Java 8 + Guice + Cassandra + ElasticSearch] - ** link:#run-james-with-java-8-%2Dguice-%2Djpa-%2Dlucene[Run James with Java 8 + Guice + JPA + Lucene] - ** link:#run-james-with-java-8-%2Dspring-%2Djpa[Run James with Java 8 + Spring + JPA] + ** link:#run-james-with-%2Dguice-%2Dcassandra-%2Drabbitmq-%2Dswift-%2Delasticsearch[Run James with Guice + Cassandra + RabbitMQ + Swift + ElasticSearch] + ** link:#run-james-with-%2Dguice-%2Dcassandra-%2Delasticsearch[Run James with Guice + Cassandra + ElasticSearch] + ** link:#run-james-with-%2Dguice-%2Djpa-%2Dlucene[Run James with Guice + JPA + Lucene] + ** link:#run-james-with-%2Dspring-%2Djpa[Run James with Spring + JPA] * link:#other-useful-commands[Other Useful commands] ** link:#how-to-add-a-domain-[How to add a domain?] ** link:#how-to-add-a-user-[How to add a user?] @@ -159,11 +159,11 @@ Don't forget to add your key to https://downloads.apache.org/james/KEYS In order to have a standard compilation environment, we introduce Dockerfiles, using java-8. -=== Java 8 +=== Java 11 First step, you have to build the Docker image - $ docker build -t james/project dockerfiles/compilation/java-8 + $ docker build -t james/project dockerfiles/compilation/java-11 In order to run the build, you have to launch the following command: @@ -198,13 +198,13 @@ If you are using a a fresh installation of Docker, your DOCKER_HOST should be un This feature is available for three configurations : - * Java 8 + Guice + Cassandra + RabbitMQ + Swift + ElasticSearch - * Java 8 + Guice + Cassandra + ElasticSearch - * Java 8 + Guice + JPA + Lucene - * Java 8 + Spring + JPA + * Guice + Cassandra + RabbitMQ + Swift + ElasticSearch + * Guice + Cassandra + ElasticSearch + * Guice + JPA + Lucene + * Spring + JPA -=== Run James with Java 8 + Guice + Cassandra + RabbitMQ + Swift + ElasticSearch +=== Run James with Guice + Cassandra + RabbitMQ + Swift + ElasticSearch ==== Requirements @@ -294,7 +294,7 @@ Add a link for the tika container in the above command line: $ docker run --hostname HOSTNAME -p "25:25" -p 80:80 -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" --link cassandra:cassandra --link rabbitmq:rabbitmq --link elasticsearch:elasticsearch --link tika:tika --name james_run -t james_run -=== Run James with Java 8 + Guice + Cassandra + ElasticSearch +=== Run James with Guice + Cassandra + ElasticSearch ==== Requirements @@ -356,7 +356,7 @@ Add a link for the tika container in the above command line: $ docker run --hostname HOSTNAME -p "25:25" -p 80:80 -p "110:110" -p "143:143" -p "465:465" -p "587:587" -p "993:993" --link cassandra:cassandra --link elasticsearch:elasticsearch --link tika:tika --name james_run -t james_run -=== Run James with Java 8 + Guice + JPA + Lucene +=== Run James with Guice + JPA + Lucene ==== Requirements Built artifacts should be in ./dockerfiles/run/guice/jpa/destination folder for jpa. @@ -391,7 +391,7 @@ You can add an optional port binding to port 8000, to expose the webadmin server To have log file accessible on a volume, add *-v $PWD/logs:/logs* option to the above command line, where *$PWD/logs* is your local directory to put files in. -=== Run James with Java 8 + Spring + JPA +=== Run James with Spring + JPA ==== Requirements diff --git a/pom.xml b/pom.xml index b1e438f..94c7782 100644 --- a/pom.xml +++ b/pom.xml @@ -577,7 +577,7 @@ otherwise the set values are used by default. --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <target.jdk>8</target.jdk> + <target.jdk>11</target.jdk> <james-skin.version>1.9-SNAPSHOT</james-skin.version> <!-- This property contains the directory where to deploy when running using "-Psite-reports" profile diff --git a/server/container/guice/memory-guice/README.adoc b/server/container/guice/memory-guice/README.adoc index 36be5f4..61dbfc4 100644 --- a/server/container/guice/memory-guice/README.adoc +++ b/server/container/guice/memory-guice/README.adoc @@ -4,7 +4,7 @@ === Requirements - * Java 8 SDK + * Java 11 SDK * Docker * Maven 3 diff --git a/src/homepage/index.html b/src/homepage/index.html index 8c24357..12c0eff 100644 --- a/src/homepage/index.html +++ b/src/homepage/index.html @@ -74,7 +74,7 @@ layout: default <div class="about-table"> <h3 class="tb-h3">James from a technical point of view</h3> <b>Complete portability</b> (100% pure JVM: Java & Scala)<br/> - <b>Built with Java 11</b> and running on <b>JRE 1.8+</b>.<br/><br/> + <b>Built with Java 11</b> and running on the <b>Java RE 11</b>.<br/><br/> <b>James Components:</b><br/> - <b>Emailing protocols:</b> SMTP, LMTP, POP3, IMAP, ManageSieve, JMAP<br/> - <b>Mailet container:</b> independent, extensible and pluggable email processing agents<br/> diff --git a/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md b/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md index 7645879..d82c159 100644 --- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md +++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md @@ -4,7 +4,7 @@ ### Requirements - - Java 8 SDK + - Java 11 SDK - Docker ∕ ElasticSearch 6.3.2, RabbitMQ Management 3.3.7, Swift ObjectStorage 2.15.1 and Cassandra 3.11.3 - Maven 3 diff --git a/src/site/markdown/server/install/guice-cassandra.md b/src/site/markdown/server/install/guice-cassandra.md index 58956aa..7cf077c 100644 --- a/src/site/markdown/server/install/guice-cassandra.md +++ b/src/site/markdown/server/install/guice-cassandra.md @@ -4,7 +4,7 @@ ### Requirements - - Java 8 SDK + - Java 11 SDK - Docker ∕ ElasticSearch 6.3.2 and Cassandra 3.11.3 - Maven 3 diff --git a/src/site/markdown/server/install/guice-jpa-smtp.md b/src/site/markdown/server/install/guice-jpa-smtp.md index cf8ec43..dd011f6 100644 --- a/src/site/markdown/server/install/guice-jpa-smtp.md +++ b/src/site/markdown/server/install/guice-jpa-smtp.md @@ -4,7 +4,7 @@ ### Requirements - - Java 8 SDK + - Java 11 SDK - Docker - Maven (optional) diff --git a/src/site/markdown/server/install/guice-jpa.md b/src/site/markdown/server/install/guice-jpa.md index de18a8c..a83e3e6 100644 --- a/src/site/markdown/server/install/guice-jpa.md +++ b/src/site/markdown/server/install/guice-jpa.md @@ -4,7 +4,7 @@ ### Requirements - - Java 8 SDK + - Java 11 SDK - Maven 3 (optional) ### Download the artifacts diff --git a/src/site/xdoc/server/packaging.xml b/src/site/xdoc/server/packaging.xml index f69b92f..cb1c8fb 100644 --- a/src/site/xdoc/server/packaging.xml +++ b/src/site/xdoc/server/packaging.xml @@ -74,14 +74,6 @@ <td>Guice</td> </tr> <tr> - <td>Java version</td> - <td>Java 6</td> - <td>Java 8</td> - <td>Java 8</td> - <td>Java 8</td> - <td>Java 8</td> - </tr> - <tr> <td>Docker image</td> <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/spring">Available</a></td> <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra">Available</a></td> diff --git a/src/site/xdoc/server/quick-start-cassandra.xml b/src/site/xdoc/server/quick-start-cassandra.xml index 34811c4..b84a314 100644 --- a/src/site/xdoc/server/quick-start-cassandra.xml +++ b/src/site/xdoc/server/quick-start-cassandra.xml @@ -35,7 +35,7 @@ Step 0: Requirements #################### - * Java 8 SDK + * Java 11 SDK * 2GB RAM * Docker 1.7.1+ * Maven 3.3 --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org