Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3377516 by longwave: Core subtree split is broken after adding branch alias

merge-requests/4443/merge
catch 2023-09-05 14:59:07 +01:00
parent 531383c170
commit 75a15bb8fd
15 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -68,9 +68,6 @@
}
},
"extra": {
"branch-alias": {
"dev-11.x": "10.2.x-dev"
},
"_readme": [
"By default Drupal loads the autoloader from ./vendor/autoload.php.",
"To change the autoloader you can edit ./autoload.php.",

7
composer.lock generated
View File

@ -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": "1023c262eb294df10ca4ff80c6d3ceb6",
"content-hash": "f3f72146ac9ba2de4360c6b6ba23518b",
"packages": [
{
"name": "asm89/stack-cors",
@ -495,7 +495,7 @@
"dist": {
"type": "path",
"url": "core",
"reference": "4c5eafca7cdc5f796a213a6722415c7f371731ef"
"reference": "d8c2e380c13d2892038560c5591ef07ac31c6add"
},
"require": {
"asm89/stack-cors": "^2.1",
@ -573,9 +573,6 @@
},
"type": "drupal-core",
"extra": {
"branch-alias": {
"dev-11.x": "10.2.x-dev"
},
"drupal-scaffold": {
"file-mapping": {
"[project-root]/.editorconfig": "assets/scaffold/files/editorconfig",

2
composer/Metapackage/CoreRecommended/composer.json
View File

@ -7,7 +7,7 @@
"webflo/drupal-core-strict": "*"
},
"require": {
"drupal/core": "10.2.x-dev",
"drupal/core": "11.x-dev",
"asm89/stack-cors": "~v2.1.1",
"composer/semver": "~3.3.2",
"doctrine/annotations": "~1.14.3",

2
composer/Metapackage/PinnedDevDependencies/composer.json
View File

@ -7,7 +7,7 @@
"webflo/drupal-core-require-dev": "*"
},
"require": {
"drupal/core": "10.2.x-dev",
"drupal/core": "11.x-dev",
"behat/mink": "v1.10.0",
"behat/mink-browserkit-driver": "v2.1.0",
"behat/mink-selenium2-driver": "v1.6.0",

10
composer/Template/LegacyProject/composer.json
View File

@ -16,13 +16,13 @@
],
"require": {
"composer/installers": "^2.0",
"drupal/core-composer-scaffold": "^10.2",
"drupal/core-project-message": "^10.2",
"drupal/core-recommended": "^10.2",
"drupal/core-vendor-hardening": "^10.2"
"drupal/core-composer-scaffold": "^11",
"drupal/core-project-message": "^11",
"drupal/core-recommended": "^11",
"drupal/core-vendor-hardening": "^11"
},
"require-dev": {
"drupal/core-dev": "^10.2"
"drupal/core-dev": "^11"
},
"conflict": {
"drupal/drupal": "*"

8
composer/Template/RecommendedProject/composer.json
View File

@ -16,12 +16,12 @@
],
"require": {
"composer/installers": "^2.0",
"drupal/core-composer-scaffold": "^10.2",
"drupal/core-project-message": "^10.2",
"drupal/core-recommended": "^10.2"
"drupal/core-composer-scaffold": "^11",
"drupal/core-project-message": "^11",
"drupal/core-recommended": "^11"
},
"require-dev": {
"drupal/core-dev": "^10.2"
"drupal/core-dev": "^11"
},
"conflict": {
"drupal/drupal": "*"

3
core/composer.json
View File

@ -115,9 +115,6 @@
"ext-zip": "Needed to extend the plugin.manager.archiver service capability with the handling of files in the ZIP format."
},
"extra": {
"branch-alias": {
"dev-11.x": "10.2.x-dev"
},
"drupal-scaffold": {
"file-mapping": {
"[project-root]/.editorconfig": "assets/scaffold/files/editorconfig",

2
core/lib/Drupal.php
View File

@ -75,7 +75,7 @@ class Drupal {
/**
* The current system version.
*/
const VERSION = '10.2.0-dev';
const VERSION = '11.0-dev';
/**
* Core API compatibility.

6
core/lib/Drupal/Component/Annotation/composer.json
View File

@ -9,9 +9,9 @@
"require": {
"php": ">=8.1.0",
"doctrine/annotations": "^1.14",
"drupal/core-file-cache": "10.2.x-dev",
"drupal/core-plugin": "10.2.x-dev",
"drupal/core-utility": "10.2.x-dev"
"drupal/core-file-cache": "11.x-dev",
"drupal/core-plugin": "11.x-dev",
"drupal/core-utility": "11.x-dev"
},
"autoload": {
"psr-4": {

2
core/lib/Drupal/Component/Datetime/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
"drupal/core-utility": "10.2.x-dev"
"drupal/core-utility": "11.x-dev"
},
"autoload": {
"psr-4": {

4
core/lib/Drupal/Component/Discovery/composer.json
View File

@ -8,8 +8,8 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
"drupal/core-file-cache": "10.2.x-dev",
"drupal/core-serialization": "10.2.x-dev"
"drupal/core-file-cache": "11.x-dev",
"drupal/core-serialization": "11.x-dev"
},
"autoload": {
"psr-4": {

2
core/lib/Drupal/Component/FrontMatter/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
"drupal/core-serialization": "10.2.x-dev"
"drupal/core-serialization": "11.x-dev"
},
"autoload": {
"psr-4": {

2
core/lib/Drupal/Component/Gettext/composer.json
View File

@ -9,7 +9,7 @@
},
"require": {
"php": ">=8.1.0",
"drupal/core-render": "10.2.x-dev"
"drupal/core-render": "11.x-dev"
},
"autoload": {
"psr-4": {

2
core/lib/Drupal/Component/PhpStorage/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
"drupal/core-file-security": "10.2.x-dev"
"drupal/core-file-security": "11.x-dev"
},
"autoload": {
"psr-4": {

2
core/lib/Drupal/Component/Render/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
"drupal/core-utility": "10.2.x-dev"
"drupal/core-utility": "11.x-dev"
},
"autoload": {
"psr-4": {