Skip to content

Commit

Permalink
[TASK] Use Apache Solr 9.2 for EXT:solr 12.0
Browse files Browse the repository at this point in the history
Updates to Apache Solr 9.2, this includes the required
configuration updates. luceneMatchVersion is sill set to 8.5.0
to prevent changes in search behaviour.

To avoid security issues described in CVE-2022-39135 the SQL
module is not enabled, you have to enabled the module manually
if required.

Note: With Apache Solr 9 the following components are no longer
available and you have to adapt the configuration if needed. No
longer available components are:

1) Data Import Handler (DIH)
DIH is an independent project now; it is no longer a part of Solr

2) VelocityResponseWriter
VelocityResponseWriter is an independent project now; it is no
longer a part of Solr. This encompasses all previously included
/browse and wt=velocity examples.

This update is considered as breaking, as a new Solr server
and configset is required, but though not recommended you
can still use your old configset and Solr 8.5 if an update is
not possible.

Fixes: #3661
  • Loading branch information
dkd-kaehm committed Jun 5, 2023
1 parent 092e2a7 commit 1b75d38
Show file tree
Hide file tree
Showing 240 changed files with 117 additions and 383 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.0]
- Used Apache Solr Version: [e.g. 9.2.1]
- PHP Version: [e.g. 8.2.0]
- MySQL Version: [e.g. 8.0.0]

Expand Down
2 changes: 0 additions & 2 deletions Build/Test/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,3 @@ then
"The test environment could not be installed by composer as expected. Please fix this issue."
exit 1
fi

mkdir -p $TYPO3_PATH_WEB/uploads $TYPO3_PATH_WEB/typo3temp
2 changes: 1 addition & 1 deletion Classes/Report/AccessFilterPluginInstalledStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class AccessFilterPluginInstalledStatus extends AbstractSolrStatus
*
* Must be updated when changing the plugin.
*/
public const RECOMMENDED_PLUGIN_VERSION = '3.0.0';
public const RECOMMENDED_PLUGIN_VERSION = '6.0.0';

/**
* The plugin's Java class name.
Expand Down
2 changes: 1 addition & 1 deletion Classes/Report/SchemaStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SchemaStatus extends AbstractSolrStatus
*
* Must be updated when changing the schema.
*/
public const RECOMMENDED_SCHEMA_VERSION = 'tx_solr-11-5-0--20211001';
public const RECOMMENDED_SCHEMA_VERSION = 'tx_solr-12-0-0--20230602';

/**
* Compiles a collection of schema version checks against each configured
Expand Down
2 changes: 1 addition & 1 deletion Classes/Report/SolrConfigStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SolrConfigStatus extends AbstractSolrStatus
*
* Must be updated when changing the solrconfig.
*/
public const RECOMMENDED_SOLRCONFIG_VERSION = 'tx_solr-11-5-0--20211001';
public const RECOMMENDED_SOLRCONFIG_VERSION = 'tx_solr-12-0-0--20230602';

/**
* Compiles a collection of solrconfig version checks against each configured
Expand Down
5 changes: 2 additions & 3 deletions Classes/Report/SolrVersionStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@
class SolrVersionStatus extends AbstractSolrStatus
{
/**
* Required Solr version. The version that gets installed when using the
* provided install-script EXT:solr/Resources/Private/Install/install-solr.sh
* Required Solr version. The version that gets installed when using the provided Docker image.
*/
public const REQUIRED_SOLR_VERSION = '8.11.1';
public const REQUIRED_SOLR_VERSION = '9.2.1';

