Commit b5379f4a authored by Helmut Hummel's avatar Helmut Hummel Committed by Benni Mack
Browse files

[TASK] Clean up branch aliases

Since branching is finished, the dev-master alias
is obsolete and can be removed.

Used composer command:
> composer up --lock

Releases: main
Resolves: #96102
Change-Id: I3ef3f546bb705b2fda4040b6cb8092b46bde76a9
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72379


Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
parent 93c754af
......@@ -43,8 +43,5 @@
"typo3/cms-t3editor": "@dev",
"typo3/cms-tstemplate": "@dev",
"typo3/cms-viewpage": "@dev"
},
"require-dev": {
"typo3/cms-styleguide": "~11.4.0"
}
}
......@@ -801,7 +801,6 @@ services:
- /etc/group:/etc/group:ro
working_dir: ${CORE_ROOT}
environment:
COMPOSER_ROOT_VERSION: dev-master
COMPOSER_CACHE_DIR: .cache/composer
command: >
/bin/sh -c "
......
......@@ -132,8 +132,7 @@
"always-add-alias-loader": true
},
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
}
},
"scripts": {
......
......@@ -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": "9cd4c5f00341e3008c0d1e5f3fad5a0f",
"content-hash": "25295087aa7bc5b451f47afa84dbe69f",
"packages": [
{
"name": "bacon/bacon-qr-code",
......
......@@ -34,8 +34,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -39,8 +39,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -26,8 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -26,8 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -102,8 +102,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -30,8 +30,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"extension-key": "dashboard",
......
......@@ -34,8 +34,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -27,8 +27,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -26,8 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -26,8 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -26,8 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"extension-key": "filemetadata"
......
......@@ -29,8 +29,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -28,8 +28,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -32,8 +32,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -31,8 +31,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
......@@ -26,8 +26,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "12.0.x-dev",
"dev-master": "12.0.x-dev"
"dev-main": "12.0.x-dev"
},
"typo3/cms": {
"Package": {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment