You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/02/23 03:45:27 UTC
[james-project] 14/14: JAMES-2514 Upgrade Cassandra 3.11.3 ->
3.11.10
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 864e1c371b38f9a49bb8869416dfe32d3dbdf0b4
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Feb 15 09:28:20 2021 +0700
JAMES-2514 Upgrade Cassandra 3.11.3 -> 3.11.10
---
JenkinsfileStressTests.groovy | 6 +++---
README.adoc | 4 ++--
.../java/org/apache/james/backends/cassandra/DockerCassandra.java | 4 ++--
dockerfiles/run/docker-compose-branch-master.yml | 2 +-
dockerfiles/run/docker-compose.yml | 2 +-
docs/modules/servers/pages/distributed/operate/guide.adoc | 6 +++---
docs/modules/servers/pages/distributed/operate/logging.adoc | 2 +-
docs/modules/servers/pages/distributed/run-docker.adoc | 2 +-
docs/modules/servers/pages/distributed/run.adoc | 6 +++---
src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md | 6 +++---
src/site/markdown/server/install/guice-cassandra.md | 6 +++---
src/site/markdown/server/manage-guice-distributed-james.md | 6 +++---
src/site/xdoc/server/quick-start-cassandra.xml | 2 +-
13 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/JenkinsfileStressTests.groovy b/JenkinsfileStressTests.groovy
index b8aafdb..e1a2322 100644
--- a/JenkinsfileStressTests.groovy
+++ b/JenkinsfileStressTests.groovy
@@ -63,7 +63,7 @@ pipeline {
switch (params.PROFILE) {
case "reference":
sh "cd /srv && sudo btrfs subvolume snapshot bench-snapshot-s3 bench-running-docker"
- sh 'docker run -d --name=cassandra -p 9042:9042 -v /srv/bench-running-docker/cassandra:/var/lib/cassandra cassandra:3.11.3'
+ sh 'docker run -d --name=cassandra -p 9042:9042 -v /srv/bench-running-docker/cassandra:/var/lib/cassandra cassandra:3.11.10'
sh 'sleep 10'
@@ -86,7 +86,7 @@ pipeline {
sh 'docker run -d --hostname HOSTNAME -p 25:25 -p 1080:80 -p 8000:8000 -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 --link s3:s3.docker.test --name james_run -t james_run'
break
case "s3-local":
- sh 'docker run -d --name=cassandra -p 9042:9042 cassandra:3.11.3'
+ sh 'docker run -d --name=cassandra -p 9042:9042 cassandra:3.11.10'
sh 'docker run -d --name=elasticsearch -p 9200:9200 --env "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:6.3.2'
sh 'docker run -d --name=tika apache/tika:1.24'
sh 'docker run -d --env "REMOTE_MANAGEMENT_DISABLE=1" --env "SCALITY_ACCESS_KEY_ID=accessKey1" --env "SCALITY_SECRET_ACCESS_KEY=secretKey1" --name=s3 zenko/cloudserver:8.2.6'
@@ -95,7 +95,7 @@ pipeline {
sh 'docker run -d --hostname HOSTNAME -p 25:25 -p 1080:80 -p 8000:8000 -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 s3:s3.docker.test --link tika:tika --name james_run -t james_run'
break
case "s3":
- sh 'docker run -d --name=cassandra -p 9042:9042 cassandra:3.11.3'
+ sh 'docker run -d --name=cassandra -p 9042:9042 cassandra:3.11.10'
sh 'docker run -d --name=elasticsearch -p 9200:9200 --env "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:6.3.2'
sh 'docker run -d --name=tika apache/tika:1.24'
sh 'docker run -d --name=rabbitmq -p 15672:15672 -p 5672:5672 rabbitmq:3.8.1-management'
diff --git a/README.adoc b/README.adoc
index a7c92ae..2e5dfb5 100644
--- a/README.adoc
+++ b/README.adoc
@@ -153,7 +153,7 @@ If you haven't already:
==== How to ?
You need a running *cassandra* in docker. To achieve this run:
- $ docker run -d --name=cassandra cassandra:3.11.3
+ $ docker run -d --name=cassandra cassandra:3.11.10
You need a running *rabbitmq* in docker. To achieve this run:
@@ -233,7 +233,7 @@ If you haven't already:
==== How to ?
You need a running *cassandra* in docker. To achieve this run:
- $ docker run -d --name=cassandra cassandra:3.11.3
+ $ docker run -d --name=cassandra cassandra:3.11.10
You need a running *ElasticSearch* in docker. To achieve this run:
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
index b5be0eb..6865431 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java
@@ -139,7 +139,7 @@ public class DockerCassandra {
@SuppressWarnings("resource")
public DockerCassandra() {
- this("cassandra_3_11_3-" + buildSpecificImageDiscriminator(), AdditionalDockerFileStep.IDENTITY);
+ this("cassandra_3_11_10-" + buildSpecificImageDiscriminator(), AdditionalDockerFileStep.IDENTITY);
}
private DockerCassandra(String imageName, AdditionalDockerFileStep additionalSteps) {
@@ -174,7 +174,7 @@ public class DockerCassandra {
new ImageFromDockerfile(imageName,doNotDeleteImageAfterUsage)
.withDockerfileFromBuilder(builder ->
additionalSteps.applyStep(builder
- .from("cassandra:3.11.3")
+ .from("cassandra:3.11.10")
.env("ENV CASSANDRA_CONFIG", "/etc/cassandra")
.run("echo \"-Xms" + CASSANDRA_MEMORY + "M\" >> " + JVM_OPTIONS)
.run("echo \"-Xmx" + CASSANDRA_MEMORY + "M\" >> " + JVM_OPTIONS)
diff --git a/dockerfiles/run/docker-compose-branch-master.yml b/dockerfiles/run/docker-compose-branch-master.yml
index 5105e99..bbd4349 100644
--- a/dockerfiles/run/docker-compose-branch-master.yml
+++ b/dockerfiles/run/docker-compose-branch-master.yml
@@ -29,7 +29,7 @@ services:
- discovery.type=single-node
cassandra:
- image: cassandra:3.11.3
+ image: cassandra:3.11.10
ports:
- "9042:9042"
diff --git a/dockerfiles/run/docker-compose.yml b/dockerfiles/run/docker-compose.yml
index 321dca3..f60db6f 100644
--- a/dockerfiles/run/docker-compose.yml
+++ b/dockerfiles/run/docker-compose.yml
@@ -29,7 +29,7 @@ services:
- discovery.type=single-node
cassandra:
- image: cassandra:3.11.3
+ image: cassandra:3.11.10
ports:
- "9042:9042"
diff --git a/docs/modules/servers/pages/distributed/operate/guide.adoc b/docs/modules/servers/pages/distributed/operate/guide.adoc
index 1152755..13f0195 100644
--- a/docs/modules/servers/pages/distributed/operate/guide.adoc
+++ b/docs/modules/servers/pages/distributed/operate/guide.adoc
@@ -357,7 +357,7 @@ echo -e "\nauthorizer: org.apache.cassandra.auth.CassandraAuthorizer" >> /etc/ca
==== Create a role
Have a look at
-http://cassandra.apache.org/doc/3.11.3/cql/security.html[cassandra documentation] section `CREATE ROLE` for more information
+http://cassandra.apache.org/doc/3.11.10/cql/security.html[cassandra documentation] section `CREATE ROLE` for more information
E.g.
@@ -368,7 +368,7 @@ CREATE ROLE james_one WITH PASSWORD = 'james_one' AND LOGIN = true;
==== Create a keyspace
Have a look at
-http://cassandra.apache.org/doc/3.11.3/cql/ddl.html[cassandra documentation] section `CREATE KEYSPACE` for more information
+http://cassandra.apache.org/doc/3.11.10/cql/ddl.html[cassandra documentation] section `CREATE KEYSPACE` for more information
==== Grant permissions on created keyspace to the role
@@ -416,7 +416,7 @@ that topic. Consequently, you have to accept that your data models are
still being exposed to anyone having credentials to Cassandra.
For more information, have a look at
-http://cassandra.apache.org/doc/3.11.3/cql/security.html[cassandra documentation] section `REVOKE PERMISSION`.
+http://cassandra.apache.org/doc/3.11.10/cql/security.html[cassandra documentation] section `REVOKE PERMISSION`.
Except for the case above, the permissions are not auto available for a
specific role unless they are granted by `GRANT` command. Therefore, if
diff --git a/docs/modules/servers/pages/distributed/operate/logging.adoc b/docs/modules/servers/pages/distributed/operate/logging.adoc
index 39d0d7c..7825f38 100644
--- a/docs/modules/servers/pages/distributed/operate/logging.adoc
+++ b/docs/modules/servers/pages/distributed/operate/logging.adoc
@@ -200,7 +200,7 @@ services:
- discovery.type=single-node
cassandra:
- image: cassandra:3.11.3
+ image: cassandra:3.11.10
ports:
- "9042:9042"
diff --git a/docs/modules/servers/pages/distributed/run-docker.adoc b/docs/modules/servers/pages/distributed/run-docker.adoc
index 6c1a275..185de97 100644
--- a/docs/modules/servers/pages/distributed/run-docker.adoc
+++ b/docs/modules/servers/pages/distributed/run-docker.adoc
@@ -45,7 +45,7 @@ If you haven't already:
You need a running *cassandra* in docker. To achieve this run:
- $ docker run -d --name=cassandra cassandra:3.11.3
+ $ docker run -d --name=cassandra cassandra:3.11.10
You need a running *rabbitmq* in docker. To achieve this run:
diff --git a/docs/modules/servers/pages/distributed/run.adoc b/docs/modules/servers/pages/distributed/run.adoc
index 585dd3d..8a2303e 100644
--- a/docs/modules/servers/pages/distributed/run.adoc
+++ b/docs/modules/servers/pages/distributed/run.adoc
@@ -7,7 +7,7 @@
* Java 11 SDK
* Docker ∕ ElasticSearch 6.3.2, RabbitMQ Management 3.3.7, S3 compatible
-ObjectStorage and Cassandra 3.11.3
+ObjectStorage and Cassandra 3.11.10
* Maven 3
=== Building the artifacts
@@ -29,7 +29,7 @@ mvn clean install
=== Requirements
-* Cassandra 3.11.3
+* Cassandra 3.11.10
* ElasticSearch 6.3.2
* RabbitMQ-Management 3.8.1
* Swift ObjectStorage 2.15.1 or Zenko Cloudserver or AWS S3
@@ -58,7 +58,7 @@ running. You can either install the servers or launch them via docker:
[source,bash]
----
-$ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.3
+$ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.10
$ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:6.3.2
$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.8.1-management
$ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 zenko/cloudserver:8.2.6
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 99754dd..1a204dc 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 11 SDK
- - Docker ∕ ElasticSearch 6.3.2, RabbitMQ Management 3.8.1, compatible S3 ObjectStorage and Cassandra 3.11.3
+ - Docker ∕ ElasticSearch 6.3.2, RabbitMQ Management 3.8.1, compatible S3 ObjectStorage and Cassandra 3.11.10
- Maven 3
### Building the artifacts
@@ -25,7 +25,7 @@ mvn clean install
### Requirements
- * Cassandra 3.11.3
+ * Cassandra 3.11.10
* ElasticSearch 6.3.2
* RabbitMQ-Management 3.8.1
* Swift ObjectStorage 2.15.1 or Zenko Cloudserver or AWS S3
@@ -47,7 +47,7 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
You need to have a Cassandra, ElasticSearch, S3 and RabbitMQ instance running. You can either install the servers or launch them via docker:
```bash
-$ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.3
+$ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.10
$ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:6.3.2
$ docker run -d -p 5672:5672 -p 15672:15672 --name=rabbitmq rabbitmq:3.8.1-management
$ docker run -d --env 'REMOTE_MANAGEMENT_DISABLE=1' --env 'SCALITY_ACCESS_KEY_ID=accessKey1' --env 'SCALITY_SECRET_ACCESS_KEY=secretKey1' --name=s3 zenko/cloudserver:8.2.6
diff --git a/src/site/markdown/server/install/guice-cassandra.md b/src/site/markdown/server/install/guice-cassandra.md
index 7cf077c..ad1d55a 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 11 SDK
- - Docker ∕ ElasticSearch 6.3.2 and Cassandra 3.11.3
+ - Docker ∕ ElasticSearch 6.3.2 and Cassandra 3.11.10
- Maven 3
### Building the artifacts
@@ -25,7 +25,7 @@ mvn clean install
### Requirements
- * Cassandra 3.11.3
+ * Cassandra 3.11.10
* ElasticSearch 6.3.2
### James Launch
@@ -45,7 +45,7 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
You need to have a Cassandra and an ElasticSearch instance running. You can either install the servers or launch them via docker:
```bash
-$ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.3
+$ docker run -d -p 9042:9042 --name=cassandra cassandra:3.11.10
$ docker run -d -p 9200:9200 --name=elasticsearch --env 'discovery.type=single-node' docker.elastic.co/elasticsearch/elasticsearch:6.3.2
```
diff --git a/src/site/markdown/server/manage-guice-distributed-james.md b/src/site/markdown/server/manage-guice-distributed-james.md
index b6013df..fe7dff8 100644
--- a/src/site/markdown/server/manage-guice-distributed-james.md
+++ b/src/site/markdown/server/manage-guice-distributed-james.md
@@ -410,7 +410,7 @@ echo -e "\nauthorizer: org.apache.cassandra.auth.CassandraAuthorizer" >> /etc/ca
#### Create a role
-Have a look at [cassandra documentation](http://cassandra.apache.org/doc/3.11.3/cql/security.html) section `CREATE ROLE` for more information
+Have a look at [cassandra documentation](http://cassandra.apache.org/doc/3.11.10/cql/security.html) section `CREATE ROLE` for more information
E.g.
```
@@ -418,7 +418,7 @@ CREATE ROLE james_one WITH PASSWORD = 'james_one' AND LOGIN = true;
```
#### Create a keyspace
-Have a look at [cassandra documentation](http://cassandra.apache.org/doc/3.11.3/cql/ddl.html) section `CREATE KEYSPACE` for more information
+Have a look at [cassandra documentation](http://cassandra.apache.org/doc/3.11.10/cql/ddl.html) section `CREATE KEYSPACE` for more information
#### Grant permissions on created keyspace to the role
@@ -460,7 +460,7 @@ describe any keyspace and table. There's no configuration that can make
effect on that topic. Consequently, you have to accept that your data models
are still being exposed to anyone having credentials to Cassandra.
-For more information, have a look at [cassandra documentation](http://cassandra.apache.org/doc/3.11.3/cql/security.html) section `REVOKE PERMISSION`.
+For more information, have a look at [cassandra documentation](http://cassandra.apache.org/doc/3.11.10/cql/security.html) section `REVOKE PERMISSION`.
Except for the case above, the permissions are not auto available for
a specific role unless they are granted by `GRANT` command. Therefore,
diff --git a/src/site/xdoc/server/quick-start-cassandra.xml b/src/site/xdoc/server/quick-start-cassandra.xml
index b84a314..e4b6ad9 100644
--- a/src/site/xdoc/server/quick-start-cassandra.xml
+++ b/src/site/xdoc/server/quick-start-cassandra.xml
@@ -64,7 +64,7 @@ Step 3: Deploy
3.1. Deploy Cassandra (optional)
You may skip this part if you already have a running Cassandra on your network.
-<i>$ docker run --detach=true --name=cassandra cassandra:3.11.3</i>
+<i>$ docker run --detach=true --name=cassandra cassandra:3.11.10</i>
3.2. Deploy ElasticSearch (optional)
You may skip this part if you already have a running ElasticSearch on your network.
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org