From 75a15bb8fd0320d75aaae673fbc06508636da142 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 5 Sep 2023 14:59:07 +0100
Subject: [PATCH] Issue #3377516 by longwave: Core subtree split is broken
after adding branch alias
---
composer.json | 3 ---
composer.lock | 7 ++-----
composer/Metapackage/CoreRecommended/composer.json | 2 +-
.../Metapackage/PinnedDevDependencies/composer.json | 2 +-
composer/Template/LegacyProject/composer.json | 10 +++++-----
composer/Template/RecommendedProject/composer.json | 8 ++++----
core/composer.json | 3 ---
core/lib/Drupal.php | 2 +-
core/lib/Drupal/Component/Annotation/composer.json | 6 +++---
core/lib/Drupal/Component/Datetime/composer.json | 2 +-
core/lib/Drupal/Component/Discovery/composer.json | 4 ++--
core/lib/Drupal/Component/FrontMatter/composer.json | 2 +-
core/lib/Drupal/Component/Gettext/composer.json | 2 +-
core/lib/Drupal/Component/PhpStorage/composer.json | 2 +-
core/lib/Drupal/Component/Render/composer.json | 2 +-
15 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/composer.json b/composer.json
index 86b6c85e0462..5467d641de4f 100644
--- a/composer.json
+++ b/composer.json
@@ -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.",
diff --git a/composer.lock b/composer.lock
index fffd58081c5f..20e28998f121 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": "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",
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index 8a4d9c78e9c4..11ffb3642430 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -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",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index e2b9a4dbfff2..902adf15fce6 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -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",
diff --git a/composer/Template/LegacyProject/composer.json b/composer/Template/LegacyProject/composer.json
index a8fceccd0dd2..204d1dcba1eb 100644
--- a/composer/Template/LegacyProject/composer.json
+++ b/composer/Template/LegacyProject/composer.json
@@ -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": "*"
diff --git a/composer/Template/RecommendedProject/composer.json b/composer/Template/RecommendedProject/composer.json
index 56d98de870fd..0b4926dabfda 100644
--- a/composer/Template/RecommendedProject/composer.json
+++ b/composer/Template/RecommendedProject/composer.json
@@ -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": "*"
diff --git a/core/composer.json b/core/composer.json
index c38277c62f35..47cf2763b385 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -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",
diff --git a/core/lib/Drupal.php b/core/lib/Drupal.php
index 33b94192a2b4..cb51a509fcee 100644
--- a/core/lib/Drupal.php
+++ b/core/lib/Drupal.php
@@ -75,7 +75,7 @@ class Drupal {
/**
* The current system version.
*/
- const VERSION = '10.2.0-dev';
+ const VERSION = '11.0-dev';
/**
* Core API compatibility.
diff --git a/core/lib/Drupal/Component/Annotation/composer.json b/core/lib/Drupal/Component/Annotation/composer.json
index a755e8f04867..feabe9279fe0 100644
--- a/core/lib/Drupal/Component/Annotation/composer.json
+++ b/core/lib/Drupal/Component/Annotation/composer.json
@@ -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": {
diff --git a/core/lib/Drupal/Component/Datetime/composer.json b/core/lib/Drupal/Component/Datetime/composer.json
index 7a16ab9e344f..91bd608f5570 100644
--- a/core/lib/Drupal/Component/Datetime/composer.json
+++ b/core/lib/Drupal/Component/Datetime/composer.json
@@ -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": {
diff --git a/core/lib/Drupal/Component/Discovery/composer.json b/core/lib/Drupal/Component/Discovery/composer.json
index c0800a842b7c..4a9343967682 100644
--- a/core/lib/Drupal/Component/Discovery/composer.json
+++ b/core/lib/Drupal/Component/Discovery/composer.json
@@ -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": {
diff --git a/core/lib/Drupal/Component/FrontMatter/composer.json b/core/lib/Drupal/Component/FrontMatter/composer.json
index ac246ae49b15..9baa12c9d92d 100644
--- a/core/lib/Drupal/Component/FrontMatter/composer.json
+++ b/core/lib/Drupal/Component/FrontMatter/composer.json
@@ -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": {
diff --git a/core/lib/Drupal/Component/Gettext/composer.json b/core/lib/Drupal/Component/Gettext/composer.json
index 8893295f5fb0..0db3a4bc30b6 100644
--- a/core/lib/Drupal/Component/Gettext/composer.json
+++ b/core/lib/Drupal/Component/Gettext/composer.json
@@ -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": {
diff --git a/core/lib/Drupal/Component/PhpStorage/composer.json b/core/lib/Drupal/Component/PhpStorage/composer.json
index 29466cafd95c..0517f06b0e35 100644
--- a/core/lib/Drupal/Component/PhpStorage/composer.json
+++ b/core/lib/Drupal/Component/PhpStorage/composer.json
@@ -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": {
diff --git a/core/lib/Drupal/Component/Render/composer.json b/core/lib/Drupal/Component/Render/composer.json
index fd01afa0b255..338eb5135b2b 100644
--- a/core/lib/Drupal/Component/Render/composer.json
+++ b/core/lib/Drupal/Component/Render/composer.json
@@ -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": {
--
GitLab