Skip to content

Commit

Permalink
[TASK] Prepare release-11.6.x for TYPO3 11.5 LTS
Browse files Browse the repository at this point in the history
  • Loading branch information
dkd-kaehm authored and dkd-friedrich committed Mar 7, 2024
1 parent 913f98e commit a25a12c
Show file tree
Hide file tree
Showing 11 changed files with 93 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-matrix.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"release-11.5.x": {
"release-11.6.x": {
"PHP": [ "7.4", "8.0", "8.1" ],
"TYPO3": [ "11", "11.5.x-dev" ]
}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: build

on:
push:
branches: [ main, release-11.5.x, release-11.1.x, release-11.0.x ]
branches: [ main, release-11.6.x ]
tags:
- "**"
pull_request:
branches: [ main, release-11.5.x, release-11.1.x, release-11.0.x ]
branches: [ main, release-11.6.x ]

env:
CI_BUILD_DIRECTORY: '/home/runner/work/ext-solr/ext-solr/.Build'
Expand Down
5 changes: 2 additions & 3 deletions Documentation/Appendix/VersionMatrix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ Appendix - Version Matrix

You are on docs for EXT:solr |release| version, please refer to `Version Matrix on main release <https://docs.typo3.org/p/apache-solr-for-typo3/solr/main/en-us/Releases/Index.html>`_ to see all versions.

.. tip::

See also EXT:solr v11.6 for TYPO3 11.5 LTS.


Requirements for EXT:solr* 11.5 stack
Requirements for EXT:solr* 11.6 stack
-------------------------------------

========= ========== ========== =========== =============== ================== ============================= =============== =============== =================
Basic components Funding contribution extensions Published funding contribution extensions Solr configuration
------------------------------- ---------------------------------------------- --------------------------------------------- ---------------------------------
TYPO3 EXT: solr EXT:tika EXT:solrfal EXT:solrconsole EXT:solrdebugtools EXT:solrfluidgrouping EXT:solrmlt Apache Solr Configset
========= ========== ========== =========== =============== ================== ============================= =============== =============== =================
11.5 11.5 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 8.11.3¹ ext_solr_11_5_0
11.5 11.6 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 8.11.3¹ ext_solr_11_6_0
========= ========== ========== =========== =============== ================== ============================= =============== =============== =================

| ¹ - recommended Apache Solr version, check version matrix in composer.json (composer info:solr-versions) for full list
Expand Down
1 change: 1 addition & 0 deletions Documentation/Releases/Archive/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Archive
:titlesonly:
:glob:

solr-release-11-5.rst
solr-release-11-1.rst
solr-release-10-0.rst
solr-release-9-0.rst
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Release 11.5.1
We are happy to publish EXT:solr 11.5.1 maintenance release

New in this release
-------------------
~~~~~~~~~~~~~~~~~~~

- [BUGFIX] Do not include removed strptime() by @dkd-kaehm in `#3335 <https://github.com/TYPO3-Solr/ext-solr/pull/3335>`__
- [BUGFIX:BP:11.5] Do not handle page updates on new page with uid 0 by @rr-it in `#3344 <https://github.com/TYPO3-Solr/ext-solr/pull/3344>`__
Expand Down Expand Up @@ -173,34 +173,34 @@ The focus of this release has been on TYPO3 11 LTS compatibility.
This version is installable with TYPO3 11 LTS on v11.5.14+ only and contains some breaking changes, see details below.

New in this release
-------------------
~~~~~~~~~~~~~~~~~~~

Support of TYPO3 11 LTS
~~~~~~~~~~~~~~~~~~~~~~~
^^^^^^^^^^^^^^^^^^^^^^^

With EXT:solr 11.5 we provide the support of TYPO3 11 LTS.

Please note that we require at least TYPO3 11.5.14, as this version contains some change concerning the usage of local TypoScriptFrontendController objects that are solving some issues during indexing.


Bootstrap 5.1
~~~~~~~~~~~~~
^^^^^^^^^^^^^

The default templates provided by EXT:solr were adapted for Bootstrap 5.1.

The templates are also prepared to display some icons with Bootstrap Icons, but the usage is optional and the icons are no longer provided with EXT:solr as the former Glyphicons were.


Custom field processors
~~~~~~~~~~~~~~~~~~~~~~~
^^^^^^^^^^^^^^^^^^^^^^^

fieldProcessingInstructions can be used for processing values during indexing, e.g. timestampToIsoDate or uppercase. Now you can register and use your own field processors via:
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['fieldProcessor']['yourFieldProcessor'] = ACustomFieldProcessor::class;

Custom processors have to implement interface ApacheSolrForTypo3\Solr\FieldProcessor\FieldProcessor.

N-Gram Filter for strings
~~~~~~~~~~~~~~~~~~~~~~~~~
^^^^^^^^^^^^^^^^^^^^^^^^^

Provides a new field type and dynamic fields for strings
with enabled Edge-N-Gram filter.
Expand All @@ -210,7 +210,7 @@ Now the following fields can be used:
- \*_stringEdgeNgramM

Improve and Fix TSFE Initialization
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

The initialization of TSFE within indexing and Backends modules contexts is refactored.

Expand All @@ -228,7 +228,7 @@ Note: Since TYPO3 11 LTS does not allow to instantiate TSFE for sys folders and
the initialization of TSFE will be done for first and closest page(not spacer or folder) within the site rootline.

Get "free content mode" working
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

In previous releases of EXT:solr the language handling for "free-content-mode" inconsistent.
The behavior of "free-content-mode" related records varied in RecordMonitor, Initializing and Indexing contexts,
Expand All @@ -238,22 +238,22 @@ This change brings the RecordMonitor, Initializing and Indexing contexts for "fr
into the same line, so the "free-content-mode" records are processed the same way.

Make pageRangeFirst and pageRangeLast accessible in fluid
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

With these two additional getters it is possible to access the variables
in fluid templates. See: `#3254 <https://github.com/TYPO3-Solr/ext-solr/issues/3254>`_

Add custom field processors
~~~~~~~~~~~~~~~~~~~~~~~~~~~
^^^^^^^^^^^^^^^^^^^^^^^^^^^

Custom field processors can be registered with

.. code-block:: php
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['fieldProcessor']['yourFieldProcessor'] = ACustomFieldProcessor::class;
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['fieldProcessor']['yourFieldProcessor'] = ACustomFieldProcessor::class;
And many more
~~~~~~~~~~~~~
^^^^^^^^^^^^^

Please see the list of changes below or `the full changelog: <https://github.com/TYPO3-Solr/ext-solr/compare/c0a3e62053e1c929c914d25ced1fef3d9868d4f9...11.5.0>`_.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/Releases/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Releases
:titlesonly:
:glob:

solr-release-11-5
solr-release-11-6
solr-release-11-2
solr-release-11-0
Archive/Index
61 changes: 61 additions & 0 deletions Documentation/Releases/solr-release-11-6.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
.. include:: /Includes.rst.txt
.. index:: Releases
.. _releases-11-6:

==============
Release 11.6.0
==============

We are happy to release EXT:solr 11.6.0.
The focus of this release has been on Apache Solr upgrade to v 9.3.0.

**Important**: This version is installable with TYPO3 11 LTS on v11.5.14+ only and contains some breaking changes, see details below.

New in this release
-------------------

And many more
~~~~~~~~~~~~~

Please see the list of changes below or `the full changelog: <https://github.com/TYPO3-Solr/ext-solr/compare/""TBD""...11.6.0>`_.

The list of all changes:
~~~~~~~~~~~~~~~~~~~~~~~~


Contributors
============

Like always this release would not have been possible without the help from our
awesome community. Here are the contributors to this release.

(patches, comments, bug reports, reviews, ... in alphabetical order)

* Christoph Lehmann
* Markus Friedrich
* Rafael Kähm

Also a big thank you to our partners who have already concluded one of our new development participation packages such as Apache Solr EB for TYPO3 11 LTS (Feature), Apache Solr EB for TYPO3 10 LTS (Maintenance)
or Apache Solr EB for TYPO3 9 ELTS (Extended):

TBD

How to Get Involved
===================

There are many ways to get involved with Apache Solr for TYPO3:

* Submit bug reports and feature requests on [GitHub](https://github.com/TYPO3-Solr/ext-solr)
* Ask or help or answer questions in our [Slack channel](https://typo3.slack.com/messages/ext-solr/)
* Provide patches through Pull Request or review and comment on existing [Pull Requests](https://github.com/TYPO3-Solr/ext-solr/pulls)
* Go to [www.typo3-solr.com](http://www.typo3-solr.com) or call [dkd](http://www.dkd.de) to sponsor the ongoing development of Apache Solr for TYPO3

Support us by becoming an EB partner:

https://shop.dkd.de/Produkte/Apache-Solr-fuer-TYPO3/

or call:

+49 (0)69 - 2475218 0


4 changes: 2 additions & 2 deletions Documentation/Settings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
[general]

project = Apache Solr for TYPO3
version = 11.5
release = 11.5.6
version = 11.6
release = 11.6.0
copyright = since 2009 by dkd & contributors

[html_theme_options]
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
[![TYPO3 11](https://img.shields.io/badge/TYPO3-11-orange.svg?style=flat-square)](https://get.typo3.org/version/11)
[![Total Downloads](http://poser.pugx.org/apache-solr-for-typo3/solr/downloads)](https://packagist.org/packages/apache-solr-for-typo3/solr)
[![Monthly Downloads](https://poser.pugx.org/apache-solr-for-typo3/solr/d/monthly)](https://packagist.org/packages/apache-solr-for-typo3/solr)
[![Build Status](https://github.com/TYPO3-Solr/ext-solr/actions/workflows/ci.yml/badge.svg?branch=release-11.5.x)](https://github.com/TYPO3-Solr/ext-solr/actions?query=branch:release-11.5.x)
[![Code Coverage](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/coverage.png?b=release-11.5.x)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=release-11.5.x)
[![Build Status](https://github.com/TYPO3-Solr/ext-solr/actions/workflows/ci.yml/badge.svg?branch=release-11.6.x)](https://github.com/TYPO3-Solr/ext-solr/actions?query=branch:release-11.6.x)
[![Code Coverage](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/coverage.png?b=release-11.6.x)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=release-11.6.x)

# Apache Solr for TYPO3 CMS

Expand All @@ -27,7 +27,7 @@ Further details including a comparison chart are provided at the program homepag
| | URL |
|------------------|-----------------------------------------------------------------|
| **Repository:** | https://github.com/TYPO3-Solr/ext-solr |
| **Read online:** | https://docs.typo3.org/p/apache-solr-for-typo3/solr/11.5/en-us/ |
| **Read online:** | https://docs.typo3.org/p/apache-solr-for-typo3/solr/11.6/en-us/ |
| **TER:** | https://extensions.typo3.org/extension/solr |
| **Homepage:** | https://www.typo3-solr.com/ |

Expand Down
8 changes: 6 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
},
"extra": {
"branch-alias": {
"dev-release-11.5.x": "11.5.x-dev"
"dev-release-11.6.x": "11.6.x-dev"
},
"typo3/cms": {
"extension-key": "solr",
Expand All @@ -151,9 +151,13 @@
"8.11.2",
"8.11.1"
],
"configset": "ext_solr_11_5_0"
"configset": "ext_solr_11_6_0"
},
"ext-solrfal": {
},
"stack-for-ci": {
"sclable/xml-lint": "*",
"scrutinizer/ocular": "*"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
$EM_CONF[$_EXTKEY] = [
'title' => 'Apache Solr for TYPO3 - Enterprise Search',
'description' => 'Apache Solr for TYPO3 is the enterprise search server you were looking for with special features such as Faceted Search or Synonym Support and incredibly fast response times of results within milliseconds.',
'version' => '11.5.6',
'state' => 'stable',
'version' => '11.6.0',
'state' => 'beta',
'category' => 'plugin',
'author' => 'Ingo Renner, Timo Hund, Markus Friedrich',
'author_email' => '[email protected]',
Expand Down

0 comments on commit a25a12c

Please sign in to comment.