!!![TASK] Upgrade to Apache Solr 9.3.0

Note this change requires on third party installations enabling stream feature via the ENV vars or system properties. Following variables are set in Docker images: * `SOLR_ENABLE_REMOTE_STREAMING=true` * `SOLR_ENABLE_STREAM_BODY=true` For more information see: * https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html#security * https://issues.apache.org/jira/browse/SOLR-14853 Fixes: #3747
TYPO3-Solr · Aug 10, 2023 · a2a60ab · a2a60ab
1 parent a1d154e
commit a2a60ab
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 11 deletions.
diff --git 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.0]
  - Browser: [e.g. chrome, safari]
  - EXT:solr Version: [e.g. 12.0.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/Classes/Report/SolrVersionStatus.php b/Classes/Report/SolrVersionStatus.php
@@ -35,7 +35,7 @@ class SolrVersionStatus extends AbstractSolrStatus
     /**
      * Required Solr version. The version that gets installed when using the provided Docker image.
      */
-    public const REQUIRED_SOLR_VERSION = '9.2.1';
+    public const REQUIRED_SOLR_VERSION = '9.3.0';
 
     /**
      * Compiles a version check against each configured Solr server.

diff --git a/Docker/SolrServer/Dockerfile b/Docker/SolrServer/Dockerfile
@@ -1,4 +1,4 @@
-FROM solr:9.2
+FROM solr:9.3.0
 MAINTAINER dkd Internet Service GmbH <[email protected]>
 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
@@ -19,7 +19,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.2.1           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.3.0           ext_solr_12_0_0
 11.5      11.5       11.0       11.0        11.0            11.0               11.0                             11.0 (Ø)        8.11.1          ext_solr_11_5_0
 ========= ========== ========== =========== =============== ================== ================================ =============== =============== =================
 

diff --git a/Documentation/Releases/solr-release-12-0.rst b/Documentation/Releases/solr-release-12-0.rst
@@ -18,6 +18,22 @@ Support of TYPO3 12 LTS
 
 With EXT:solr 12.0 we provide the support of TYPO3 12 LTS.
 
+!!! Upgrade to Apache Solr 9.3.0
+--------------------------------
+
+This release requires Apache Solr v 9.3.0+.
+
+**Note**: On third party installations enabling stream feature via the ENV vars or system properties is required.
+
+Following variables must be set in solr.in.sh file or in Solr system props:
+* `SOLR_ENABLE_REMOTE_STREAMING=true`
+* `SOLR_ENABLE_STREAM_BODY=true`
+
+For more information see:
+* https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html#security
+* https://issues.apache.org/jira/browse/SOLR-14853
+
+
 Reworked Search Query Component System
 --------------------------------------
 

diff --git a/Documentation/Solr/ConfigurationStructures.rst b/Documentation/Solr/ConfigurationStructures.rst
@@ -64,9 +64,10 @@ 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 <https://solr.apache.org/guide/solr/latest/indexing-guide/content-streams.html>`__
 
-* Create an init script that start Solr on boottime.
+* 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

diff --git a/Resources/Private/Solr/configsets/ext_solr_12_0_0/conf/solrconfig.xml b/Resources/Private/Solr/configsets/ext_solr_12_0_0/conf/solrconfig.xml
@@ -1,6 +1,6 @@
 <config name="tx_solr-12-0-0--20230602">
 
-	<luceneMatchVersion>9.2.0</luceneMatchVersion>
+	<luceneMatchVersion>9.3.0</luceneMatchVersion>
 
 	<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
@@ -132,8 +132,7 @@
 
 
 	<requestDispatcher handleSelect="false" >
-		<!-- Make sure your system has some authentication! before using enableRemoteStreaming="true" -->
-		<requestParsers enableRemoteStreaming="true" enableStreamBody="true" multipartUploadLimitInKB="2048000" />
+		<requestParsers multipartUploadLimitInKB="2048000" />
 
 		<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" />
 		<httpCaching never304="true"/>

diff --git a/composer.json b/composer.json
@@ -138,7 +138,7 @@
         "ext-solrconsole": "^12.0",
         "ext-solrdebugtools": "^12.0",
         "ext-solrmlt": "^12.0",
-        "Apache-Solr": "8.11.1",
+        "Apache-Solr": "9.3.0",
         "configset": "ext_solr_12_0_0"
       },
       "ext-solrfal": {