[TASK] Prepare release-11.6.x for TYPO3 11.5 LTS

Relates: #3781
TYPO3-Solr · Nov 8, 2023 · 2a5ba8f · 2a5ba8f
1 parent db3f169
commit 2a5ba8f
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 48 deletions.
diff --git a/.github/workflows/ci-matrix.json b/.github/workflows/ci-matrix.json
@@ -1,21 +1,6 @@
 {
-  "main": {
+  "release-11.6.x": {
     "PHP": [ "7.4", "8.0", "8.1" ],
     "TYPO3": [ "11", "11.5.x-dev" ]
-  },
-
-  "release-11.5.x": {
-    "PHP": [ "7.4", "8.0", "8.1" ],
-    "TYPO3": [ "11", "11.5.x-dev" ]
-  },
-
-  "release-11.1.x": {
-    "PHP": [ "7.2", "7.3", "7.4" ],
-    "TYPO3": [ "10", "10.4.x-dev" ]
-  },
-
-  "release-11.0.x": {
-    "PHP": [ "7.2", "7.3", "7.4" ],
-    "TYPO3": [ "9", "10", "9.5.x-dev", "10.4.x-dev" ]
   }
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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'

diff --git a/Documentation/Appendix/VersionMatrix.rst b/Documentation/Appendix/VersionMatrix.rst
@@ -8,18 +8,14 @@ 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::
 
-   There is 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.1          ext_solr_11_5_0
+11.5      11.6       11.0       11.0        11.0            11.0               11.0                          11.0 (Ø)        9.3             ext_solr_11_6_0
 ========= ========== ========== =========== =============== ================== ============================= =============== =============== =================
diff --git a/Documentation/Releases/Index.rst b/Documentation/Releases/Index.rst
@@ -14,7 +14,7 @@ Releases
     :glob:
 
     new-releases
-    solr-release-11-5
+    solr-release-11-6
     solr-release-11-2
     solr-release-11-0
     archive
diff --git a/Documentation/Releases/archive.rst b/Documentation/Releases/archive.rst
@@ -13,6 +13,7 @@ Archive
     :titlesonly:
     :glob:
 
+    solr-release-11-5
     solr-release-11-1
     solr-release-10-0
     solr-release-9-0

diff --git a/Documentation/Releases/solr-release-11-5.rst b/Documentation/Releases/solr-release-11-5.rst
@@ -51,6 +51,9 @@ This is a maintenance release for TYPO3 11.5, containing:
 Release 11.5.2
 --------------
 
+Release 11.5.2
+--------------
+
 This is a maintenance release for TYPO3 11.5, containing:
 
 - [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
 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 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 https://github.com/TYPO3-Solr/ext-solr/pull/3344
@@ -112,6 +115,10 @@ New in this release
 Please read the release notes:
 https://github.com/TYPO3-Solr/ext-solr/releases/tag/11.5.1
 
+Release 11.5.0
+--------------
+
+
 Release 11.5.0
 --------------
 
@@ -123,34 +130,34 @@ The focus of this release has been on TYPO3 11 LTS compatibility.
 **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
--------------------
+~~~~~~~~~~~~~~~~~~~
 
 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.
@@ -160,7 +167,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.
 
@@ -178,7 +185,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,
@@ -188,27 +195,29 @@ 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>`_.
 
 The list of all changes:
-~~~~~~~~~~~~~~~~~~~~~~~~
+^^^^^^^^^^^^^^^^^^^^^^^^
 
 - [TASK] Prepare schemas for EXT:solr 11.5.x `c0a3e6205 <https://github.com/TYPO3-Solr/ext-solr/commit/c0a3e6205>`_
 - [TASK] Provide N-Gram Filter for strings `13b90a996 <https://github.com/TYPO3-Solr/ext-solr/commit/13b90a996>`_

diff --git a/Documentation/Releases/solr-release-11-6.rst b/Documentation/Releases/solr-release-11-6.rst
@@ -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
+
+
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -4,8 +4,8 @@
 [general]
 
 project     = Apache Solr for TYPO3
-version     = 11.5
-release     = 11.5.4
+version     = 11.6
+release     = 11.6.0
 copyright   = since 2009 by dkd & contributors
 
 [html_theme_options]

diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@
 [![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)
-[![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)
-[![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)
+[![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)
+[![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
 
@@ -28,7 +28,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/                                     |
 

diff --git a/composer.json b/composer.json
@@ -125,7 +125,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",
@@ -140,10 +140,14 @@
         "ext-solrdebugtools": "^11.0",
         "ext-solrfluidgrouping": "^11.0",
         "ext-solrmlt": "^11.0",
-        "Apache-Solr": "8.11.1",
-        "configset": "ext_solr_11_5_0"
+        "Apache-Solr": "9.3.0",
+        "configset": "ext_solr_11_6_0"
       },
       "ext-solrfal": {
+      },
+      "stack-for-ci": {
+        "sclable/xml-lint": "*",
+        "scrutinizer/ocular": "*"
       }
     }
   }

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -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.4',
-    'state' => 'stable',
+    'version' => '11.6.0',
+    'state' => 'beta',
     'category' => 'plugin',
     'author' => 'Ingo Renner, Timo Hund, Markus Friedrich',
     'author_email' => 'ingo@typo3.org',