diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b09f5c8260..63ad2d8987 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. 11.5.36] - Browser: [e.g. chrome, safari] - EXT:solr Version: [e.g. 11.6.0] - - Used Apache Solr Version: [e.g. 9.2.1] + - Used Apache Solr Version: [e.g. 9.3.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 42fafc100a..367147e6dc 100644 --- a/Docker/SolrServer/Dockerfile +++ b/Docker/SolrServer/Dockerfile @@ -1,4 +1,4 @@ -FROM solr:9.2.1 +FROM solr:9.3.0 MAINTAINER dkd Internet Service GmbH ENV TERM linux @@ -11,7 +11,12 @@ RUN rm -fR /opt/solr/server/solr/* \ && groupmod --non-unique --gid "${SOLR_UNIX_GID}" solr \ && chown -R solr:solr /var/solr /opt/solr \ && apt update && apt upgrade -y && apt install sudo -y \ - && echo "solr ALL=NOPASSWD: /docker-entrypoint-initdb.d/as-sudo/*" > /etc/sudoers.d/solr + && echo "solr ALL=NOPASSWD: /docker-entrypoint-initdb.d/as-sudo/*" > /etc/sudoers.d/solr \ + && echo "# EXT:solr relevant changes: " >> /etc/default/solr.in.sh \ + && echo "SOLR_ENABLE_REMOTE_STREAMING=true" >> /etc/default/solr.in.sh \ + && echo "SOLR_ENABLE_STREAM_BODY=true" >> /etc/default/solr.in.sh \ + && echo "# END: EXT:solr" >> /etc/default/solr.in.sh \ + COPY Docker/SolrServer/docker-entrypoint-initdb.d/ /docker-entrypoint-initdb.d USER solr diff --git a/Documentation/Appendix/VersionMatrix.rst b/Documentation/Appendix/VersionMatrix.rst index fb4f1fb7bf..dd07061bb8 100644 --- a/Documentation/Appendix/VersionMatrix.rst +++ b/Documentation/Appendix/VersionMatrix.rst @@ -20,7 +20,7 @@ Requirements for EXT:solr* 11.6 stack ------------------------------- ---------------------------------------------- --------------------------------------------- --------------------------------- TYPO3 EXT: solr EXT:tika EXT:solrfal EXT:solrconsole EXT:solrdebugtools EXT:solrfluidgrouping EXT:solrmlt Apache Solr Configset ========= ========== ========== =========== =============== ================== ============================= =============== =============== ================= -11.5 11.6 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 9.2.1¹ ext_solr_11_6_0 +11.5 11.6 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 9.3.0¹ ext_solr_11_6_0 ========= ========== ========== =========== =============== ================== ============================= =============== =============== ================= | ¹ - recommended Apache Solr version, check version matrix in composer.json (`composer info:solr-versions`) for full list \ No newline at end of file diff --git a/Documentation/Solr/ConfigurationStructures.rst b/Documentation/Solr/ConfigurationStructures.rst index 0226bb5bd6..a530b24840 100644 --- a/Documentation/Solr/ConfigurationStructures.rst +++ b/Documentation/Solr/ConfigurationStructures.rst @@ -64,11 +64,12 @@ When you want to install solr on your system in another way the following steps * Install the solr server * Copy the configsets into the configset folder (by default $SOLR_HOME/server/solr/configsets) -* Make sure that the solr.xml file ($SOLR_HOME/server/solr/solr.xml) is in place an fits to your solr version +* Make sure that the solr.xml file ($SOLR_HOME/server/solr/solr.xml) is in place and fits to your Solr version +* Enable Content Streams. EXT:solr uses content streams and requires environment variables SOLR_ENABLE_REMOTE_STREAMING and SOLR_ENABLE_STREAM_BODY to be set, see section `Content Streams in the Reference Guide `__ -* Create an init script that start solr on boottime. -* Secure your solr port from outside. -* Make sure that solr is running with an own user. +* Create an init script that starts Solr on boottime. +* Secure your Solr port from outside. +* Make sure that Solr is running with an own user. * Backup your data folders *Hint:* Apache Solr ships an install script in newer version that might cover your requirements for production diff --git a/Resources/Private/Solr/configsets/ext_solr_11_6_0/conf/solrconfig.xml b/Resources/Private/Solr/configsets/ext_solr_11_6_0/conf/solrconfig.xml index ca0745fb65..24a9f8bc6a 100644 --- a/Resources/Private/Solr/configsets/ext_solr_11_6_0/conf/solrconfig.xml +++ b/Resources/Private/Solr/configsets/ext_solr_11_6_0/conf/solrconfig.xml @@ -1,6 +1,6 @@ - 9.2.0 + 9.3.0 ${solr.abortOnConfigurationError:true} @@ -132,8 +132,7 @@ - - + diff --git a/composer.json b/composer.json index 3fe09765a5..94babe97db 100644 --- a/composer.json +++ b/composer.json @@ -166,7 +166,7 @@ "ext-solrfluidgrouping": "^11.0", "ext-solrmlt": "^11.0", "Apache-Solr": [ - "9.2.1" + "9.3.0" ], "configset": "ext_solr_11_6_0" },