[TASK] Prepare main branch for TYPO3 13

TYPO3-Solr · Jul 11, 2024 · 5a6aad1 · 5a6aad1
1 parent 756d033
commit 5a6aad1
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 30 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -28,12 +28,12 @@ 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.7]
+ - TYPO3 Version: [e.g. 13.4.0]
  - Browser: [e.g. chrome, safari]
- - EXT:solr Version: [e.g. 12.0.x]
- - EXT:tika Version: [e.g. 12.0.2]
- - Used Apache Solr Version: [e.g. 9.3.0]
- - PHP Version: [e.g. 8.1.0]
+ - EXT:solr Version: [e.g. 13.0.x]
+ - EXT:tika Version: [e.g. 13.0.2]
+ - Used Apache Solr Version: [e.g. 9.6.0]
+ - PHP Version: [e.g. 8.2.0]
  - MySQL Version: [e.g. 8.0.0]
 
 **Additional context**

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ env:
   CI_BUILD_DIRECTORY: '/home/runner/work/ext-tika/ext-tika/.Build'
   TIKA_PATH: '/home/runner/work/ext-tika/ext-tika/.Build/data-tika-binaries'
 
-  SOLR_IMAGE_TAG: '12.0.x-dev'
+  SOLR_IMAGE_TAG: '13.0.x-dev'
   SOLR_CONTAINER_NAME: 'solrci-container'
   TESTING_SOLR_PORT: 8983
   SOLR_VOLUME_NAME: 'solrci-volume'
@@ -35,8 +35,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        PHP: [ '8.1', '8.2', '8.3' ]
-        TYPO3: [ '^12.4', '12.4.x-dev' ]
+        PHP: [ '8.2', '8.3' ]
+        TYPO3: [ 'dev-main' ]
     env:
       TYPO3_DATABASE_NAME: 'typo3_ci'
       TYPO3_DATABASE_HOST: '127.0.0.1'

