From 333e3724ca7c5da12f00cdbce652e058f238b8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20K=C3=A4hm?= Date: Thu, 26 Oct 2023 18:15:13 +0200 Subject: [PATCH] [TASK] Prepare release-11.6.x for TYPO3 11.5 LTS Relates: #3781 --- .github/ISSUE_TEMPLATE/bug_report.md | 4 +- .github/workflows/ci-matrix.json | 17 +--- .github/workflows/ci.yml | 6 +- .gitignore | 8 +- Build/generate_documentation.sh | 79 ++++++------------- Documentation/Appendix/VersionMatrix.rst | 69 ++-------------- Documentation/Development/Index.rst | 1 + .../Misc/{BLOGPOST.md => BLOGPOST.md.txt} | 0 Documentation/Releases/Index.rst | 28 +++---- Documentation/Releases/archive.rst | 22 ++++++ Documentation/Releases/new-releases.rst | 11 +++ Documentation/Releases/solr-release-10-0.rst | 9 +-- Documentation/Releases/solr-release-11-0.rst | 65 ++++++--------- Documentation/Releases/solr-release-11-1.rst | 9 +-- Documentation/Releases/solr-release-11-2.rst | 21 +++-- Documentation/Releases/solr-release-11-5.rst | 63 ++++++++------- Documentation/Releases/solr-release-11-6.rst | 61 ++++++++++++++ Documentation/Releases/solr-release-7-0.rst | 9 +-- Documentation/Releases/solr-release-8-0.rst | 9 +-- Documentation/Releases/solr-release-8-1.rst | 11 ++- Documentation/Releases/solr-release-9-0.rst | 9 +-- Documentation/Settings.cfg | 4 +- README.md | 8 +- composer.json | 10 ++- ext_emconf.php | 4 +- 25 files changed, 256 insertions(+), 281 deletions(-) rename Documentation/Misc/{BLOGPOST.md => BLOGPOST.md.txt} (100%) create mode 100644 Documentation/Releases/archive.rst create mode 100644 Documentation/Releases/new-releases.rst create mode 100644 Documentation/Releases/solr-release-11-6.rst diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index afbdde6134..6a88cad5b4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,8 +26,8 @@ If applicable, add screenshots to help explain your problem. **Used versions (please complete the following information):** - TYPO3 Version: [e.g. 11.5.26] - Browser: [e.g. chrome, safari] - - EXT:solr Version: [e.g. 11.5.3] - - Used Apache Solr Version: [e.g. 8.11.1] + - EXT:solr Version: [e.g. 11.6.0] + - Used Apache Solr Version: [e.g. 9.3.1] - PHP Version: [e.g. 8.1.0] - MySQL Version: [e.g. 8.0.0] diff --git a/.github/workflows/ci-matrix.json b/.github/workflows/ci-matrix.json index 54f6a73a75..e4bacd7fe8 100644 --- 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 index 30f2956a73..e016b3478d 100644 --- 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' @@ -67,8 +67,6 @@ jobs: echo -e "matrix : " echo $matrix echo ::set-output name=matrix::$(echo $matrix) - >&2 echo -e "Example Annotation on error. Is visible in Actions wokflow view." - >&2 echo -e "Non-stable releases can not be published to TER. The tag 11.5.0-beta-1 is invalid for TER." - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 diff --git a/.gitignore b/.gitignore index 1ff284795c..db24b22975 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,21 @@ +*.cache .Build .buildpath -*.cache .DS_Store .idea/ .project/ .settings/ atlassian-ide-plugin.xml composer.lock -Documentation/_make Documentation-GENERATED-temp +Documentation.HTML +Documentation/_make index.php +Resources/Public/Documentation/ typo3 +typo3_src typo3conf typo3temp -typo3_src uploads var vendor diff --git a/Build/generate_documentation.sh b/Build/generate_documentation.sh index 71945b016d..6a23e169ca 100755 --- a/Build/generate_documentation.sh +++ b/Build/generate_documentation.sh @@ -1,65 +1,34 @@ #!/usr/bin/env bash -WORKING_DIR=`pwd` +PRODUCTION_DOCS_PATH="Resources/Public/Documentation" -function doInstallSphinxAndDependencies { - sudo apt-get install -y python-pip texlive-base texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended texlive-fonts-extra texlive-latex-base texlive-font-utils python-setuptools python-pygments python-sphinx xzdec make - pip install --upgrade t3SphinxThemeRtd requests pygments sphinx==1.5.6 setuptools imagesize pyyaml snowballstemmer t3fieldlisttable t3tablerows t3targets - - # set repo fix to 2015, newer does not work currently(2017.3) - tlmgr option repository ftp://tug.org/historic/systems/texlive/2015/tlnet-final - tlmgr init-usertree - sudo tlmgr update --all - sudo tlmgr install ec - sudo tlmgr install cm-super - # required fonts for PDF rendering - sudo mkdir /usr/share/texmf/tex/latex/typo3 - wget https://raw.githubusercontent.com/TYPO3-Documentation/latex.typo3/7eaec1188da2c8c641d22433d07a4c46ca79a571/typo3.sty -O /tmp/typo3.sty - wget https://raw.githubusercontent.com/TYPO3-Documentation/latex.typo3/7eaec1188da2c8c641d22433d07a4c46ca79a571/typo3_logo_color.png -O /tmp/typo3_logo_color.png - sudo cp /tmp/typo3.sty /usr/share/texmf/tex/latex/typo3/. - sudo cp /tmp/typo3_logo_color.png /usr/share/texmf/tex/latex/typo3/. - # apply latex.typo3 - sudo texhash - - # apply font from TYPO3 - git clone git://git.typo3.org/Documentation/RestTools.git /tmp/RestTools - cd /tmp/RestTools/LaTeX/font - ./convert-share.sh - - - cd $WORKING_DIR -} - -if [ ! -f /usr/share/texmf/tex/latex/typo3/typo3.sty ] ; then - echo "Sphinx & co. is not installed, proceed installation..." - echo "This may take some time..." - sleep 3 - doInstallSphinxAndDependencies +if [[ "$IS_DDEV_PROJECT" == 1 || "$IS_DDEV_PROJECT" == "true" ]]; then + >&2 echo "Can not run inside ddev container. Please use this command on host only." + exit 1 fi - -if [ ! -d Documentation/_build/ ] ; then - mkdir Documentation/_build/ -elif [ -f Documentation/_build/latex/*.pdf ] ; then # Cleanup previous PDF builds - rm -Rf Documentation/_build/{latex,latexpdf.output.log,warnings.txt} +if ! command -v docker &> /dev/null; then + >&2 echo "Docker is not installed on system, please install docker on your host to proceed." + exit 1 fi -echo "Building latex, which is needed for pdf rendering." -echo "Please check output, which can contain a hints for the errors in your documents." -sleep 3 -LANG=en_US.UTF-8 -sphinx-build -b latex -c Documentation -d Documentation/_build/doctrees -w Documentation/_build/warnings.txt -D latex_paper_size=a4 Documentation Documentation/_build/latex - - -echo "Building PDF file. This may take some time..." -'/usr/bin/make' -C 'Documentation/_build/latex' clean all-pdf > Documentation/_build/latexpdf.output.log 2>&1 +if ! command -v dockrun_t3rd &> /dev/null; then + echo "The command \"dockrun_t3rd\" is not initialized on system." + echo "Making \"dockrun_t3rd\" available in current script." + if [[ "$(docker images -q ghcr.io/t3docs/render-documentation 2> /dev/null)" == "" ]]; then + docker pull ghcr.io/t3docs/render-documentation && docker tag ghcr.io/t3docs/render-documentation t3docs/render-documentation + fi + # shellcheck disable=SC2034 + DOCKRUN_FN_QUIET=1 + # shellcheck disable=SC1090 + source <(docker run --rm ghcr.io/t3docs/render-documentation show-shell-commands) +fi +dockrun_t3rd makehtml-no-cache -if [ -f Documentation/_build/latex/*.pdf ] ; then - mv Documentation/_build/latex/*.pdf Documentation/_build/. - echo "Done! You can find your PDF file inside Documentation/_build/" -else - echo "Something has gone wrong! Please check the output above and following log files:" - echo " Documentation/_build/latexpdf.output.log" - echo " Documentation/_build/warnings.txt" +if [[ "$BUILD_DOCS_FOR_PRODUCTION" == 1 || "$BUILD_DOCS_FOR_PRODUCTION" == "true" ]]; then + rm -Rf "${PRODUCTION_DOCS_PATH}" "Documentation.HTML" + mv -v "Documentation-GENERATED-temp/Result/project/0.0.0" "${PRODUCTION_DOCS_PATH}" + ln -s "${PRODUCTION_DOCS_PATH}" "Documentation.HTML" + rm -Rf "Documentation-GENERATED-temp" fi diff --git a/Documentation/Appendix/VersionMatrix.rst b/Documentation/Appendix/VersionMatrix.rst index ed63adbd40..9cbc7ffb5e 100644 --- a/Documentation/Appendix/VersionMatrix.rst +++ b/Documentation/Appendix/VersionMatrix.rst @@ -1,76 +1,21 @@ .. include:: /Includes.rst.txt - - .. _appendix-version-matrix: Appendix - Version Matrix ========================= -Supported versions ------------------- +.. seealso:: + + You are on docs for EXT:solr |release| version, please refer to `Version Matrix on main release `_ to see all versions. + -List of EXT:solr versions and the matching versions of Apache Solr and TYPO3 that are supported: +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 ========= ========== ========== =========== =============== ================== ============================= =============== =============== ================= -12.4 12.0 (ᾱ) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 12.0 (Ø) 9.2.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 +11.5 11.6 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 9.3.0 ext_solr_11_6_0 ========= ========== ========== =========== =============== ================== ============================= =============== =============== ================= - -Ø - not yet available -ᾱ - non stable alpha release -rc - release candidate available - -Extended Long Term Support (ELTS) ---------------------------------- - -Since January 2022, we have been following the TYPO3 release cycles and actively support the last two TYPO3 versions; in addition, we offer ELTS support for -selected older versions. The following table illustrates the offers and available and upcoming versions: - -========= =========== ========== =========== =============== ================== =============== ==================== - Basic components Funding contribution extensions Solr configuration --------------------------------- ---------------------------------------------- ------------------------------------ -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 -========= =========== ========== =========== =============== ================== =============== ==================== - -Our Apache Solr for TYPO3 EB-partners newsletter will keep you updated! - -Ø - not yet available - -No longer supported versions ----------------------------- - -========= ========== ========= =========== =============== ================== ===================== =========== =========== ================ -TYPO3 EXT: solr EXT:tika EXT:solrfal EXT:solrconsole EXT:solrdebugtools EXT:solrfluidgrouping EXT:solrmlt Apache Solr Configset -========= ========== ========= =========== =============== ================== ===================== =========== =========== ================ -10.4 11.2.0-2 10.0 10.0 10.0 10.0 10.0 10.0 8.11 ext_solr_11_2_0 -10.4 11.1 10.0 10.0 10.0 10.0 10.0 10.0 8.9 ext_solr_11_1_0 -9.5-10.4 11.0.0-7 6.0.0-2 8.0.0-1 4.0.0-1 1.1.2 2.1 3.1 8.5 ext_solr_11_0_0 -9.5 10.0 5.0 7.0 3.0 1.1.1 2.0 3.0 8.2 ext_solr_10_0_0 -8.7-9.5 9.0 4.0 6.0 2.0 1.1.0 2.0 3.0 7.6 ext_solr_9_0_0 -8.7 8.1 3.1 5.1 1.0 1.0.0 1.1 2.0 6.6 ext_solr_8_1_0 -8.7 8.0 3.0 5.0 N/A N/A 1.0 N/A 6.6 ext_solr_8_0_0 -8.7 7.5 2.4 4.2 N/A N/A N/A N/A 6.6 ext_solr_7_5_0 -8.7 7.0 2.4 4.2 N/A N/A N/A N/A 6.3 ext_solr_7_0_0 -========= ========== ========= =========== =============== ================== ===================== =========== =========== ================ - -Obsolete versions ------------------ - -========== ========= ========= =========== ============= ================ ================ =========== ======================== ======================== ============ -TYPO3 EXT: solr EXT:tika EXT:solrfal EXT:solrfluid EXT:solrgrouping EXT:solrmlt Apache Solr Schema Solrconfig Accessplugin -========== ========= ========= =========== ============= ================ ================ =========== ======================== ======================== ============ -7.6 - 8.x 6.5 2.3 4.1 2.0 1.3 N/A 6.6.2 tx_solr-6-5-0--20171023 tx_solr-6-5-0--20171023 2.0 -7.6 - 8.7 6.1 2.3 4.1 2.0 1.3 N/A 6.3 tx_solr-6-1-0--20170206 tx_solr-6-1-0--20161220 2.0 -7.6 6.0 2.2 4.0 1.2 1.3 N/A 6.3 tx_solr-6-0-0--20161209 tx_solr-6-0-0--20161122 1.7 -7.6 5.1 2.1 3.2 1.2 1.3 N/A 4.10 tx_solr-5-1-0--20160725 tx_solr-4-0-0--20160406 1.3 -7.6 5.0 2.1 3.1 1.0 1.3 N/A 4.10 tx_solr-4-0-0--20160406 tx_solr-4-0-0--20160406 1.3 -7.6 4.0 2.1 3.0 N/A 1.2 N/A 4.10 tx_solr-4-0-0--20160406 tx_solr-4-0-0--20160406 1.3 -6.2 - 7.6 3.1 2.0 2.1 N/A 1.1 1.1 4.10 tx_solr-3-1-0--20150614 tx_solr-3-1-0--20151012 1.3 -========== ========= ========= =========== ============= ================ ================ =========== ======================== ======================== ============ diff --git a/Documentation/Development/Index.rst b/Documentation/Development/Index.rst index f427c2b450..211f733fcd 100644 --- a/Documentation/Development/Index.rst +++ b/Documentation/Development/Index.rst @@ -19,4 +19,5 @@ There are many ways to extend and hook into EXT:solr to customize EXT:solr for y CI CodeStructure Signals + Events ViewHelpers diff --git a/Documentation/Misc/BLOGPOST.md b/Documentation/Misc/BLOGPOST.md.txt similarity index 100% rename from Documentation/Misc/BLOGPOST.md rename to Documentation/Misc/BLOGPOST.md.txt diff --git a/Documentation/Releases/Index.rst b/Documentation/Releases/Index.rst index 571b7c1403..e176c6d5c6 100644 --- a/Documentation/Releases/Index.rst +++ b/Documentation/Releases/Index.rst @@ -1,20 +1,20 @@ -.. include:: /Includes.rst.txt - - +.. include:: /Includes.rst.txt +.. index:: Releases .. _releases: +******** Releases -======== +******** + + +| .. toctree:: - :maxdepth: 5 + :titlesonly: + :glob: - solr-release-7-0 - solr-release-8-0 - solr-release-8-1 - solr-release-9-0 - solr-release-10-0 - solr-release-11-0 - solr-release-11-1 - solr-release-11-2 - solr-release-11-5 + new-releases + 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 new file mode 100644 index 0000000000..6fc9d21f44 --- /dev/null +++ b/Documentation/Releases/archive.rst @@ -0,0 +1,22 @@ +.. include:: /Includes.rst.txt +.. index:: Archive +.. _releases_archive: + +******* +Archive +******* + + +| + +.. toctree:: + :titlesonly: + :glob: + + solr-release-11-5 + solr-release-11-1 + solr-release-10-0 + solr-release-9-0 + solr-release-8-1 + solr-release-8-0 + solr-release-7-0 diff --git a/Documentation/Releases/new-releases.rst b/Documentation/Releases/new-releases.rst new file mode 100644 index 0000000000..22be34dedb --- /dev/null +++ b/Documentation/Releases/new-releases.rst @@ -0,0 +1,11 @@ +.. include:: ../Includes.rst.txt +.. _releases-newest: + +========================= +See main for new releases +========================= + +.. seealso:: + + You are on docs for EXT:solr |release| version, so most probably there are not all versions listed. + Please switch to `main release `_ to see all available versions. diff --git a/Documentation/Releases/solr-release-10-0.rst b/Documentation/Releases/solr-release-10-0.rst index 4b83b2743d..34a3796384 100644 --- a/Documentation/Releases/solr-release-10-0.rst +++ b/Documentation/Releases/solr-release-10-0.rst @@ -1,11 +1,10 @@ .. include:: /Includes.rst.txt - - +.. index:: Archive .. _releases-10: -============================ -Apache Solr for TYPO3 10.0.0 -============================ +============== +Release 10.0.0 +============== We are happy to release EXT:solr 10.0.0. The focus of EXT:solr 10.0.0 was, to support the `site handling `_ that was introduced in TYPO3 9 LTS . diff --git a/Documentation/Releases/solr-release-11-0.rst b/Documentation/Releases/solr-release-11-0.rst index 96e44496b4..a07020541b 100644 --- a/Documentation/Releases/solr-release-11-0.rst +++ b/Documentation/Releases/solr-release-11-0.rst @@ -1,20 +1,10 @@ -.. ================================================== -.. FOR YOUR INFORMATION -.. -------------------------------------------------- -.. -*- coding: utf-8 -*- with BOM. - -.. include:: ../Includes.txt - - +.. include:: /Includes.rst.txt +.. index:: Releases .. _releases-11: -========================== -Apache Solr for TYPO3 11.0 -========================== - - -Apache Solr for TYPO3 11.0.8 -============================ +============== +Release 11.0.8 +============== We are happy to release EXT:solr 11.0.8 maintenance release, this release is a non-public ELTS release. @@ -49,8 +39,9 @@ Small improvements and bugfixes - [TASK] Update version matrix by @dkd-friedrich in #8 -Apache Solr for TYPO3 11.0.7 -============================ + +Release 11.0.7 +-------------- TYPO3 9 LTS reached the ELTS stage: free community support for TYPO3 9 LTS ended on 30 sept. 2021. We'll join the TYPO3s ELTS regiment and provide EXT:solr support for TYPO3 9 ELTS upwardly via our EB program. @@ -58,8 +49,8 @@ Therefore the EXT:solr release-11.0.x will not be maintained in TYPO3-Solr/ext-s The new EXT:solr 11.0.8+ for TYPO3 9 ELTS versions will be provided via dkds EB program. -Apache Solr for TYPO3 11.0.6 -============================ +Release 11.0.6 +-------------- This is a bugfix-only release that contains only bugfixes @@ -73,8 +64,8 @@ This is a bugfix-only release that contains: - [TASK:11.0] Replace mirrors for Apache Solr binaries on install-solr.sh (#3094) -Apache Solr for TYPO3 11.0.5 -============================ +Release 11.0.5 +-------------- This is a bugfix-only release that contains only bugfixes @@ -97,13 +88,13 @@ This is a bugfix-only release that contains only bugfixes - [BUGFIX] Fix type error in UrlHelper 17f1653 (#2756) -Apache Solr for TYPO3 11.0.4 -============================ +Release 11.0.4 +-------------- This is a bugfix-only release that contains - [BUGFIX] Removes secondary parameter c6a9dcc (#2746) -- [DOCS] Use *_PORT variable for setting the port fca6f68 (#2759) +- [DOCS] Use \*_PORT variable for setting the port fca6f68 (#2759) - [BUGFIX] Correct Content-Type header for suggest response e843b44 (#2783) - [TASK] Change configuration files to TYPO3 file extensions 6d513e6 (#2813) - [BUGFIX] garbage collector on translations 9adcc40 (#2797) @@ -132,8 +123,8 @@ This is a bugfix-only release that contains - [BUGFIX] Make relevance sorting option markable as active bc813c8 (#2922) -Apache Solr for TYPO3 11.0.3 -============================ +Release 11.0.3 +-------------- This is a bugfix-only release that contains only a few bugfixes @@ -153,8 +144,8 @@ This is a bugfix-only release that contains only a few bugfixes - [DOCS] Multiple improvements to the docs -Apache Solr for TYPO3 11.0.2 -============================ +Release 11.0.2 +-------------- This is a bugfix-only release that contains only a few bugfixes @@ -172,8 +163,8 @@ This is a bugfix-only release that contains only a few bugfixes - [BUGFIX] Prevent SiteNotFoundException in reports module -Apache Solr for TYPO3 11.0.1 -============================ +Release 11.0.1 +-------------- This is a bugfix-only release that contains only a few bugfixes @@ -181,9 +172,8 @@ This is a bugfix-only release that contains only a few bugfixes - [BUGFIX] Fix failing build on docker hub -Apache Solr for TYPO3 11.0.0 -============================ - +Release 11.0.0 +-------------- We are happy to release EXT:solr 11.0.0. The focus of this release was the support of TYPO3 10 LTS. @@ -193,24 +183,21 @@ EXT:solr 11 requires the usage of the TYPO3 site handling for the configuration The ```legacyMode``` that allows the usage of domain records and configuration of solr cores in TypoScript was dropped with EXT:solr 11. + New in this release ------------------- -Support of TYPO3 10 LTS -~~~~~~~~~~~~~~~~~~~~~~~ - With EXT:solr 11 we provide the support of TYPO3 10 LTS. If you update to EXT:solr 11, make sure, that you are using the TYPO3 site management to manage your Apache Solr endpoints. - Thanks to: Achim Fritz & b13 for the support on that topic + Support of Apache Solr 8.5.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ With EXT:solr 11 we support Apache Solr 8.5.1, the latest release of Apache Solr. -To see what was changed in Apache Solr 8.5.x please read the release notes of Apache Solr: +To see what was changed in Apache Solr 8.5.x please read the `release notes of Apache Solr `_ -https://archive.apache.org/dist/lucene/solr/8.5.1/changes/Changes.html Small improvements and bugfixes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Documentation/Releases/solr-release-11-1.rst b/Documentation/Releases/solr-release-11-1.rst index 1a5980bb14..43a090655f 100644 --- a/Documentation/Releases/solr-release-11-1.rst +++ b/Documentation/Releases/solr-release-11-1.rst @@ -1,11 +1,10 @@ .. include:: /Includes.rst.txt - - +.. index:: Archive .. _releases-11-1: -============================ -Apache Solr for TYPO3 11.1.0 -============================ +============== +Release 11.1.0 +============== We are happy to release EXT:solr 11.1.0. The focus of this release has been on URL and SEO optimizations. diff --git a/Documentation/Releases/solr-release-11-2.rst b/Documentation/Releases/solr-release-11-2.rst index 07afb03fc6..f51904f206 100644 --- a/Documentation/Releases/solr-release-11-2.rst +++ b/Documentation/Releases/solr-release-11-2.rst @@ -1,14 +1,11 @@ -.. include:: ../Includes.rst.txt - +.. include:: /Includes.rst.txt +.. index:: Releases .. _releases-11-2: -========================== -Apache Solr for TYPO3 11.2 -========================== - -Apache Solr for TYPO3 11.2.2 - Last non ELTS release -==================================================== +============== +Release 11.2.2 +============== This is a maintenance release for TYPO3 10.4 and the last non ELTS release, as TYPO3 10 LTS reaches the ELTS phase on April 30, 2023. @@ -35,8 +32,8 @@ This release contains: - [TASK:BP:11.2] Disable sql handler by @dkd-friedrich in #3604 -Apache Solr for TYPO3 11.2.1 -============================ +Release 11.2.1 +============== This is a maintenance release for TYPO3 10.4, containing: @@ -62,8 +59,8 @@ This is a maintenance release for TYPO3 10.4, containing: - [BUGFIX:BP:11.2] Fix write connection (#2916) -Apache Solr for TYPO3 11.2.0 -============================ +Release 11.2.0 +============== We are happy to release EXT:solr 11.2.0. The focus of this release has been on supporting the latest Apache Solr version 8.11.1 and on optimizing the data update monitoring. diff --git a/Documentation/Releases/solr-release-11-5.rst b/Documentation/Releases/solr-release-11-5.rst index 8bd6257064..197395d915 100644 --- a/Documentation/Releases/solr-release-11-5.rst +++ b/Documentation/Releases/solr-release-11-5.rst @@ -1,14 +1,10 @@ -.. include:: ../Includes.rst.txt - - +.. include:: /Includes.rst.txt +.. index:: Archive .. _releases-11-5: -========================== -Apache Solr for TYPO3 11.5 -========================== - -Apache Solr for TYPO3 11.5.3 -============================ +============== +Release 11.5.3 +============== This is a maintenance release for TYPO3 11.5, containing: @@ -16,8 +12,9 @@ This is a maintenance release for TYPO3 11.5, containing: - [DOC] Fix wrong type for boostQuery in the docs and example by @dkd-kaehm in `#3e7ff72 `__ - [TASK] Fix unit tests for 2023.06.07 by @dkd-kaehm in `#3695 `__ -Apache Solr for TYPO3 11.5.2 -============================ + +Release 11.5.2 +-------------- This is a maintenance release for TYPO3 11.5, containing: @@ -48,13 +45,13 @@ This is a maintenance release for TYPO3 11.5, containing: - [BUGFIX:BP:11.5] return empty string for renderStatic if there is no content … by @dkd-friedrich in `#3612 `__ -Apache Solr for TYPO3 11.5.1 -============================ +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 @@ -80,9 +77,10 @@ New in this release Please read the release notes: https://github.com/TYPO3-Solr/ext-solr/releases/tag/11.5.1 -============================ -Apache Solr for TYPO3 11.5.0 -============================ + + +Release 11.5.0 +-------------- We are happy to release EXT:solr 11.5.0. The focus of this release has been on TYPO3 11 LTS compatibility. @@ -92,10 +90,10 @@ 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. @@ -103,7 +101,7 @@ Please note that we require at least TYPO3 11.5.14, as this version contains som Bootstrap 5.1 -~~~~~~~~~~~~~ +^^^^^^^^^^^^^ The default templates provided by EXT:solr were adapted for Bootstrap 5.1. @@ -111,7 +109,7 @@ The templates are also prepared to display some icons with Bootstrap Icons, but 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; @@ -119,17 +117,17 @@ $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['fieldProcessor']['yourFieldProce 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. Now the following fields can be used: -- *_stringEdgeNgramS -- *_stringEdgeNgramM +- \*_stringEdgeNgramS +- \*_stringEdgeNgramM Improve and Fix TSFE Initialization -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The initialization of TSFE within indexing and Backends modules contexts is refactored. @@ -147,7 +145,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, @@ -157,26 +155,27 @@ 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 `_ 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: `_. The list of all changes: -~~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^^ - [TASK] Prepare schemas for EXT:solr 11.5.x `c0a3e6205 `_ - [TASK] Provide N-Gram Filter for strings `13b90a996 `_ @@ -271,7 +270,7 @@ The list of all changes: - [TASK] Remove not used `strptime()` adaption for windows. `ad5c03932 `_ - [BUGFIX] Ensure BE_USER is kept when initializing TSFE `c7c0ba8ad `_ - [TASK:11.5] Minimal changes to Templates to make Bootstrap 5.1 working `d5940d393 `_ -- [TASK] Standardize *.php files header declaration `514717864 `_ +- [TASK] Standardize \*.php files header declaration `514717864 `_ - [TASK] Use and apply TYPO3 coding standards, rector and type hinting `61076e3ed `_ - [BUGFIX] Skip rootline check in be for records stored at pid 0 `6800394c0 `_ - [BUGFIX] Prevent "undefined array key" warnings with php 8 in page indexer `d4afa18d1 `_ diff --git a/Documentation/Releases/solr-release-11-6.rst b/Documentation/Releases/solr-release-11-6.rst new file mode 100644 index 0000000000..a7f872b23f --- /dev/null +++ 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: `_. + +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/Releases/solr-release-7-0.rst b/Documentation/Releases/solr-release-7-0.rst index 19d96b5686..b1a9162893 100644 --- a/Documentation/Releases/solr-release-7-0.rst +++ b/Documentation/Releases/solr-release-7-0.rst @@ -1,11 +1,10 @@ .. include:: /Includes.rst.txt - - +.. index:: Archive .. _releases-7: -=========================== -Apache Solr for TYPO3 7.0.0 -=========================== +============= +Release 7.0.0 +============= We are happy to release EXT:solr 7.0.0. This release brings several smaller and some bigger changes diff --git a/Documentation/Releases/solr-release-8-0.rst b/Documentation/Releases/solr-release-8-0.rst index 8969c874ca..6287570750 100644 --- a/Documentation/Releases/solr-release-8-0.rst +++ b/Documentation/Releases/solr-release-8-0.rst @@ -1,11 +1,10 @@ .. include:: /Includes.rst.txt - - +.. index:: Archive .. _releases-8: -=========================== -Apache Solr for TYPO3 8.0.0 -=========================== +============= +Release 8.0.0 +============= We are happy to release EXT:solr 8.0.0. The focus of EXT:solr 8.0.0 was, to improve the user experience in the frontend and backend. diff --git a/Documentation/Releases/solr-release-8-1.rst b/Documentation/Releases/solr-release-8-1.rst index f86120f280..8d549f129e 100644 --- a/Documentation/Releases/solr-release-8-1.rst +++ b/Documentation/Releases/solr-release-8-1.rst @@ -1,11 +1,10 @@ .. include:: /Includes.rst.txt +.. index:: Archive +.. _releases-8.1: - -.. .. _releases-8.1: - -=========================== -Apache Solr for TYPO3 8.1.0 -=========================== +============= +Release 8.1.0 +============= We are happy to release EXT:solr 8.1.0. The focus of EXT:solr 8.1.0 was, to improve the API for the new EB addon's "solrconsole" and "solrdebugtools". diff --git a/Documentation/Releases/solr-release-9-0.rst b/Documentation/Releases/solr-release-9-0.rst index c6871b57d8..83692aa4df 100644 --- a/Documentation/Releases/solr-release-9-0.rst +++ b/Documentation/Releases/solr-release-9-0.rst @@ -1,11 +1,10 @@ .. include:: /Includes.rst.txt - - +.. index:: Archive .. _releases-9: -=========================== -Apache Solr for TYPO3 9.0.0 -=========================== +============= +Release 9.0.0 +============= We are happy to release EXT:solr 9.0.0. The focus of EXT:solr 9.0.0 was, to support the latest version of Apache Solr (7.6.0) and to drop the usage of the solrphpclient and use the solarium php API instead. diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg index 375d878b49..2f0bf1922d 100644 --- a/Documentation/Settings.cfg +++ b/Documentation/Settings.cfg @@ -4,8 +4,8 @@ [general] project = Apache Solr for TYPO3 -version = 11.5 -release = 11.5.3 +version = 11.6 +release = 11.6.0 copyright = since 2009 by dkd & contributors [html_theme_options] diff --git a/README.md b/README.md index 3c6028f23a..679ac167f2 100644 --- 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 index 3b8e5cdaac..2ea9ecddac 100644 --- a/composer.json +++ b/composer.json @@ -103,7 +103,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", @@ -118,10 +118,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 index 709ceb985b..1733b26195 100644 --- 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.3', - 'state' => 'stable', + 'version' => '11.6.0', + 'state' => 'beta', 'category' => 'plugin', 'author' => 'Ingo Renner, Timo Hund, Markus Friedrich', 'author_email' => 'ingo@typo3.org',