You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2020/04/21 13:19:48 UTC
[james-project] branch master updated (3b512f1 -> 2179ab3)
This is an automated email from the ASF dual-hosted git repository.
matthieu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 3b512f1 JAMES-3059 Remove a debug statement
new ce513c3 JAMES-2932 upgrade spring version
new 332d2fb JAMES-2932 Fix java-11 compilation issue on master
new 3f6c181 JAMES-2932 compilation is using java-11 so rename the related docker directory
new 54cd902 JAMES-2932 upgrade run images to java-11
new 9ccedc4 JAMES-2932 use Java 11 for compile and run by default
new 2179ab3 Merge remote-tracking branch 'mine/jdk-11'
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.md | 1 +
README.adoc | 28 +++++++++++-----------
.../{java-8 => java-11}/.testcontainers.properties | 0
.../compilation/{java-8 => java-11}/Dockerfile | 0
.../compilation/{java-8 => java-11}/compile.sh | 0
.../{java-8 => java-11}/integration_tests.sh | 0
dockerfiles/run/guice/cassandra-ldap/Dockerfile | 2 +-
.../run/guice/cassandra-rabbitmq-ldap/Dockerfile | 2 +-
.../run/guice/cassandra-rabbitmq/Dockerfile | 2 +-
dockerfiles/run/guice/cassandra/Dockerfile | 2 +-
dockerfiles/run/guice/jpa-smtp/Dockerfile | 2 +-
dockerfiles/run/guice/jpa/Dockerfile | 2 +-
dockerfiles/run/guice/memory/Dockerfile | 2 +-
dockerfiles/run/spring/Dockerfile | 6 ++++-
pom.xml | 4 ++--
server/container/guice/memory-guice/README.adoc | 2 +-
server/container/guice/protocols/netty/pom.xml | 4 ++++
server/protocols/jmap/pom.xml | 4 ++++
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 +-
25 files changed, 44 insertions(+), 39 deletions(-)
rename dockerfiles/compilation/{java-8 => java-11}/.testcontainers.properties (100%)
rename dockerfiles/compilation/{java-8 => java-11}/Dockerfile (100%)
rename dockerfiles/compilation/{java-8 => java-11}/compile.sh (100%)
rename dockerfiles/compilation/{java-8 => java-11}/integration_tests.sh (100%)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 04/06: JAMES-2932 upgrade run images to java-11
Posted by ma...@apache.org.
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 54cd902629810fece8f86ea3f06fcf6d41b95b1d
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Fri Sep 6 14:39:47 2019 +0200
JAMES-2932 upgrade run images to java-11
---
dockerfiles/run/guice/cassandra-ldap/Dockerfile | 2 +-
dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile | 2 +-
dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile | 2 +-
dockerfiles/run/guice/cassandra/Dockerfile | 2 +-
dockerfiles/run/guice/jpa-smtp/Dockerfile | 2 +-
dockerfiles/run/guice/jpa/Dockerfile | 2 +-
dockerfiles/run/guice/memory/Dockerfile | 2 +-
dockerfiles/run/spring/Dockerfile | 6 +++++-
8 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/dockerfiles/run/guice/cassandra-ldap/Dockerfile b/dockerfiles/run/guice/cassandra-ldap/Dockerfile
index 4957918..e6f1e85 100644
--- a/dockerfiles/run/guice/cassandra-ldap/Dockerfile
+++ b/dockerfiles/run/guice/cassandra-ldap/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u222-jre
+FROM adoptopenjdk:11-jre-hotspot
# Ports that are used
#
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
index 1449f4f..ee3cccd 100644
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
+++ b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u222-jre
+FROM adoptopenjdk:11-jre-hotspot
# Ports that are used
#
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile b/dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile
index 06f5251..9c1f5cf 100644
--- a/dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile
+++ b/dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u222-jre
+FROM adoptopenjdk:11-jre-hotspot
# Ports that are used
#
diff --git a/dockerfiles/run/guice/cassandra/Dockerfile b/dockerfiles/run/guice/cassandra/Dockerfile
index 65a19ef..a2c33a7 100644
--- a/dockerfiles/run/guice/cassandra/Dockerfile
+++ b/dockerfiles/run/guice/cassandra/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u222-jre
+FROM adoptopenjdk:11-jre-hotspot
# Ports that are used
#
diff --git a/dockerfiles/run/guice/jpa-smtp/Dockerfile b/dockerfiles/run/guice/jpa-smtp/Dockerfile
index 17217ff..4d331a1 100644
--- a/dockerfiles/run/guice/jpa-smtp/Dockerfile
+++ b/dockerfiles/run/guice/jpa-smtp/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u222-jre
+FROM adoptopenjdk:11-jre-hotspot
# Ports that are used
#
diff --git a/dockerfiles/run/guice/jpa/Dockerfile b/dockerfiles/run/guice/jpa/Dockerfile
index feb452b..b07c009 100644
--- a/dockerfiles/run/guice/jpa/Dockerfile
+++ b/dockerfiles/run/guice/jpa/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u222-jre
+FROM adoptopenjdk:11-jre-hotspot
# Ports that are used
#
diff --git a/dockerfiles/run/guice/memory/Dockerfile b/dockerfiles/run/guice/memory/Dockerfile
index 7a18766..c4185d3 100644
--- a/dockerfiles/run/guice/memory/Dockerfile
+++ b/dockerfiles/run/guice/memory/Dockerfile
@@ -2,7 +2,7 @@
#
# VERSION 1.0
-FROM openjdk:8u222-jre
+FROM adoptopenjdk:11-jre-hotspot
# Ports that are used
#
diff --git a/dockerfiles/run/spring/Dockerfile b/dockerfiles/run/spring/Dockerfile
index dbf564c..8d688c7 100644
--- a/dockerfiles/run/spring/Dockerfile
+++ b/dockerfiles/run/spring/Dockerfile
@@ -2,7 +2,11 @@
#
# VERSION 1.0
-FROM openjdk:8u222-jre
+FROM adoptopenjdk:11-jre-hotspot
+
+# Install unzip
+RUN apt-get update
+RUN apt-get install -y unzip
# Ports that are used
#
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/06: JAMES-2932 Fix java-11 compilation issue on
master
Posted by ma...@apache.org.
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 332d2fb2e9fecb1eb093ed8921135bf17d3c3659
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Fri Oct 4 10:03:18 2019 +0200
JAMES-2932 Fix java-11 compilation issue on master
---
server/container/guice/protocols/netty/pom.xml | 4 ++++
server/protocols/jmap/pom.xml | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/server/container/guice/protocols/netty/pom.xml b/server/container/guice/protocols/netty/pom.xml
index 3914589..3a5ac4d 100644
--- a/server/container/guice/protocols/netty/pom.xml
+++ b/server/container/guice/protocols/netty/pom.xml
@@ -45,5 +45,9 @@
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index d39f9e5..a052b80 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -78,6 +78,10 @@
<version>4.4.13</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 05/06: JAMES-2932 use Java 11 for compile and run
by default
Posted by ma...@apache.org.
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 <ma...@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-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 03/06: JAMES-2932 compilation is using java-11 so
rename the related docker directory
Posted by ma...@apache.org.
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 3f6c1818032bf01a0a61e3e85bb92f7764ebee03
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Fri Sep 6 14:38:48 2019 +0200
JAMES-2932 compilation is using java-11 so rename the related docker directory
---
dockerfiles/compilation/{java-8 => java-11}/.testcontainers.properties | 0
dockerfiles/compilation/{java-8 => java-11}/Dockerfile | 0
dockerfiles/compilation/{java-8 => java-11}/compile.sh | 0
dockerfiles/compilation/{java-8 => java-11}/integration_tests.sh | 0
4 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/dockerfiles/compilation/java-8/.testcontainers.properties b/dockerfiles/compilation/java-11/.testcontainers.properties
similarity index 100%
rename from dockerfiles/compilation/java-8/.testcontainers.properties
rename to dockerfiles/compilation/java-11/.testcontainers.properties
diff --git a/dockerfiles/compilation/java-8/Dockerfile b/dockerfiles/compilation/java-11/Dockerfile
similarity index 100%
rename from dockerfiles/compilation/java-8/Dockerfile
rename to dockerfiles/compilation/java-11/Dockerfile
diff --git a/dockerfiles/compilation/java-8/compile.sh b/dockerfiles/compilation/java-11/compile.sh
similarity index 100%
rename from dockerfiles/compilation/java-8/compile.sh
rename to dockerfiles/compilation/java-11/compile.sh
diff --git a/dockerfiles/compilation/java-8/integration_tests.sh b/dockerfiles/compilation/java-11/integration_tests.sh
similarity index 100%
rename from dockerfiles/compilation/java-8/integration_tests.sh
rename to dockerfiles/compilation/java-11/integration_tests.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/06: JAMES-2932 upgrade spring version
Posted by ma...@apache.org.
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 ce513c3abdfec68545c8bb148a938e522541b688
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Wed Oct 23 16:25:44 2019 +0200
JAMES-2932 upgrade spring version
Sprint 3 is not working with Java-11
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 15cb0d7..b1e438f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -597,7 +597,7 @@
<javax.activation.groupId>javax.activation</javax.activation.groupId>
<javax.activation.artifactId>activation</javax.activation.artifactId>
<jsieve.version>0.7</jsieve.version>
- <spring.version>3.2.18.RELEASE</spring.version>
+ <spring.version>4.3.25.RELEASE</spring.version>
<activmq-artemis.version>2.9.0</activmq-artemis.version>
<apache-jspf-resolver.version>1.0.1</apache-jspf-resolver.version>
<javamail.version>1.5.4</javamail.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 06/06: Merge remote-tracking branch 'mine/jdk-11'
Posted by ma...@apache.org.
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 2179ab3444b0938c40712d2614d597f9766b8b45
Merge: 3b512f1 9ccedc4
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Tue Apr 21 15:18:05 2020 +0200
Merge remote-tracking branch 'mine/jdk-11'
CHANGELOG.md | 1 +
README.adoc | 28 +++++++++++-----------
.../{java-8 => java-11}/.testcontainers.properties | 0
.../compilation/{java-8 => java-11}/Dockerfile | 0
.../compilation/{java-8 => java-11}/compile.sh | 0
.../{java-8 => java-11}/integration_tests.sh | 0
dockerfiles/run/guice/cassandra-ldap/Dockerfile | 2 +-
.../run/guice/cassandra-rabbitmq-ldap/Dockerfile | 2 +-
.../run/guice/cassandra-rabbitmq/Dockerfile | 2 +-
dockerfiles/run/guice/cassandra/Dockerfile | 2 +-
dockerfiles/run/guice/jpa-smtp/Dockerfile | 2 +-
dockerfiles/run/guice/jpa/Dockerfile | 2 +-
dockerfiles/run/guice/memory/Dockerfile | 2 +-
dockerfiles/run/spring/Dockerfile | 6 ++++-
pom.xml | 4 ++--
server/container/guice/memory-guice/README.adoc | 2 +-
server/container/guice/protocols/netty/pom.xml | 4 ++++
server/protocols/jmap/pom.xml | 4 ++++
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 +-
25 files changed, 44 insertions(+), 39 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org