diff --git a/Documentation/Releases/13_0.rst b/Documentation/Releases/13_0.rst
@@ -0,0 +1,46 @@
+..  include:: /Includes.rst.txt
+..  index:: Releases
+..  _releases-tika-13_0:
+
+==============
+Release 13.0.0
+==============
+
+We are happy to announce version 13.0.0 of EXT:tika.
+
+**Important**: This version is compatible with 13 LTS only.
+
+New in this Release
+-------------------
+
+- TBD
+
+
+Contributors
+------------
+
+- TBD
+
+Thanks to everyone who helped in creating this release!
+
+Also a big thanks to our partners that have joined the Apache Solr EB für TYPO3 12 LTS (Feature) program:
+
+- 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-tika)
+- Ask or help or answer questions in our [Slack channel](https://typo3.slack.com/messages/ext-tika/)
+- Provide patches through Pull Request or review and comment on existing [Pull Requests](https://github.com/TYPO3-Solr/ext-tika/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:
+
+http://www.typo3-solr.com/en/contact/
+
+or call:
+
++49 (0)69 - 2475218 0
diff --git a/Documentation/Releases/Index.rst b/Documentation/Releases/Index.rst
@@ -13,6 +13,7 @@ Releases
     :titlesonly:
     :glob:
 
+    13_0
     12_0
     11_0
     10_0

diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -1,8 +1,8 @@
 [general]
 
 project     = Apache Tika for TYPO3
-version     = 12.0.2
-release     = 12.0.2
+version     = 13.0.0
+release     = 13.0.0
 t3author    = Ingo Renner, Timo Hund, dkd and contributors
 copyright   = since 2009 by dkd & contributors
 

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Apache Tika for TYPO3
 
-[![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)
+[![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)
 [![Latest Stable Version](https://poser.pugx.org/apache-solr-for-typo3/tika/v/stable)](https://packagist.org/packages/apache-solr-for-typo3/tika)
 [![License](https://poser.pugx.org/apache-solr-for-typo3/tika/license)](https://packagist.org/packages/apache-solr-for-typo3/tika)
 [![Total Downloads](http://poser.pugx.org/apache-solr-for-typo3/tika/downloads)](https://packagist.org/packages/apache-solr-for-typo3/tika)
 [![Monthly Downloads](https://poser.pugx.org/apache-solr-for-typo3/tika/d/monthly)](https://packagist.org/packages/apache-solr-for-typo3/tika)
-[![TYPO3 12](https://img.shields.io/badge/TYPO3-12-orange.svg?style=flat-square)](https://get.typo3.org/version/12)
+[![TYPO3 13](https://img.shields.io/badge/TYPO3-13-orange.svg?style=flat-square)](https://get.typo3.org/version/13)
 
 A TYPO3 CMS extension that provides Apache Tika functionality including
 
@@ -41,9 +41,9 @@ To run the test suite locally, please use our DDEV docker environment https://gi
 
 **Note**:
   This requires a proper combination of branches:
-* solr-ddev-site on release-12.0.x/main branch
-    * packages/ext-solr on release-12.0.x/main
-    * packages/ext-tika on release-12.0.x/main
+* solr-ddev-site on main branch
+    * packages/ext-solr on main
+    * packages/ext-tika on main
 * Please refer to [version matrix](https://raw.githubusercontent.com/TYPO3-Solr/ext-solr/main/Documentation/Appendix/VersionMatrix.rst) for proper combination of branches
 
 ```shell

diff --git a/composer.json b/composer.json
@@ -23,24 +23,23 @@
     "typo3-ter/tika": "self.version"
   },
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-json": "*",
-    "ext-pdo": "*",
-    "typo3/cms-backend": "^v12.4.3",
-    "typo3/cms-core": "^12.4",
-    "typo3/cms-extbase": "^v12.4.3",
-    "typo3/cms-filemetadata": "^v12.4.3",
-    "typo3/cms-fluid": "^v12.4.3",
-    "typo3/cms-reports": "^v12.4.3"
+    "typo3/cms-backend": "^v13.1",
+    "typo3/cms-core": "^v13.1",
+    "typo3/cms-extbase": "^v13.1",
+    "typo3/cms-filemetadata": "^v13.1",
+    "typo3/cms-fluid": "^v13.1",
+    "typo3/cms-reports": "^v13.1"
   },
   "require-dev": {
-    "apache-solr-for-typo3/solr": "12.0.x-dev",
+    "apache-solr-for-typo3/solr": "13.0.x-dev",
     "dg/bypass-finals": "^1.6",
     "phpstan/phpstan": "^1.10",
     "phpstan/phpstan-phpunit": "^1.3",
     "phpunit/phpunit": "^10.1",
     "typo3/cms-lowlevel": "*",
-    "typo3/coding-standards": "~0.7.1",
+    "typo3/coding-standards": "dev-main#27798dd4b8a15d2178260dbd6aad83fb0d6a017e",
     "typo3/testing-framework": "^8.0"
   },
   "suggest": {
@@ -149,7 +148,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-release-12.0.x": "12.0.x-dev"
+      "dev-main": "13.0.x-dev"
     },
     "typo3/cms": {
       "extension-key": "tika",
@@ -161,7 +160,7 @@
         "require": {
           "Tika": "1.28.5",
           "Solr": "9.5.*",
-          "EXT:solr": "12.0.*"
+          "EXT:solr": "13.0.*"
         }
       }
     }

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -4,20 +4,20 @@
 $EM_CONF[$_EXTKEY] = [
     'title' => 'Apache Tika for TYPO3',
     '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.',
-    'version' => '12.0.2',
+    'version' => '13.0.0',
     'state' => 'stable',
     'category' => 'services',
     'author' => 'Ingo Renner, Timo Hund, Markus Friedrich, Rafael Kähm',
     'author_email' => 'solr-eb-support@dkd.de',
     'author_company' => 'dkd Internet Service GmbH',
     'constraints' => [
         'depends' => [
-            'typo3' => '12.4.3-12.4.99',
+            'typo3' => '13.1.0-13.4.99',
             'filemetadata' => '',
         ],
         'conflicts' => [],
         'suggests' => [
-            'solr' => '12.0.4-',
+            'solr' => '13.0.0-',
         ],
     ],
     'autoload' => [
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ Releases @@
         :titlesonly:
         :glob:
+_0
 _0
 _0
 _0
@@ Expand Down @@