[TASK] Prepare Release 6.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -31,7 +31,7 @@ If applicable, add screenshots to help explain your problem.
  - TYPO3 Version: [e.g. 10.4.13]
  - Browser: [e.g. chrome, safari]
  - EXT:solr Version: [e.g. 11.0.2]
- - EXT:tika Version: [e.g. 6.0.0]
+ - EXT:tika Version: [e.g. 6.1.0]
  - Used Apache Solr Version: [e.g. 8.8.0]
  - PHP Version: [e.g. 7.4.0]
  - MySQL Version: [e.g. 8.0.0]

.travis.yml

@@ -4,27 +4,31 @@ language: php
 
 services:
   - mysql
-  - docker
 
 php:
   - 7.2
+  - 7.3
   - 7.4
 
 env:
   global:
     - TIKA_VERSION="1.24.1"
     - TIKA_PATH=$HOME/tika
-    - EXT_SOLR_VERSION="dev-release-11.0.x"
+    - EXT_SOLR_VERSION="dev-master"
     - TYPO3_DATABASE_NAME="typo3_ci"
     - TYPO3_DATABASE_HOST="127.0.0.1"
     - TYPO3_DATABASE_USERNAME="root"
     - TYPO3_DATABASE_PASSWORD=""
   matrix:
-    - TYPO3_VERSION="^9.5"
     - TYPO3_VERSION="^10.4"
+    - TYPO3_VERSION="10.4.x-dev"
+    - TYPO3_VERSION="dev-master"
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - env: TYPO3_VERSION="10.4.x-dev"
+    - env: TYPO3_VERSION="dev-master"
 
 before_install:
   - composer self-update

Documentation/Index.rst

@@ -18,7 +18,7 @@ Apache Tika for TYPO3
 		tika
 
 	:Version:
-		6.0.0
+		6.1.0
 
 	:Language:
 		en

Documentation/Settings.cfg

@@ -1,10 +1,10 @@
 [general]
 
 project     = Apache Tika for TYPO3
-version     = 6.0.0
-release     = 6.0.0
+version     = 6.1.0-dev
+release     = 6.1.0-dev
 t3author    = Ingo Renner, Timo Hund
-copyright   = 2020
+copyright   = 2021
 
 description = Documentation for EXT:tika
 

Documentation/Settings.yml

@@ -4,10 +4,10 @@
 
 ---
 conf.py:
-  copyright: 2009-2020
+  copyright: 2009-2021
   project: Apache Tika for TYPO3
-  version: 6.0.0
-  release: 6.0.0
+  version: 6.1.0-dev
+  release: 6.1.0-dev
   latex_documents:
   - - Index
     - tika.tex

Documentation/conf.py

@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '6.0'
+version = '6.1'
 # The full version, including alpha/beta/rc tags.
-release = '6.0.0'
+release = '6.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

composer.json

@@ -26,10 +26,12 @@
   "require": {
     "ext-json": "*",
     "ext-pdo": "*",
-    "typo3/cms-core": "^9.5.16 || ^10.4.2",
+
+    "typo3/cms-core": "^10.4.10",
     "typo3/cms-backend": "*",
     "typo3/cms-extbase": "*",
-    "typo3/cms-reports": "*"
+    "typo3/cms-reports": "*",
+    "typo3/cms-filemetadata": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.5.6 || ^8",
@@ -62,9 +64,10 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "6.0.x-dev"
+      "dev-master": "6.1.x-dev"
     },
     "typo3/cms": {
+      "extension-key": "apache_solr_for_typo3_sitepackage",
       "cms-package-dir": "{$vendor-dir}/typo3/cms",
       "web-dir": ".Build/Web"
     }

ext_emconf.php

@@ -2,7 +2,7 @@
 $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' => '6.0.0',
+    'version' => '6.1.0',
     'state' => 'stable',
     'category' => 'services',
     'author' => 'Ingo Renner, Timo Hund, Markus Friedrich',
@@ -15,13 +15,12 @@
     'clearCacheOnLoad' => 1,
     'constraints' => [
         'depends' => [
-            'typo3' => '9.5.16-10.4.99',
+            'typo3' => '10.4.10-10.4.99',
             'filemetadata' => ''
         ],
         'conflicts' => [],
         'suggests' => [
-            'solr' => '11.0.0-',
-            'devlog' => '',
+            'solr' => '11.1.0-0.0.0'
         ],
     ],
     '_md5_values_when_last_written' => ''