Skip to content

Commit

Permalink
[TASK] Prepare main branch for TYPO3 13
Browse files Browse the repository at this point in the history
  • Loading branch information
dkd-kaehm committed May 13, 2024
1 parent 9f5ed12 commit 2877918
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Used versions (please complete the following information):**
- TYPO3 Version: [e.g. 12.4.11]
- TYPO3 Version: [e.g. 13.4.0]
- Browser: [e.g. chrome, safari]
- EXT:solr Version: [e.g. 12.0.2]
- EXT:solr Version: [e.g. 13.0.0]
- Used Apache Solr Version: [e.g. 9.5.0]
- PHP Version: [e.g. 8.2.0]
- MySQL Version: [e.g. 8.0.0]
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ci-matrix.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"main": {
"PHP": [ "8.1", "8.2", "8.3" ],
"TYPO3": [ "12", "12.4.x-dev" ]
},
"release-12.0.x": {
"PHP": [ "8.1", "8.2", "8.3" ],
"TYPO3": [ "12", "12.4.x-dev" ]
"PHP": [ "8.2", "8.3" ],
"TYPO3": [ "dev-main" ]
}
}
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-12.0.x, release-11.6.x, release-11.5.x, task/*_compatibility ]
branches: [ main, release-13.0.x, release-12.0.x, release-11.6.x, release-11.5.x, task/*_compatibility ]
tags:
- "**"
pull_request:
branches: [ main, release-12.0.x, release-11.6.x, release-11.5.x, task/*_compatibility ]
branches: [ main, release-13.0.x, release-12.0.x, release-11.6.x, release-11.5.x, task/*_compatibility ]

env:
CI_BUILD_DIRECTORY: '/home/runner/work/ext-solr/ext-solr/.Build'
Expand Down
4 changes: 2 additions & 2 deletions Build/Test/bootstrap.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

DEFAULT_TYPO3_VERSION="12"
DEFAULT_TYPO3_VERSION="13"
DEFAULT_TYPO3_DATABASE_HOST="localhost"
DEFAULT_TYPO3_DATABASE_NAME="test"
DEFAULT_TYPO3_DATABASE_USERNAME="root"
Expand Down Expand Up @@ -42,7 +42,7 @@ if [[ $* == *--local* ]]; then
fi

if [ -z $TYPO3_VERSION ]; then
echo "Must set env var TYPO3_VERSION (e.g. dev-main or ^12.4)"
echo "Must set env var TYPO3_VERSION (e.g. dev-main or ^13)"
exit 1
fi

Expand Down
3 changes: 1 addition & 2 deletions Docker/Ci/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2'
services:
######################################
# CI
Expand All @@ -10,7 +9,7 @@ services:
context: ../../
dockerfile: ./Docker/Ci/Dockerfile
args:
PHP_VERSION: 7.4
PHP_VERSION: 8.2
working_dir: /ext-solr
env_file:
- environment.yml
Expand Down
2 changes: 1 addition & 1 deletion Docker/Ci/environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TYPO3_VERSION=^12.4.0
TYPO3_VERSION=^13
TYPO3_DATABASE_NAME=typo3
TYPO3_DATABASE_HOST=db
TYPO3_DATABASE_USERNAME=typo3
Expand Down
1 change: 1 addition & 0 deletions Documentation/Appendix/VersionMatrix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,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
========= ========== ========== =========== =============== ================== ================================ =============== =============== =================
13.4 13.0 (Ø) 13.0 (Ø) 13.0 (Ø) 13.0 (Ø) 13.0 (Ø) N/A (integrated in EXT:solr) 13.0 (Ø) 9.5.0¹ ext_solr_13_0_0
12.4 12.0 12.0 12.0 12.0 12.0 N/A (integrated in EXT:solr) 12.0 (Ø) 9.5.0¹ ext_solr_12_0_0
11.5 11.5 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 8.11.3¹ ext_solr_11_5_0
========= ========== ========== =========== =============== ================== ================================ =============== =============== =================
Expand Down
1 change: 1 addition & 0 deletions Documentation/Releases/Index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Releases
:titlesonly:
:glob:

solr-release-13-0
solr-release-12-0
solr-release-11-6
solr-release-11-5
Expand Down
49 changes: 49 additions & 0 deletions Documentation/Releases/solr-release-13-0.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
.. include:: ../Includes.rst.txt
.. _releases-13-0:

=============
Releases 13.0
=============

.. include:: HintAboutOutdatedChangelog.rst.txt

Release 13.0.0
==============

This is a compatibility release for TYPO3 13.4 LTS, containing:

- TBD

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)

- 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 13 LTS (Feature):

- 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 <https://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 = 12.0
release = 12.0.3
version = 13.0
release = 13.0.0
copyright = since 2009 by dkd & contributors

[html_theme_options]
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"docs": "https://docs.typo3.org/p/apache-solr-for-typo3/solr/main/en-us/"
},
"require": {
"php": "^8.1",
"php": "^8.2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-pdo": "*",
"ext-simplexml": "*",
"solarium/solarium": "6.3.2",
"typo3/cms-backend": "*",
"typo3/cms-core": "^v12.4.3",
"typo3/cms-core": "^v13.1",
"typo3/cms-extbase": "*",
"typo3/cms-fluid": "*",
"typo3/cms-frontend": "*",
Expand Down Expand Up @@ -136,26 +136,26 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev"
"dev-main": "13.0.x-dev"
},
"typo3/cms": {
"extension-key": "solr",
"web-dir": ".Build/Web"
},
"TYPO3-Solr": {
"version-matrix": {
"ext-tika": "^12.0",
"ext-solrfal": "^12.0",
"ext-solrconsole": "^12.0",
"ext-solrdebugtools": "^12.0",
"ext-solrmlt": "^12.0",
"ext-tika": "^13.0",
"ext-solrfal": "^13.0",
"ext-solrconsole": "^13.0",
"ext-solrdebugtools": "^13.0",
"ext-solrmlt": "^13.0",
"Apache-Solr": [
"9.5.0",
"9.4.1",
"9.4.0",
"9.3.0"
],
"configset": "ext_solr_12_0_0"
"configset": "ext_solr_13_0_0"
},
"ext-solrfal": {
},
Expand Down
6 changes: 3 additions & 3 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
$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' => '12.0.3',
'state' => 'stable',
'version' => '13.0.0',
'state' => 'alpha',
'category' => 'plugin',
'author' => 'Ingo Renner, Timo Hund, Markus Friedrich',
'author_email' => '[email protected]',
'author_company' => 'dkd Internet Service GmbH',
'constraints' => [
'depends' => [
'scheduler' => '',
'typo3' => '12.4.3-12.4.99',
'typo3' => '13.1.0-13.4.99',
],
'conflicts' => [],
'suggests' => [],
Expand Down

0 comments on commit 2877918

Please sign in to comment.