Skip to content

Commit 2a5ba8f

Browse files
dkd-kaehmdkd-kaehm
committed
[TASK] Prepare release-11.6.x for TYPO3 11.5 LTS
Relates: #3781
1 parent db3f169 commit 2a5ba8f

File tree

11 files changed

+104
-48
lines changed

11 files changed

+104
-48
lines changed

‎.github/workflows/ci-matrix.json‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
{
2-
"main": {
2+
"release-11.6.x": {
33
"PHP": [ "7.4", "8.0", "8.1" ],
44
"TYPO3": [ "11", "11.5.x-dev" ]
5-
},
6-
7-
"release-11.5.x": {
8-
"PHP": [ "7.4", "8.0", "8.1" ],
9-
"TYPO3": [ "11", "11.5.x-dev" ]
10-
},
11-
12-
"release-11.1.x": {
13-
"PHP": [ "7.2", "7.3", "7.4" ],
14-
"TYPO3": [ "10", "10.4.x-dev" ]
15-
},
16-
17-
"release-11.0.x": {
18-
"PHP": [ "7.2", "7.3", "7.4" ],
19-
"TYPO3": [ "9", "10", "9.5.x-dev", "10.4.x-dev" ]
205
}
216
}

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: build
22

33
on:
44
push:
5-
branches: [ main, release-11.5.x, release-11.1.x, release-11.0.x ]
5+
branches: [ main, release-11.6.x ]
66
tags:
77
- "**"
88
pull_request:
9-
branches: [ main, release-11.5.x, release-11.1.x, release-11.0.x ]
9+
branches: [ main, release-11.6.x ]
1010

1111
env:
1212
CI_BUILD_DIRECTORY: '/home/runner/work/ext-solr/ext-solr/.Build'

‎Documentation/Appendix/VersionMatrix.rst‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,14 @@ Appendix - Version Matrix
88

99
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.
1010

11-
.. tip::
1211

13-
There is EXT:solr v11.6 for TYPO3 11.5 LTS.
14-
15-
16-
Requirements for EXT:solr* 11.5 stack
12+
Requirements for EXT:solr* 11.6 stack
1713
-------------------------------------
1814

1915
========= ========== ========== =========== =============== ================== ============================= =============== =============== =================
2016
Basic components Funding contribution extensions Published funding contribution extensions Solr configuration
2117
------------------------------- ---------------------------------------------- --------------------------------------------- ---------------------------------
2218
TYPO3 EXT: solr EXT:tika EXT:solrfal EXT:solrconsole EXT:solrdebugtools EXT:solrfluidgrouping EXT:solrmlt Apache Solr Configset
2319
========= ========== ========== =========== =============== ================== ============================= =============== =============== =================
24-
11.5 11.5 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 8.11.1 ext_solr_11_5_0
20+
11.5 11.6 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 9.3 ext_solr_11_6_0
2521
========= ========== ========== =========== =============== ================== ============================= =============== =============== =================

‎Documentation/Releases/Index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Releases
1414
:glob:
1515

1616
new-releases
17-
solr-release-11-5
17+
solr-release-11-6
1818
solr-release-11-2
1919
solr-release-11-0
2020
archive

‎Documentation/Releases/archive.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Archive
1313
:titlesonly:
1414
:glob:
1515

16+
solr-release-11-5
1617
solr-release-11-1
1718
solr-release-10-0
1819
solr-release-9-0

‎Documentation/Releases/solr-release-11-5.rst‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ This is a maintenance release for TYPO3 11.5, containing:
5151
Release 11.5.2
5252
--------------
5353

54+
Release 11.5.2
55+
--------------
56+
5457
This is a maintenance release for TYPO3 11.5, containing:
5558

5659
- [BUGFIX:BP:11.5] Fix error when indexing pages with field processing instruction categoryUidToHierarchy by @dkd-kaehm in `#3462 <https://github.com/TYPO3-Solr/ext-solr/pull/3462>`__
@@ -86,7 +89,7 @@ Release 11.5.1
8689
We are happy to publish EXT:solr 11.5.1 maintenance release
8790

8891
New in this release
89-
-------------------
92+
~~~~~~~~~~~~~~~~~~~
9093

9194
- [BUGFIX] Do not include removed strptime() by @dkd-kaehm in https://github.com/TYPO3-Solr/ext-solr/pull/3335
9295
- [BUGFIX:BP:11.5] Do not handle page updates on new page with uid 0 by @rr-it in https://github.com/TYPO3-Solr/ext-solr/pull/3344
@@ -112,6 +115,10 @@ New in this release
112115
Please read the release notes:
113116
https://github.com/TYPO3-Solr/ext-solr/releases/tag/11.5.1
114117

118+
Release 11.5.0
119+
--------------
120+
121+
115122
Release 11.5.0
116123
--------------
117124

@@ -123,34 +130,34 @@ The focus of this release has been on TYPO3 11 LTS compatibility.
123130
**Important**: This version is installable with TYPO3 11 LTS on v11.5.14+ only and contains some breaking changes, see details below.
124131

125132
New in this release
126-
-------------------
133+
~~~~~~~~~~~~~~~~~~~
127134

128135
Support of TYPO3 11 LTS
129-
~~~~~~~~~~~~~~~~~~~~~~~
136+
^^^^^^^^^^^^^^^^^^^^^^^
130137

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

133140
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.
134141

135142

136143
Bootstrap 5.1
137-
~~~~~~~~~~~~~
144+
^^^^^^^^^^^^^
138145

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

141148
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.
142149

143150

144151
Custom field processors
145-
~~~~~~~~~~~~~~~~~~~~~~~
152+
^^^^^^^^^^^^^^^^^^^^^^^
146153

147154
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:
148155
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['fieldProcessor']['yourFieldProcessor'] = ACustomFieldProcessor::class;
149156

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

152159
N-Gram Filter for strings
153-
~~~~~~~~~~~~~~~~~~~~~~~~~
160+
^^^^^^^^^^^^^^^^^^^^^^^^^
154161

155162
Provides a new field type and dynamic fields for strings
156163
with enabled Edge-N-Gram filter.
@@ -160,7 +167,7 @@ Now the following fields can be used:
160167
- \*_stringEdgeNgramM
161168

162169
Improve and Fix TSFE Initialization
163-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
170+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
164171

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

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

180187
Get "free content mode" working
181-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
188+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
182189

183190
In previous releases of EXT:solr the language handling for "free-content-mode" inconsistent.
184191
The behavior of "free-content-mode" related records varied in RecordMonitor, Initializing and Indexing contexts,
@@ -188,27 +195,29 @@ This change brings the RecordMonitor, Initializing and Indexing contexts for "fr
188195
into the same line, so the "free-content-mode" records are processed the same way.
189196

190197
Make pageRangeFirst and pageRangeLast accessible in fluid
191-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
198+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
192199

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

196203
Add custom field processors
197-
~~~~~~~~~~~~~~~~~~~~~~~~~~~
204+
^^^^^^^^^^^^^^^^^^^^^^^^^^^
198205

199206
Custom field processors can be registered with
200207

201208
.. code-block:: php
202209
203210
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['fieldProcessor']['yourFieldProcessor'] = ACustomFieldProcessor::class;
204211
212+
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['fieldProcessor']['yourFieldProcessor'] = ACustomFieldProcessor::class;
213+
205214
And many more
206-
~~~~~~~~~~~~~
215+
^^^^^^^^^^^^^
207216

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

210219
The list of all changes:
211-
~~~~~~~~~~~~~~~~~~~~~~~~
220+
^^^^^^^^^^^^^^^^^^^^^^^^
212221

213222
- [TASK] Prepare schemas for EXT:solr 11.5.x `c0a3e6205 <https://github.com/TYPO3-Solr/ext-solr/commit/c0a3e6205>`_
214223
- [TASK] Provide N-Gram Filter for strings `13b90a996 <https://github.com/TYPO3-Solr/ext-solr/commit/13b90a996>`_

‎Documentation/Releases/solr-release-11-6.rst‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
.. include:: /Includes.rst.txt
2+
.. index:: Releases
3+
.. _releases-11-6:
4+
5+
==============
6+
Release 11.6.0
7+
==============
8+
9+
We are happy to release EXT:solr 11.6.0.
10+
The focus of this release has been on Apache Solr upgrade to v 9.3.0.
11+
12+
**Important**: This version is installable with TYPO3 11 LTS on v11.5.14+ only and contains some breaking changes, see details below.
13+
14+
New in this release
15+
-------------------
16+
17+
And many more
18+
~~~~~~~~~~~~~
19+
20+
Please see the list of changes below or `the full changelog: <https://github.com/TYPO3-Solr/ext-solr/compare/""TBD""...11.6.0>`_.
21+
22+
The list of all changes:
23+
~~~~~~~~~~~~~~~~~~~~~~~~
24+
25+
26+
Contributors
27+
============
28+
29+
Like always this release would not have been possible without the help from our
30+
awesome community. Here are the contributors to this release.
31+
32+
(patches, comments, bug reports, reviews, ... in alphabetical order)
33+
34+
* Christoph Lehmann
35+
* Markus Friedrich
36+
* Rafael Kähm
37+
38+
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)
39+
or Apache Solr EB for TYPO3 9 ELTS (Extended):
40+
41+
TBD
42+
43+
How to Get Involved
44+
===================
45+
46+
There are many ways to get involved with Apache Solr for TYPO3:
47+
48+
* Submit bug reports and feature requests on [GitHub](https://github.com/TYPO3-Solr/ext-solr)
49+
* Ask or help or answer questions in our [Slack channel](https://typo3.slack.com/messages/ext-solr/)
50+
* Provide patches through Pull Request or review and comment on existing [Pull Requests](https://github.com/TYPO3-Solr/ext-solr/pulls)
51+
* 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
52+
53+
Support us by becoming an EB partner:
54+
55+
https://shop.dkd.de/Produkte/Apache-Solr-fuer-TYPO3/
56+
57+
or call:
58+
59+
+49 (0)69 - 2475218 0
60+
61+

‎Documentation/Settings.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[general]
55

66
project = Apache Solr for TYPO3
7-
version = 11.5
8-
release = 11.5.4
7+
version = 11.6
8+
release = 11.6.0
99
copyright = since 2009 by dkd & contributors
1010

1111
[html_theme_options]

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
[![TYPO3 11](https://img.shields.io/badge/TYPO3-11-orange.svg?style=flat-square)](https://get.typo3.org/version/11)
44
[![Total Downloads](http://poser.pugx.org/apache-solr-for-typo3/solr/downloads)](https://packagist.org/packages/apache-solr-for-typo3/solr)
55
[![Monthly Downloads](https://poser.pugx.org/apache-solr-for-typo3/solr/d/monthly)](https://packagist.org/packages/apache-solr-for-typo3/solr)
6-
[![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)
7-
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/quality-score.png?b=release-11.5.x)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=release-11.5.x)
8-
[![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)
6+
[![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)
7+
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/badges/quality-score.png?b=release-11.6.x)](https://scrutinizer-ci.com/g/TYPO3-Solr/ext-solr/?branch=release-11.6.x)
8+
[![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)
99

1010
# Apache Solr for TYPO3 CMS
1111

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

‎composer.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
},
126126
"extra": {
127127
"branch-alias": {
128-
"dev-release-11.5.x": "11.5.x-dev"
128+
"dev-release-11.6.x": "11.6.x-dev"
129129
},
130130
"typo3/cms": {
131131
"extension-key": "solr",
@@ -140,10 +140,14 @@
140140
"ext-solrdebugtools": "^11.0",
141141
"ext-solrfluidgrouping": "^11.0",
142142
"ext-solrmlt": "^11.0",
143-
"Apache-Solr": "8.11.1",
144-
"configset": "ext_solr_11_5_0"
143+
"Apache-Solr": "9.3.0",
144+
"configset": "ext_solr_11_6_0"
145145
},
146146
"ext-solrfal": {
147+
},
148+
"stack-for-ci": {
149+
"sclable/xml-lint": "*",
150+
"scrutinizer/ocular": "*"
147151
}
148152
}
149153
}

0 commit comments

Comments
 (0)