Skip to content

Commit

Permalink
!!![TASK] Upgrade to Apache Solr 9.3.0
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dkd-kaehm committed Aug 7, 2023
1 parent 4dd5d41 commit 4a81f5e
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1]
- PHP Version: [e.g. 8.2.0]
- MySQL Version: [e.g. 8.0.0]

Expand Down
2 changes: 1 addition & 1 deletion Classes/Report/SolrVersionStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 7 additions & 2 deletions Docker/SolrServer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM solr:9.2
FROM solr:9.3.0
MAINTAINER dkd Internet Service GmbH <[email protected]>
ENV TERM linux

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Documentation/Appendix/VersionMatrix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
========= ========== ========== =========== =============== ================== ================================ =============== =============== =================

Expand Down
16 changes: 16 additions & 0 deletions Documentation/Releases/solr-release-12-0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------------------------------------

Expand Down
Original file line number Diff line number Diff line change
@@ -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>

Expand Down Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit 4a81f5e

Please sign in to comment.