diff --git a/composer.json b/composer.json
index 76f636415c6001f09a1a177225607cd55930c5fa..68e500a65f0faf87a47d15e9771932438bbfa85d 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
 	"keywords": ["typo3", "cms", "content management system", "extbase"],
 	"homepage": "https://typo3.org/",
 	"type": "typo3-cms-core",
-	"license": "GPL-2.0+",
+	"license": "GPL-2.0-or-later",
 	"authors": [
 		{
 			"name": "TYPO3 CMS Core Team",
diff --git a/typo3/sysext/about/composer.json b/typo3/sysext/about/composer.json
index 34bc7e3ff59810fa8bf4489d6a608213fcdad857..284ff762cd19213d798b44d2423d9b3068ffcfce 100644
--- a/typo3/sysext/about/composer.json
+++ b/typo3/sysext/about/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/aboutmodules/composer.json b/typo3/sysext/aboutmodules/composer.json
index 0e1f7ccd48ac75c77200d7da7676e5571a80e482..0f7de308022e11cbe0d0960413a7a31a48867420 100644
--- a/typo3/sysext/aboutmodules/composer.json
+++ b/typo3/sysext/aboutmodules/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/adodb/composer.json b/typo3/sysext/adodb/composer.json
index 3247eb8b4025c6c457e36888d2d2a8e7d1707b13..ec317914969cd4888b709cd189e1f3fd41cdf242 100644
--- a/typo3/sysext/adodb/composer.json
+++ b/typo3/sysext/adodb/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/backend/composer.json b/typo3/sysext/backend/composer.json
index f12804bf812b578e52307b3a4bfb92c0aa74375c..51089b4ee82d1fcf6e7d39ab2460e3b4e383489b 100644
--- a/typo3/sysext/backend/composer.json
+++ b/typo3/sysext/backend/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/belog/composer.json b/typo3/sysext/belog/composer.json
index b4db417c1eacc70949f6c343094b7548158dbf65..61dfae6011b259a2e1d90f368579537fc6a4d78a 100644
--- a/typo3/sysext/belog/composer.json
+++ b/typo3/sysext/belog/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/beuser/composer.json b/typo3/sysext/beuser/composer.json
index 5f9cfdb778fc20c1d0cdf08e196f7550def40210..ca7986515a8f281792ff2105230cbb1ebae085ca 100644
--- a/typo3/sysext/beuser/composer.json
+++ b/typo3/sysext/beuser/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/context_help/composer.json b/typo3/sysext/context_help/composer.json
index 7d094f1ce0b4581efee5c0f91c7f893922bf1c8f..2b443f3061b772721726ee8b0cecf667b76ad41c 100644
--- a/typo3/sysext/context_help/composer.json
+++ b/typo3/sysext/context_help/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 522b374c2d32baec3b3890be96685162353bc7d9..7dac11f873621ca429add597ceea9424135d8766 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"php" : ">=5.5.0"
diff --git a/typo3/sysext/cshmanual/composer.json b/typo3/sysext/cshmanual/composer.json
index f257b5ac89b702841b2644aee66c9c8440c671c6..d07e9fdbdbb84604c721d28aff7171b7b7d251c1 100644
--- a/typo3/sysext/cshmanual/composer.json
+++ b/typo3/sysext/cshmanual/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/css_styled_content/composer.json b/typo3/sysext/css_styled_content/composer.json
index 0c19c5e3d7bf8361adaf117c9d20e5b260d19dff..8a29330f0d0419b1202b70bcc644eb8309a88d89 100644
--- a/typo3/sysext/css_styled_content/composer.json
+++ b/typo3/sysext/css_styled_content/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/dbal/composer.json b/typo3/sysext/dbal/composer.json
index 0e93a1c57ce364892760f18b7364a42ada404122..05765aa9c6c35b08468774533ca5b9caf76ba987 100644
--- a/typo3/sysext/dbal/composer.json
+++ b/typo3/sysext/dbal/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/documentation/composer.json b/typo3/sysext/documentation/composer.json
index 851e945fdfdf60a3e083f41cd5e24b8c72d14ee4..c21381f0474549bc4b98b52dd400dbb17fe445f5 100644
--- a/typo3/sysext/documentation/composer.json
+++ b/typo3/sysext/documentation/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/extbase/composer.json b/typo3/sysext/extbase/composer.json
index d1f51a7db22f2f3218a3e216547c9f8c4a65f279..e8dce0ee98f82a620e01b222cfc5f44106aafb85 100644
--- a/typo3/sysext/extbase/composer.json
+++ b/typo3/sysext/extbase/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/extensionmanager/composer.json b/typo3/sysext/extensionmanager/composer.json
index a4fc4f2335851c8dabe9e4380876496b2d8c6ea8..e06e06ad79fcbc52889c5ccbb6816538aea6397f 100644
--- a/typo3/sysext/extensionmanager/composer.json
+++ b/typo3/sysext/extensionmanager/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/felogin/composer.json b/typo3/sysext/felogin/composer.json
index 9ba2636a3c3b39ea373ab1da4a00eeb4a7f14dfc..22634b844dfb7f73eeaaf8e2fceaede03ad278bf 100644
--- a/typo3/sysext/felogin/composer.json
+++ b/typo3/sysext/felogin/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/filelist/composer.json b/typo3/sysext/filelist/composer.json
index e0a295fb93cadf458dcdacee271d9aedf2f12f80..ea3edb3e46c43aaaf712bba39dcefe9801157f1c 100644
--- a/typo3/sysext/filelist/composer.json
+++ b/typo3/sysext/filelist/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/filemetadata/composer.json b/typo3/sysext/filemetadata/composer.json
index 152d7feadea18f119895f807b35010b733fd8dfa..25638d2af22f66e79ebee0ab0f10f71631ddefd1 100644
--- a/typo3/sysext/filemetadata/composer.json
+++ b/typo3/sysext/filemetadata/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/fluid/composer.json b/typo3/sysext/fluid/composer.json
index d4e6151e0bc443a40cbcccccaa754872845c062b..15d76122cb1843e7991f43e3fba2846ccef52a38 100644
--- a/typo3/sysext/fluid/composer.json
+++ b/typo3/sysext/fluid/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/fluid_styled_content/composer.json b/typo3/sysext/fluid_styled_content/composer.json
index 2e7dd7efbe05bd3d95fd2d80c0cb64833c1d79ef..6e5778356a5bef3bf3f900e0ff348c10505ecd8c 100644
--- a/typo3/sysext/fluid_styled_content/composer.json
+++ b/typo3/sysext/fluid_styled_content/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*",
diff --git a/typo3/sysext/form/composer.json b/typo3/sysext/form/composer.json
index 33e88b4a256d6cf2ac484c83f540d9feffacc262..e570e5c1b90b7a412f567257f4816addfeadf6e6 100644
--- a/typo3/sysext/form/composer.json
+++ b/typo3/sysext/form/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/frontend/composer.json b/typo3/sysext/frontend/composer.json
index 1f791f9e7abed988b915532f9fdb30552a71b388..ebc253df1cd898aa4b2451f3ad044199690ed971 100644
--- a/typo3/sysext/frontend/composer.json
+++ b/typo3/sysext/frontend/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/func/composer.json b/typo3/sysext/func/composer.json
index ec500c15657055e9c6eabce46d0a2e49f1939a30..04145cc00b20aa9ac6b43d73a12c14841e6d1cbb 100644
--- a/typo3/sysext/func/composer.json
+++ b/typo3/sysext/func/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/impexp/composer.json b/typo3/sysext/impexp/composer.json
index 16a0c07c43a2fb3652bba174a6d406bbd52aed7e..6a386ae3f4b970d2e2f7dc18837c6a87c008f552 100644
--- a/typo3/sysext/impexp/composer.json
+++ b/typo3/sysext/impexp/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/indexed_search/composer.json b/typo3/sysext/indexed_search/composer.json
index 09a1e1300e346ca95a3168bf6a1c20dfac695e64..e848b48ef71ce13b0fc56edd0b9e6a4566cfb67b 100644
--- a/typo3/sysext/indexed_search/composer.json
+++ b/typo3/sysext/indexed_search/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/indexed_search_mysql/composer.json b/typo3/sysext/indexed_search_mysql/composer.json
index af7c95900bd0b7c85dbd16a0d398ac947af84011..a3ced97f476dff7da098239519894b4585d0ccc0 100644
--- a/typo3/sysext/indexed_search_mysql/composer.json
+++ b/typo3/sysext/indexed_search_mysql/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/info/composer.json b/typo3/sysext/info/composer.json
index 2f13406adb8c0ea6629763e83a7121881eeb7153..be327dde3f32a14de600e0dfdb78e6eef1fd1292 100644
--- a/typo3/sysext/info/composer.json
+++ b/typo3/sysext/info/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/info_pagetsconfig/composer.json b/typo3/sysext/info_pagetsconfig/composer.json
index 182004425e6de2f884d426cd9474ba90053a0f5f..3475a4caffe829d81fd682cd2daa4ca163be4cda 100644
--- a/typo3/sysext/info_pagetsconfig/composer.json
+++ b/typo3/sysext/info_pagetsconfig/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index b4ad9b9938fecf88263881aa20a557e77dc8e6ee..5b886263e3d6eabbc07e05facb3eba2693525854 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*",
diff --git a/typo3/sysext/lang/composer.json b/typo3/sysext/lang/composer.json
index cc691472461f2daa6c60df099ad752b79e5812f2..a41755ebfb3dcfc9cf990d014a747b7a14cd936b 100644
--- a/typo3/sysext/lang/composer.json
+++ b/typo3/sysext/lang/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/linkvalidator/composer.json b/typo3/sysext/linkvalidator/composer.json
index f62104ddb47ee41d9d93d327854ac3c0596b1919..c958a83b179a69f03392f6007014f20a83d6ed9d 100644
--- a/typo3/sysext/linkvalidator/composer.json
+++ b/typo3/sysext/linkvalidator/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/lowlevel/composer.json b/typo3/sysext/lowlevel/composer.json
index 292c6e2d5ec26800c9714f6e924a00219f1a1b40..94a635be50419a5448e7da3ef3da7468f9dcc567 100644
--- a/typo3/sysext/lowlevel/composer.json
+++ b/typo3/sysext/lowlevel/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/opendocs/composer.json b/typo3/sysext/opendocs/composer.json
index 02f35598712a5121ef5ad07aa75a7b5129f51809..0a80fe12bc7002caba7ea3ae447f80d865dbe0b8 100644
--- a/typo3/sysext/opendocs/composer.json
+++ b/typo3/sysext/opendocs/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/recordlist/composer.json b/typo3/sysext/recordlist/composer.json
index ecf2b517f3de9f34fadf6b0a85d247b4a7afdce1..ed865653a6ab3ad13bb3fe3cc4fbab9c5db140bf 100644
--- a/typo3/sysext/recordlist/composer.json
+++ b/typo3/sysext/recordlist/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/recycler/composer.json b/typo3/sysext/recycler/composer.json
index de9e07b1e98c0246a19c9b4b95b51fc8326f9d78..4199ad45bb95085d22e6f8690203f5e82bbaf9a1 100644
--- a/typo3/sysext/recycler/composer.json
+++ b/typo3/sysext/recycler/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/reports/composer.json b/typo3/sysext/reports/composer.json
index 3303df5f2af26205ae5cafc0e4bc70eee2839de3..ca21596beea6e0627b86524a03726ce8e294c8a2 100644
--- a/typo3/sysext/reports/composer.json
+++ b/typo3/sysext/reports/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/rsaauth/composer.json b/typo3/sysext/rsaauth/composer.json
index 1e16f4e8bf1641818f5fa03938e71bfdc72a360f..fa0db81dd909a7943519d7e42eeee07718b7980c 100644
--- a/typo3/sysext/rsaauth/composer.json
+++ b/typo3/sysext/rsaauth/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/rtehtmlarea/composer.json b/typo3/sysext/rtehtmlarea/composer.json
index b0f7d50b795aa57240be3c505077a238821c1890..2cbf2b75f7e2156c334d2bd5a531d16ed7e8c2fd 100644
--- a/typo3/sysext/rtehtmlarea/composer.json
+++ b/typo3/sysext/rtehtmlarea/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/saltedpasswords/composer.json b/typo3/sysext/saltedpasswords/composer.json
index 6f0e8260c59a699079d6337210265f508b215011..f25091f997b94c3b6a509608f37d17e172f80bf5 100644
--- a/typo3/sysext/saltedpasswords/composer.json
+++ b/typo3/sysext/saltedpasswords/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/scheduler/composer.json b/typo3/sysext/scheduler/composer.json
index 200403a0f98b4f2b4a41917e4e097b4c57dc2736..58ef970f297ba5a7c78a91a99bb37542bd5f6811 100644
--- a/typo3/sysext/scheduler/composer.json
+++ b/typo3/sysext/scheduler/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/setup/composer.json b/typo3/sysext/setup/composer.json
index d1fc5aba37acb69ef31d0a159d206ca74c5146bd..f439f6c766f4c5daef5800deed5ef5ce184674e3 100644
--- a/typo3/sysext/setup/composer.json
+++ b/typo3/sysext/setup/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/sv/composer.json b/typo3/sysext/sv/composer.json
index 811caa182ca55a8bc2b021b17f178a9ba686b89f..e57d0d38a3dc0dd6ca2af6692bd9bee00788dcca 100644
--- a/typo3/sysext/sv/composer.json
+++ b/typo3/sysext/sv/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/sys_action/composer.json b/typo3/sysext/sys_action/composer.json
index c6cbbce9a8e38ddebde08d86d032fc9b31413e75..38eb50fcb1ff9b87c5d3792fe0ea0f157d0f0486 100644
--- a/typo3/sysext/sys_action/composer.json
+++ b/typo3/sysext/sys_action/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/sys_note/composer.json b/typo3/sysext/sys_note/composer.json
index dd2ff84cc090b243f3a4bea057f3ff022c214d49..da5e2331cac88554880a27f7e834553d5696cf6d 100644
--- a/typo3/sysext/sys_note/composer.json
+++ b/typo3/sysext/sys_note/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/t3editor/composer.json b/typo3/sysext/t3editor/composer.json
index a8d7309fe78bbd4c867decc1f2cd802948ff6920..692bc2b6ac1830083dd5287319a6ada61c660a05 100644
--- a/typo3/sysext/t3editor/composer.json
+++ b/typo3/sysext/t3editor/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/t3skin/composer.json b/typo3/sysext/t3skin/composer.json
index 6ccb80ed2d84249f9fb9a0ec6185c3ce030aa871..b224ebcc98db09b0c9ff5571168530d909ffdb69 100644
--- a/typo3/sysext/t3skin/composer.json
+++ b/typo3/sysext/t3skin/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/taskcenter/composer.json b/typo3/sysext/taskcenter/composer.json
index ff2780c7d887d76eb7f8cc7b9af2958c7c42b3f0..b85276b70a4f1d33800fe00a6f48f601a9517cb6 100644
--- a/typo3/sysext/taskcenter/composer.json
+++ b/typo3/sysext/taskcenter/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/tstemplate/composer.json b/typo3/sysext/tstemplate/composer.json
index 5cb28d65012a77418bd1afac4babcb9925c8c6d4..f84f1755583aecc7cdb5e3efd203f318ab638a5b 100644
--- a/typo3/sysext/tstemplate/composer.json
+++ b/typo3/sysext/tstemplate/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/version/composer.json b/typo3/sysext/version/composer.json
index 269257f9c7e6013e4b92996ddfe43a2a3d340b4a..1a1112d164bc4b455ea65b7e62bf3592b1958e50 100644
--- a/typo3/sysext/version/composer.json
+++ b/typo3/sysext/version/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/viewpage/composer.json b/typo3/sysext/viewpage/composer.json
index 8ac50afbec2662fbb918ddecfabe8b9ffe62fad5..a69f9cf599e31dbc4abd8f8a844bfa6af0a1dc34 100644
--- a/typo3/sysext/viewpage/composer.json
+++ b/typo3/sysext/viewpage/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/wizard_crpages/composer.json b/typo3/sysext/wizard_crpages/composer.json
index c806f28401ce229a0f62283dde147108cfacacd4..6fef2b52faa57833d828fc31f0455c4d074afd1e 100644
--- a/typo3/sysext/wizard_crpages/composer.json
+++ b/typo3/sysext/wizard_crpages/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/wizard_sortpages/composer.json b/typo3/sysext/wizard_sortpages/composer.json
index fda0593bb10a8f418f96aca61fba4bff005d0020..0039028a45c7e3878c408e3f0a5ff31cd58f9667 100644
--- a/typo3/sysext/wizard_sortpages/composer.json
+++ b/typo3/sysext/wizard_sortpages/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"
diff --git a/typo3/sysext/workspaces/composer.json b/typo3/sysext/workspaces/composer.json
index 5e0e47aaaf3dc2527e778f01b7ea825f67998045..68594c8e4fdda6f953e5fdecbd277c484c5d83aa 100644
--- a/typo3/sysext/workspaces/composer.json
+++ b/typo3/sysext/workspaces/composer.json
@@ -3,7 +3,7 @@
 	"type": "typo3-cms-framework",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
-	"license": ["GPL-2.0+"],
+	"license": ["GPL-2.0-or-later"],
 
 	"require": {
 		"typo3/cms-core": "*"