/**
* Compiles a version check against each configured Solr server.
Expand Down
2 changes: 1 addition & 1 deletion Docker/SolrServer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM solr:8.11.1
FROM solr:9.2
MAINTAINER dkd Internet Service GmbH <[email protected]>
ENV TERM linux

Expand Down
6 changes: 3 additions & 3 deletions Documentation/Appendix/VersionMatrix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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 (Ø) 12.0 (Ø) 12.0 (Ø) 9.2.0 ext_solr_12_0_0
12.4 12.0 (ᾱ) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 9.2.1 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 All @@ -35,8 +35,8 @@ selected older versions. The following table illustrates the offers and availabl
-------------------------------- ---------------------------------------------- ------------------------------------
TYPO3 EXT: solr EXT:tika EXT:solrfal EXT:solrconsole EXT:solrdebugtools Apache Solr Configset
========= =========== ========== =========== =============== ================== =============== ====================
10.4 11.2.3+ Ø 10.0 10.0 10.0 10.0 9.2.0 ext_solr_11_2_0_elts
9.5-10.4 11.0.8+ 6.0.3+ 8.0.2+ 4.0.2+ 1.1.3+ 9.2.0 ext_solr_11_0_0_elts
10.4 11.2.3+ Ø 10.0 10.0 10.0 10.0 9.2.1 ext_solr_11_2_0_elts
9.5-10.4 11.0.8+ 6.0.3+ 8.0.2+ 4.0.2+ 1.1.3+ 9.2.1 ext_solr_11_0_0_elts
========= =========== ========== =========== =============== ================== =============== ====================

Our Apache Solr for TYPO3 EB-partners newsletter will keep you updated!
Expand Down
20 changes: 1 addition & 19 deletions Documentation/GettingStarted/Solr.rst
Original file line number Diff line number Diff line change
Expand Up @@ -148,28 +148,10 @@ The following example shows how you can run our configuration with the official
sudo chown -R 8983:8983 ~/mysolr
docker run -d -p 8983:8983 -v ~/mysolr:/var/solr/data solr:8.5
Shipped install script (Not recommended)
----------------------------------------

With the extension we ship and install script that can be used for a **development** context or as inspiration for own deployments. It creates a solr server with a core for all languages.
This script is located in "Resources/Private/Install" an it installs a configured solr server that is usable with EXT:solr.

By default this script is not executable and you need to add the execute permissions to your user to run it.

The example below shows how to install a solr server to /home/developer

.. code-block:: bash
chmod u+x ./Resources/Private/Install/install-solr.sh
./Resources/Private/Install/install-solr.sh -d /home/developer
After running the script you are able to open a solr server with over the loopback address. Which means, when you want to access it from outside, you need to create an ssh tunnel.

Other Setup
-----------

Beside the install script and Docker there are various possibilities to setup solr. All of these possibilities are not
Beside the Docker there are various possibilities to setup solr. All of these possibilities are not
officially supported, but the simplify the setup i want to mention them shortly here and summarize the needed steps.

Known Installers
Expand Down
2 changes: 0 additions & 2 deletions Resources/Private/Install/.htaccess

This file was deleted.

227 changes: 0 additions & 227 deletions Resources/Private/Install/install-solr.sh

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
status report - tx_solr_report_SchemaStatus - checking against this
name property, that status check must be updated as well.
-->
<schema name="tx_solr-11-5-0--20211001" version="1.6">
<schema name="tx_solr-12-0-0--20230602" version="1.6">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.4" is Solr's version number for the schema syntax and semantics. It should
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
status report - tx_solr_report_SchemaStatus - checking against this
name property, that status check must be updated as well.
-->
<schema name="tx_solr-11-5-0--20211001" version="1.6">
<schema name="tx_solr-12-0-0--20230602" version="1.6">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.4" is Solr's version number for the schema syntax and semantics. It should
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
status report - tx_solr_report_SchemaStatus - checking against this
name property, that status check must be updated as well.
-->
<schema name="tx_solr-11-5-0--20211001" version="1.6">
<schema name="tx_solr-12-0-0--20230602" version="1.6">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.4" is Solr's version number for the schema syntax and semantics. It should
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
status report - tx_solr_report_SchemaStatus - checking against this
name property, that status check must be updated as well.
-->
<schema name="tx_solr-11-5-0--20211001" version="1.6">
<schema name="tx_solr-12-0-0--20230602" version="1.6">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.4" is Solr's version number for the schema syntax and semantics. It should
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
status report - tx_solr_report_SchemaStatus - checking against this
name property, that status check must be updated as well.
-->
<schema name="tx_solr-11-5-0--20211001" version="1.6">
<schema name="tx_solr-12-0-0--20230602" version="1.6">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.4" is Solr's version number for the schema syntax and semantics. It should
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
status report - tx_solr_report_SchemaStatus - checking against this
name property, that status check must be updated as well.
-->
<schema name="tx_solr-11-5-0--20211001" version="1.6">
<schema name="tx_solr-12-0-0--20230602" version="1.6">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
Applications should change this to reflect the nature of the search collection.
version="1.4" is Solr's version number for the schema syntax and semantics. It should
Expand Down
Loading

0 comments on commit 1b75d38

Please sign in to comment.