From e56516e7ba90bd8d9657883cc877b6d8cf38ccc1 Mon Sep 17 00:00:00 2001
From: Helmut Hummel <typo3@helhum.io>
Date: Sat, 27 Nov 2021 16:10:46 +0100
Subject: [PATCH] [TASK] Add dev-main branch alias
In preparation of renaming the main development branch,
the alias for the new name is added.
This makes it possible to rename the branch and have
a working alias, without needing to add further commits to it.
composer up --lock
Releases: master
Resolves: #96102
Change-Id: Id01c6d562a2bdd0c42a7b6ad69019b19181c94ee
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72325
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack <benni@typo3.org>
---
composer.json | 1 +
composer.lock | 2 +-
typo3/sysext/adminpanel/composer.json | 1 +
typo3/sysext/backend/composer.json | 1 +
typo3/sysext/belog/composer.json | 1 +
typo3/sysext/beuser/composer.json | 1 +
typo3/sysext/core/composer.json | 1 +
typo3/sysext/dashboard/composer.json | 1 +
typo3/sysext/extbase/composer.json | 1 +
typo3/sysext/extensionmanager/composer.json | 1 +
typo3/sysext/felogin/composer.json | 1 +
typo3/sysext/filelist/composer.json | 1 +
typo3/sysext/filemetadata/composer.json | 1 +
.../Functional/Fixtures/Extensions/fluid_test/composer.json | 1 +
typo3/sysext/fluid/composer.json | 1 +
typo3/sysext/fluid_styled_content/composer.json | 1 +
typo3/sysext/form/composer.json | 1 +
typo3/sysext/frontend/composer.json | 1 +
typo3/sysext/impexp/composer.json | 1 +
typo3/sysext/indexed_search/composer.json | 1 +
typo3/sysext/info/composer.json | 1 +
typo3/sysext/install/composer.json | 1 +
typo3/sysext/linkvalidator/composer.json | 1 +
typo3/sysext/lowlevel/composer.json | 1 +
typo3/sysext/opendocs/composer.json | 1 +
typo3/sysext/recordlist/composer.json | 1 +
typo3/sysext/recycler/composer.json | 1 +
typo3/sysext/redirects/composer.json | 1 +
typo3/sysext/reports/composer.json | 1 +
typo3/sysext/rte_ckeditor/composer.json | 1 +
typo3/sysext/scheduler/composer.json | 1 +
typo3/sysext/seo/composer.json | 1 +
typo3/sysext/setup/composer.json | 1 +
typo3/sysext/sys_note/composer.json | 1 +
typo3/sysext/t3editor/composer.json | 1 +
typo3/sysext/tstemplate/composer.json | 1 +
typo3/sysext/viewpage/composer.json | 1 +
typo3/sysext/workspaces/composer.json | 1 +
38 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 6f68d8328c9c..14dd4e8cb0ce 100644
--- a/composer.json
+++ b/composer.json
@@ -132,6 +132,7 @@
"always-add-alias-loader": true
},
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
}
},
diff --git a/composer.lock b/composer.lock
index d25594b9d599..0f973a7d07e3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "0eb111d925f9605a4a46ac2ff1ef7023",
+ "content-hash": "9cd4c5f00341e3008c0d1e5f3fad5a0f",
"packages": [
{
"name": "bacon/bacon-qr-code",
diff --git a/typo3/sysext/adminpanel/composer.json b/typo3/sysext/adminpanel/composer.json
index 68982116e980..e70167a50b00 100644
--- a/typo3/sysext/adminpanel/composer.json
+++ b/typo3/sysext/adminpanel/composer.json
@@ -34,6 +34,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/backend/composer.json b/typo3/sysext/backend/composer.json
index cabb8297d4f4..46c170eeb1c2 100644
--- a/typo3/sysext/backend/composer.json
+++ b/typo3/sysext/backend/composer.json
@@ -39,6 +39,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/belog/composer.json b/typo3/sysext/belog/composer.json
index 767169628848..1c30f4afd119 100644
--- a/typo3/sysext/belog/composer.json
+++ b/typo3/sysext/belog/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/beuser/composer.json b/typo3/sysext/beuser/composer.json
index f928b334e77f..36e2101880df 100644
--- a/typo3/sysext/beuser/composer.json
+++ b/typo3/sysext/beuser/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 46a976faa6c0..5587febb48a9 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -102,6 +102,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/dashboard/composer.json b/typo3/sysext/dashboard/composer.json
index 9027ce74be85..82c08c3d5c8d 100644
--- a/typo3/sysext/dashboard/composer.json
+++ b/typo3/sysext/dashboard/composer.json
@@ -30,6 +30,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/extbase/composer.json b/typo3/sysext/extbase/composer.json
index 4c181c2e511a..791fe47d4dee 100644
--- a/typo3/sysext/extbase/composer.json
+++ b/typo3/sysext/extbase/composer.json
@@ -34,6 +34,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/extensionmanager/composer.json b/typo3/sysext/extensionmanager/composer.json
index c4e77913d334..6b52fb2bea24 100644
--- a/typo3/sysext/extensionmanager/composer.json
+++ b/typo3/sysext/extensionmanager/composer.json
@@ -27,6 +27,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/felogin/composer.json b/typo3/sysext/felogin/composer.json
index 6e14431dcea1..9bafe59b25ba 100644
--- a/typo3/sysext/felogin/composer.json
+++ b/typo3/sysext/felogin/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/filelist/composer.json b/typo3/sysext/filelist/composer.json
index 2fe893b25026..b58a806275ff 100644
--- a/typo3/sysext/filelist/composer.json
+++ b/typo3/sysext/filelist/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/filemetadata/composer.json b/typo3/sysext/filemetadata/composer.json
index cc0f7138ec0f..9ad15bd97f8b 100644
--- a/typo3/sysext/filemetadata/composer.json
+++ b/typo3/sysext/filemetadata/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/composer.json b/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/composer.json
index cc66330371b0..de852f3c034e 100644
--- a/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/composer.json
+++ b/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/composer.json
@@ -28,6 +28,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/fluid/composer.json b/typo3/sysext/fluid/composer.json
index 2d0b2fe286a1..a8b1e3d17870 100644
--- a/typo3/sysext/fluid/composer.json
+++ b/typo3/sysext/fluid/composer.json
@@ -29,6 +29,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/fluid_styled_content/composer.json b/typo3/sysext/fluid_styled_content/composer.json
index a951dcebf678..00b8a96e7452 100644
--- a/typo3/sysext/fluid_styled_content/composer.json
+++ b/typo3/sysext/fluid_styled_content/composer.json
@@ -28,6 +28,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/form/composer.json b/typo3/sysext/form/composer.json
index 251ff11409ad..5843e333e295 100644
--- a/typo3/sysext/form/composer.json
+++ b/typo3/sysext/form/composer.json
@@ -32,6 +32,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/frontend/composer.json b/typo3/sysext/frontend/composer.json
index a686b8485938..93f97165ff62 100644
--- a/typo3/sysext/frontend/composer.json
+++ b/typo3/sysext/frontend/composer.json
@@ -31,6 +31,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/impexp/composer.json b/typo3/sysext/impexp/composer.json
index 86c2d6b37669..ff8812f605e7 100644
--- a/typo3/sysext/impexp/composer.json
+++ b/typo3/sysext/impexp/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/indexed_search/composer.json b/typo3/sysext/indexed_search/composer.json
index ed8d2e164468..2e87c557dff2 100644
--- a/typo3/sysext/indexed_search/composer.json
+++ b/typo3/sysext/indexed_search/composer.json
@@ -29,6 +29,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/info/composer.json b/typo3/sysext/info/composer.json
index b2b2f8e11c66..c3cdfd4a92ec 100644
--- a/typo3/sysext/info/composer.json
+++ b/typo3/sysext/info/composer.json
@@ -29,6 +29,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index bc7b9c07b447..72c79ef7ab14 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -33,6 +33,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/linkvalidator/composer.json b/typo3/sysext/linkvalidator/composer.json
index 5090e6930a32..aa82e39c854a 100644
--- a/typo3/sysext/linkvalidator/composer.json
+++ b/typo3/sysext/linkvalidator/composer.json
@@ -30,6 +30,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/lowlevel/composer.json b/typo3/sysext/lowlevel/composer.json
index d65877bdf35c..118e1b5d8d25 100644
--- a/typo3/sysext/lowlevel/composer.json
+++ b/typo3/sysext/lowlevel/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/opendocs/composer.json b/typo3/sysext/opendocs/composer.json
index 95f517b08e21..4c0fd9f86d28 100644
--- a/typo3/sysext/opendocs/composer.json
+++ b/typo3/sysext/opendocs/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/recordlist/composer.json b/typo3/sysext/recordlist/composer.json
index d0a848bb52c4..6f7fb146a16a 100644
--- a/typo3/sysext/recordlist/composer.json
+++ b/typo3/sysext/recordlist/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/recycler/composer.json b/typo3/sysext/recycler/composer.json
index bf556ceaf28e..fc319a912819 100644
--- a/typo3/sysext/recycler/composer.json
+++ b/typo3/sysext/recycler/composer.json
@@ -29,6 +29,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/redirects/composer.json b/typo3/sysext/redirects/composer.json
index f6defa26b270..14767371e122 100644
--- a/typo3/sysext/redirects/composer.json
+++ b/typo3/sysext/redirects/composer.json
@@ -36,6 +36,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/reports/composer.json b/typo3/sysext/reports/composer.json
index 3d3de8b1c218..171a20d2599a 100644
--- a/typo3/sysext/reports/composer.json
+++ b/typo3/sysext/reports/composer.json
@@ -29,6 +29,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/rte_ckeditor/composer.json b/typo3/sysext/rte_ckeditor/composer.json
index 60d9513ea792..9788082b3577 100644
--- a/typo3/sysext/rte_ckeditor/composer.json
+++ b/typo3/sysext/rte_ckeditor/composer.json
@@ -29,6 +29,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/scheduler/composer.json b/typo3/sysext/scheduler/composer.json
index 08ac3ba4271a..788d4caef78c 100644
--- a/typo3/sysext/scheduler/composer.json
+++ b/typo3/sysext/scheduler/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/seo/composer.json b/typo3/sysext/seo/composer.json
index 74ce3a9ac8c8..1e8b65524f51 100644
--- a/typo3/sysext/seo/composer.json
+++ b/typo3/sysext/seo/composer.json
@@ -28,6 +28,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/setup/composer.json b/typo3/sysext/setup/composer.json
index 1c35e904aa54..3dccbd27f178 100644
--- a/typo3/sysext/setup/composer.json
+++ b/typo3/sysext/setup/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/sys_note/composer.json b/typo3/sysext/sys_note/composer.json
index e29f930471c0..8e63698d8eaa 100644
--- a/typo3/sysext/sys_note/composer.json
+++ b/typo3/sysext/sys_note/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/t3editor/composer.json b/typo3/sysext/t3editor/composer.json
index f2c151cd7d3a..180ced9d6870 100644
--- a/typo3/sysext/t3editor/composer.json
+++ b/typo3/sysext/t3editor/composer.json
@@ -27,6 +27,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/tstemplate/composer.json b/typo3/sysext/tstemplate/composer.json
index 8d162c5c165c..2cdf76203a4f 100644
--- a/typo3/sysext/tstemplate/composer.json
+++ b/typo3/sysext/tstemplate/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/viewpage/composer.json b/typo3/sysext/viewpage/composer.json
index 9311c4216fa2..8a30e4e13fb9 100644
--- a/typo3/sysext/viewpage/composer.json
+++ b/typo3/sysext/viewpage/composer.json
@@ -26,6 +26,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
diff --git a/typo3/sysext/workspaces/composer.json b/typo3/sysext/workspaces/composer.json
index 0b1bc8965714..f2c00ee2a51e 100644
--- a/typo3/sysext/workspaces/composer.json
+++ b/typo3/sysext/workspaces/composer.json
@@ -29,6 +29,7 @@
},
"extra": {
"branch-alias": {
+ "dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
},
"typo3/cms": {
--
GitLab