From 73b8c50979ab304ab98ab20b28cca64527b096b8 Mon Sep 17 00:00:00 2001
From: Jacco van der Post <jacco@typo3-webdesign.nl>
Date: Wed, 29 Sep 2021 15:40:59 +0200
Subject: [PATCH] [TASK] Update for TCA fixes and composer.json

---
 .../TCA/Overrides/tx_jpfaq_domain_model_question.php         | 4 ++--
 Documentation/ChangeLog/Index.rst                            | 5 +++++
 Documentation/Settings.cfg                                   | 4 ++--
 Documentation/Settings.yml                                   | 4 ++--
 ext_emconf.php                                               | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Configuration/TCA/Overrides/tx_jpfaq_domain_model_question.php b/Configuration/TCA/Overrides/tx_jpfaq_domain_model_question.php
index 313b60e..ef9661a 100644
--- a/Configuration/TCA/Overrides/tx_jpfaq_domain_model_question.php
+++ b/Configuration/TCA/Overrides/tx_jpfaq_domain_model_question.php
@@ -2,8 +2,8 @@
 defined('TYPO3_MODE') or die();
 
 $boot = static function () {
-    // Remove TCA settings for version 10 to avoid entries in TCA migration check
-    if (\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Information\Typo3Version::class)->getMajorVersion() === 10) {
+    // Remove TCA settings for version 10+ to avoid entries in TCA migration check
+    if (\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Information\Typo3Version::class)->getMajorVersion() >= 10) {
         foreach (['question', 'category', 'questioncomment', 'categorycomment'] as $tableSuffix) {
             unset($GLOBALS['TCA']['tx_jpfaq_domain_model_' . $tableSuffix]['interface']['showRecordFieldList']);
         }
diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst
index d7545e9..17f3311 100644
--- a/Documentation/ChangeLog/Index.rst
+++ b/Documentation/ChangeLog/Index.rst
@@ -10,6 +10,11 @@
 
 ChangeLog
 =========
+10.4.1
+"""""
+#. TCA fixes for TYPO3 10.4. (thx to Sven Wappler)
+#. Add extension key to composer.json (thx to Klaus Hörmann-Engl)
+
 10.4.0
 """""
 For TYPO3 CMS versions 9.5 and 10.4. (thx to Cristian Fries)
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
index 84fad79..d5fee60 100644
--- a/Documentation/Settings.cfg
+++ b/Documentation/Settings.cfg
@@ -1,8 +1,8 @@
 [general]
 project = Frequently Asked Questions
-release = 10.4.0
+release = 10.4.1
 version = 10.4
-copyright = 2020
+copyright = 2021
 
 [notify]
 about_new_build = no
diff --git a/Documentation/Settings.yml b/Documentation/Settings.yml
index 17593e2..fa122b6 100644
--- a/Documentation/Settings.yml
+++ b/Documentation/Settings.yml
@@ -4,10 +4,10 @@
 
 ---
 conf.py:
-  copyright: 2020
+  copyright: 2021
   project: jpFAQ
   version: 10.4
-  release: 10.4.0
+  release: 10.4.1
   intersphinx_mapping:
     t3tsref:
     - http://docs.typo3.org/typo3cms/TyposcriptReference/
diff --git a/ext_emconf.php b/ext_emconf.php
index 2f3d602..f33d390 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -10,7 +10,7 @@
     'uploadfolder' => false,
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '10.4.0',
+    'version' => '10.4.1',
     'constraints' =>
         array(
             'depends' =>