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 5649fbceeaa186dcb8f9a6fb8e13c811dc9bb914 Author: Tran Tien Duc <[email protected]> AuthorDate: Mon May 27 10:20:10 2019 +0700 JAMES-2766 Replace ES old version in documents replace old ES contact points from 9300 port to 9200 port --- JenkinsfileStressTests | 2 +- README.adoc | 4 ++-- .../apache/james/backends/es/ElasticSearchConfigurationTest.java | 8 ++++---- .../package/etc/james/templates/elasticsearch.properties | 2 +- dockerfiles/run/docker-compose.yml | 4 +++- .../cassandra-ldap/destination/conf/elasticsearch.properties | 2 +- .../destination/conf/elasticsearch.properties | 2 +- .../cassandra-rabbitmq/destination/conf/elasticsearch.properties | 2 +- .../run/guice/cassandra/destination/conf/elasticsearch.properties | 2 +- .../markdown/server/install/guice-cassandra-rabbitmq-swift.md | 6 +++--- src/site/markdown/server/install/guice-cassandra.md | 6 +++--- src/site/xdoc/server/config-elasticsearch.xml | 2 +- src/site/xdoc/server/quick-start-cassandra.xml | 2 +- 13 files changed, 23 insertions(+), 21 deletions(-) diff --git a/JenkinsfileStressTests b/JenkinsfileStressTests index 27f3786..befc698 100644 --- a/JenkinsfileStressTests +++ b/JenkinsfileStressTests @@ -56,7 +56,7 @@ pipeline { docker.withTool('docker') { sh "docker run -d --name=cassandra cassandra:3.11.3" sh "docker run -d --name=rabbitmq rabbitmq:3.7.7-management" - sh "docker run -d --name=elasticsearch elasticsearch:2.4.6" + sh "docker run -d --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.7.2" sh "docker run -d --hostname HOSTNAME -p 25:25 -p 8081: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 --name james_run -t james_run" try { diff --git a/README.adoc b/README.adoc index 7a27e28..0c9946e 100644 --- a/README.adoc +++ b/README.adoc @@ -229,7 +229,7 @@ You need a running *swift* objectstorage in docker. To achieve this run: You need a running *ElasticSearch* in docker. To achieve this run: - $ docker run -d --name=elasticsearch elasticsearch:2.4.6 + $ docker run -d --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.7.2 If you want to use all the JMAP search capabilities, you may also need to start Tika: @@ -298,7 +298,7 @@ You need a running *cassandra* in docker. To achieve this run: You need a running *ElasticSearch* in docker. To achieve this run: - $ docker run -d --name=elasticsearch elasticsearch:2.4.6 + $ docker run -d --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.7.2 If you want to use all the JMAP search capabilities, you may also need to start Tika: diff --git a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchConfigurationTest.java b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchConfigurationTest.java index c53f759..c970bd3 100644 --- a/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchConfigurationTest.java +++ b/backends-common/elasticsearch/src/test/java/org/apache/james/backends/es/ElasticSearchConfigurationTest.java @@ -182,7 +182,7 @@ public class ElasticSearchConfigurationTest { PropertiesConfiguration configuration = new PropertiesConfiguration(); String hostname = "myHost"; configuration.addProperty("elasticsearch.masterHost", hostname); - int port = 9300; + int port = 9200; configuration.addProperty("elasticsearch.port", port); ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); @@ -196,7 +196,7 @@ public class ElasticSearchConfigurationTest { PropertiesConfiguration configuration = new PropertiesConfiguration(); String hostname = "myHost"; configuration.addProperty("elasticsearch.masterHost", hostname); - int port = 9300; + int port = 9200; configuration.addProperty("elasticsearch.port", port); ElasticSearchConfiguration elasticSearchConfiguration = ElasticSearchConfiguration.fromProperties(configuration); @@ -210,7 +210,7 @@ public class ElasticSearchConfigurationTest { PropertiesConfiguration configuration = new PropertiesConfiguration(); String hostname = "myHost"; configuration.addProperty("elasticsearch.masterHost", hostname); - int port = 9300; + int port = 9200; configuration.addProperty("elasticsearch.port", port); configuration.addProperty("elasticsearch.clusterName", null); @@ -225,7 +225,7 @@ public class ElasticSearchConfigurationTest { PropertiesConfiguration configuration = new PropertiesConfiguration(); String hostname = "myHost"; configuration.addProperty("elasticsearch.masterHost", hostname); - int port = 9300; + int port = 9200; configuration.addProperty("elasticsearch.port", port); String clusterName = "myClusterName"; configuration.addProperty("elasticsearch.clusterName", clusterName); diff --git a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/elasticsearch.properties b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/elasticsearch.properties index 8e7e4f1..4848809 100644 --- a/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/elasticsearch.properties +++ b/dockerfiles/packaging/guice/cassandra/package/etc/james/templates/elasticsearch.properties @@ -24,7 +24,7 @@ elasticsearch.masterHost=127.0.0.1 elasticsearch.port=9200 # You can alternatively provide a list of hosts following this format : -# elasticsearch.hosts=host1:9300,host2:9300 +# elasticsearch.hosts=host1:9200,host2:9200 # elasticsearch.clusterName=cluster elasticsearch.nb.shards=5 diff --git a/dockerfiles/run/docker-compose.yml b/dockerfiles/run/docker-compose.yml index 6bdbd07..3b847fb 100644 --- a/dockerfiles/run/docker-compose.yml +++ b/dockerfiles/run/docker-compose.yml @@ -23,7 +23,9 @@ services: - "993:993" elasticsearch: - image: elasticsearch:2.4.6 + image: elasticsearch:6.7.2 + environment: + - discovery.type=single-node cassandra: image: cassandra:3.11.3 diff --git a/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties b/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties index 526dc1b..08585b4 100644 --- a/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties +++ b/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties @@ -24,7 +24,7 @@ elasticsearch.masterHost=elasticsearch elasticsearch.port=9200 # You can alternatively provide a list of hosts following this format : -# elasticsearch.hosts=host1:9300,host2:9300 +# elasticsearch.hosts=host1:9200,host2:9200 # elasticsearch.clusterName=cluster elasticsearch.nb.shards=5 diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties index 526dc1b..08585b4 100644 --- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties +++ b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties @@ -24,7 +24,7 @@ elasticsearch.masterHost=elasticsearch elasticsearch.port=9200 # You can alternatively provide a list of hosts following this format : -# elasticsearch.hosts=host1:9300,host2:9300 +# elasticsearch.hosts=host1:9200,host2:9200 # elasticsearch.clusterName=cluster elasticsearch.nb.shards=5 diff --git a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties index 526dc1b..08585b4 100644 --- a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties +++ b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties @@ -24,7 +24,7 @@ elasticsearch.masterHost=elasticsearch elasticsearch.port=9200 # You can alternatively provide a list of hosts following this format : -# elasticsearch.hosts=host1:9300,host2:9300 +# elasticsearch.hosts=host1:9200,host2:9200 # elasticsearch.clusterName=cluster elasticsearch.nb.shards=5 diff --git a/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties b/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties index 526dc1b..08585b4 100644 --- a/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties +++ b/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties @@ -24,7 +24,7 @@ elasticsearch.masterHost=elasticsearch elasticsearch.port=9200 # You can alternatively provide a list of hosts following this format : -# elasticsearch.hosts=host1:9300,host2:9300 +# elasticsearch.hosts=host1:9200,host2:9200 # elasticsearch.clusterName=cluster elasticsearch.nb.shards=5 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 46fe890..e848746 100644 --- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md +++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md @@ -5,7 +5,7 @@ ### Requirements - Java 8 SDK - - Docker ∕ ElasticSearch 2.4.6, RabbitMQ Management 3.3.7, Swift ObjectStorage 2.15.1 and Cassandra 3.11.3 + - Docker ∕ ElasticSearch 6.7.2, RabbitMQ Management 3.3.7, Swift ObjectStorage 2.15.1 and Cassandra 3.11.3 - Maven 3 ### Building the artifacts @@ -26,7 +26,7 @@ mvn clean install ### Requirements * Cassandra 3.11.3 - * ElasticSearch 2.4.6 + * ElasticSearch 6.7.2 * RabbitMQ-Management 3.7.7 * Swift ObjectStorage 2.15.1 or Scality S3 server or AWS S3 @@ -48,7 +48,7 @@ You need to have a Cassandra, ElasticSearch and RabbitMQ instance running. You c ```bash $ docker run -d --port 9042:9042 --name=cassandra cassandra:3.11.3 -$ docker run -d --port 9200:9200 --port 9300:9300 --name=elasticsearch elasticsearch:2.4.6 +$ docker run -d --port 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.7.2 $ docker run -d --port 5672:5672 --port 15672:15672 --name=rabbitmq rabbitmq:3.7.7-management $ docker run -d --port 5000:5000 --port 8080:8080 --port 35357:35357 --name=swift linagora/openstack-keystone-swift:pike ``` diff --git a/src/site/markdown/server/install/guice-cassandra.md b/src/site/markdown/server/install/guice-cassandra.md index 1706039..0edaf26 100644 --- a/src/site/markdown/server/install/guice-cassandra.md +++ b/src/site/markdown/server/install/guice-cassandra.md @@ -5,7 +5,7 @@ ### Requirements - Java 8 SDK - - Docker ∕ ElasticSearch 2.4.6 and Cassandra 3.11.3 + - Docker ∕ ElasticSearch 6.7.2 and Cassandra 3.11.3 - Maven 3 ### Building the artifacts @@ -26,7 +26,7 @@ mvn clean install ### Requirements * Cassandra 3.11.3 - * ElasticSearch 2.4.6 + * ElasticSearch 6.7.2 ### James Launch @@ -46,7 +46,7 @@ You need to have a Cassandra and an ElasticSearch instance running. You can eith ```bash $ docker run -d --port 9042:9042 --name=cassandra cassandra:3.11.3 -$ docker run -d --port 9200:9200 --port 9300:9300 --name=elasticsearch elasticsearch:2.4.6 +$ docker run -d --port 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.7.2 ``` Once everything is set up, you just have to run the jar with: diff --git a/src/site/xdoc/server/config-elasticsearch.xml b/src/site/xdoc/server/config-elasticsearch.xml index 39fd40f..76b599f 100644 --- a/src/site/xdoc/server/config-elasticsearch.xml +++ b/src/site/xdoc/server/config-elasticsearch.xml @@ -44,7 +44,7 @@ <dl> <dt><strong>elasticsearch.hosts</strong></dt> - <dd>List of comma separated hosts. An host is composed of an address and a port separated by a ':'. Example : elasticsearch.hosts=host1:9300,host2:9300</dd> + <dd>List of comma separated hosts. An host is composed of an address and a port separated by a ':'. Example : elasticsearch.hosts=host1:9200,host2:9200</dd> </dl> Other options includes : diff --git a/src/site/xdoc/server/quick-start-cassandra.xml b/src/site/xdoc/server/quick-start-cassandra.xml index a47a5a9..1469f60 100644 --- a/src/site/xdoc/server/quick-start-cassandra.xml +++ b/src/site/xdoc/server/quick-start-cassandra.xml @@ -69,7 +69,7 @@ You may skip this part if you already have a running Cassandra on your network. 3.2. Deploy ElasticSearch (optional) You may skip this part if you already have a running ElasticSearch on your network. -<i>$ docker run --detach=true --name=elasticsearch elasticsearch:2.4.6</i> +<i>$ docker run --detach=true --name=elasticsearch --env 'discovery.type=single-node' elasticsearch:6.7.2</i> Step 4: Configure ################# --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
