From c041364dbf3634e250f3ab7be5e577650f520e9d Mon Sep 17 00:00:00 2001 From: Markus Friedrich Date: Thu, 16 May 2024 16:35:45 +0200 Subject: [PATCH] [TASK] Apache Solr 9.6 compatibility Allows the usage of EXT:solr with Apache Solr 9.6, Apache Solr 9.6 is now the recommended version and tests will run against this version. Resolves: #4041 --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- Docker/SolrServer/Dockerfile | 2 +- Documentation/Appendix/VersionMatrix.rst | 2 +- composer.json | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6b27d54a47..e89e78e84a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -27,7 +27,7 @@ If applicable, add screenshots to help explain your problem. - TYPO3 Version: [e.g. 12.4.11] - Browser: [e.g. chrome, safari] - EXT:solr Version: [e.g. 12.0.2] - - Used Apache Solr Version: [e.g. 9.5.0] + - Used Apache Solr Version: [e.g. 9.6.0] - PHP Version: [e.g. 8.2.0] - MySQL Version: [e.g. 8.0.0] diff --git a/Docker/SolrServer/Dockerfile b/Docker/SolrServer/Dockerfile index 8b4744a161..ecb7f68ce8 100644 --- a/Docker/SolrServer/Dockerfile +++ b/Docker/SolrServer/Dockerfile @@ -1,4 +1,4 @@ -FROM solr:9.5.0 +FROM solr:9.6.0 MAINTAINER dkd Internet Service GmbH ENV TERM linux diff --git a/Documentation/Appendix/VersionMatrix.rst b/Documentation/Appendix/VersionMatrix.rst index 7e437e1dcb..73cc6c8a0d 100644 --- a/Documentation/Appendix/VersionMatrix.rst +++ b/Documentation/Appendix/VersionMatrix.rst @@ -14,7 +14,7 @@ List of EXT:solr versions and the matching versions of Apache Solr and TYPO3 tha ------------------------------- ---------------------------------------------- -------------------------------- --------------- --------------------------------- TYPO3 EXT:solr EXT:tika EXT:solrfal EXT:solrconsole EXT:solrdebugtools EXT:solrfluidgrouping EXT:solrmlt Apache Solr Configset ========= ========== ========== =========== =============== ================== ================================ =============== =============== ================= -12.4 12.0 12.0 12.0 12.0 12.0 N/A (integrated in EXT:solr) 12.0 (Ø) 9.5.0¹ ext_solr_12_0_0 +12.4 12.0 12.0 12.0 12.0 12.0 N/A (integrated in EXT:solr) 12.0 (Ø) 9.6.0¹ ext_solr_12_0_0 11.5 11.5 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 8.11.3¹ ext_solr_11_5_0 ========= ========== ========== =========== =============== ================== ================================ =============== =============== ================= diff --git a/composer.json b/composer.json index c3bf6edee1..c91c19b2c3 100644 --- a/composer.json +++ b/composer.json @@ -150,6 +150,7 @@ "ext-solrdebugtools": "^12.0", "ext-solrmlt": "^12.0", "Apache-Solr": [ + "9.6.0", "9.5.0", "9.4.1", "9.4.0",