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 <matth...@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-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to