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 1b7b36cc3957a57dfa48ac9247021a18623f821b Author: Benoit Tellier <[email protected]> AuthorDate: Mon Mar 23 18:51:50 2020 +0700 JAMES-3124 Test and recommend upgrading to Tika 1.24 --- CHANGELOG.md | 2 +- JenkinsfileStressTests.groovy | 2 +- README.adoc | 8 ++++---- dockerfiles/run/docker-compose.yml | 2 +- .../src/main/java/org/apache/james/util/docker/Images.java | 2 +- src/site/xdoc/server/config-elasticsearch.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff57fdb..c61c434 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,7 +70,7 @@ More details about the property is at [java mail doc](https://javaee.github.io/j ### Third party softwares - The distributed James server product (relying on Guice, Cassandra, ElasticSearch, RabbitMQ and optionally Swift) now needs at least RabbitMQ 3.8. - - Tika prior 1.22 is subject to multiple CVEs. We recommend the upgrade. + - Tika prior 1.24 is subject to multiple CVEs. We recommend the upgrade. ## [3.4.0] - 2019-09-05 ### Added diff --git a/JenkinsfileStressTests.groovy b/JenkinsfileStressTests.groovy index 7fa42db..7d5b6cc 100644 --- a/JenkinsfileStressTests.groovy +++ b/JenkinsfileStressTests.groovy @@ -58,7 +58,7 @@ pipeline { sh "cd /srv && sudo btrfs subvolume snapshot bench-snapshot 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=elasticsearch -p 9200:9200 -v /srv/bench-running-docker/elasticsearch:/usr/share/elasticsearch/data/elasticsearch --env "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:6.3.2' - sh 'docker run -d --name=tika apache/tika:1.22' + sh 'docker run -d --name=tika apache/tika:1.24' sh 'docker run -d --name=swift -p 8080:8080 -v /srv/bench-running-docker/swift:/srv/1/node/sdb1 jeantil/openstack-keystone-swift:pike' 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 1ba9c30..43a9eea 100644 --- a/README.adoc +++ b/README.adoc @@ -236,7 +236,7 @@ You need a running *ElasticSearch* in docker. To achieve this run: If you want to use all the JMAP search capabilities, you may also need to start Tika: - $ docker run -d --name=tika apache/tika:1.22 + $ docker run -d --name=tika apache/tika:1.24 You can find more explanation on the need of Tika in this page http://james.apache.org/server/config-elasticsearch.html @@ -287,7 +287,7 @@ You can handle attachment text extraction before indexing in ElasticSearch. This Run tika: - $ docker run --name tika apache/tika:1.22 + $ docker run --name tika apache/tika:1.24 Add a link for the tika container in the above command line: @@ -318,7 +318,7 @@ You need a running *ElasticSearch* in docker. To achieve this run: If you want to use all the JMAP search capabilities, you may also need to start Tika: - $ docker run -d --name=tika apache/tika:1.22 + $ docker run -d --name=tika apache/tika:1.24 You can find more explanation on the need of Tika in this page http://james.apache.org/server/config-elasticsearch.html @@ -350,7 +350,7 @@ You can handle attachment text extraction before indexing in ElasticSearch. This Run tika: - $ docker run --name tika apache/tika:1.22 + $ docker run --name tika apache/tika:1.24 Add a link for the tika container in the above command line: diff --git a/dockerfiles/run/docker-compose.yml b/dockerfiles/run/docker-compose.yml index a3aff78..a048c99 100644 --- a/dockerfiles/run/docker-compose.yml +++ b/dockerfiles/run/docker-compose.yml @@ -34,7 +34,7 @@ services: - "9042:9042" tika: - image: apache/tika:1.22 + image: apache/tika:1.24 rabbitmq: image: rabbitmq:3.8.1-management diff --git a/server/testing/src/main/java/org/apache/james/util/docker/Images.java b/server/testing/src/main/java/org/apache/james/util/docker/Images.java index bd2f2e1..79bab14 100644 --- a/server/testing/src/main/java/org/apache/james/util/docker/Images.java +++ b/server/testing/src/main/java/org/apache/james/util/docker/Images.java @@ -25,7 +25,7 @@ public interface Images { String ELASTICSEARCH_2 = "elasticsearch:2.4.6"; String ELASTICSEARCH_6 = "docker.elastic.co/elasticsearch/elasticsearch:6.3.2"; String NGINX = "nginx:1.15.1"; - String TIKA = "apache/tika:1.22"; + String TIKA = "apache/tika:1.24"; String SPAMASSASSIN = "dinkel/spamassassin:3.4.0"; String MOCK_SMTP_SERVER = "linagora/mock-smtp-server"; } diff --git a/src/site/xdoc/server/config-elasticsearch.xml b/src/site/xdoc/server/config-elasticsearch.xml index 789f044..3a6f54e 100644 --- a/src/site/xdoc/server/config-elasticsearch.xml +++ b/src/site/xdoc/server/config-elasticsearch.xml @@ -186,7 +186,7 @@ Note: You can launch a tika server using this command line: - <code><pre>docker run --name tika linagora/docker-tikaserver:1.22</pre></code> + <code><pre>docker run --name tika linagora/docker-tikaserver:1.24</pre></code> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
