From eab7acf40dedb8d02fea8890f23cdcdb1bdad129 Mon Sep 17 00:00:00 2001 From: catch <catch@35733.no-reply.drupal.org> Date: Wed, 8 May 2024 20:57:23 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"Issue=20#3445224=20by=20catch,=20G?= =?UTF-8?q?=C3=A1bor=20Hojtsy:=20Update=20composer=20metapackages"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d7235bfe2f5fb0432aa931d620c09cea2b246e3f. --- composer/Metapackage/CoreRecommended/composer.json | 2 +- composer/Metapackage/PinnedDevDependencies/composer.json | 2 +- core/lib/Drupal/Component/Annotation/composer.json | 8 ++++---- 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 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json index 9095f5a62eaf..6b6058654dce 100644 --- a/composer/Metapackage/CoreRecommended/composer.json +++ b/composer/Metapackage/CoreRecommended/composer.json @@ -7,7 +7,7 @@ "webflo/drupal-core-strict": "*" }, "require": { - "drupal/core": "11.0.x-dev", + "drupal/core": "11.x-dev", "asm89/stack-cors": "~v2.2.0", "composer/semver": "~3.4.0", "doctrine/annotations": "~2.0.1", diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index e8bc1a5953d2..07398294462d 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": "11.0.x-dev", + "drupal/core": "11.x-dev", "behat/mink": "v1.11.0", "behat/mink-browserkit-driver": "v2.2.0", "colinodell/psr-testlogger": "v1.3.0", diff --git a/core/lib/Drupal/Component/Annotation/composer.json b/core/lib/Drupal/Component/Annotation/composer.json index 2912bffb0774..3575798a7c15 100644 --- a/core/lib/Drupal/Component/Annotation/composer.json +++ b/core/lib/Drupal/Component/Annotation/composer.json @@ -10,10 +10,10 @@ "php": ">=8.3.0", "doctrine/annotations": "^2.0", "doctrine/lexer": "^2.0", - "drupal/core-class-finder": "11.0.x-dev", - "drupal/core-file-cache": "11.0.x-dev", - "drupal/core-plugin": "11.0.x-dev", - "drupal/core-utility": "11.0.x-dev" + "drupal/core-class-finder": "11.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 b63a2f0f2fb6..3f99849600c5 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.3.0", - "drupal/core-utility": "11.0.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 d1ff18b20430..8bc8d69047e8 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.3.0", - "drupal/core-file-cache": "11.0.x-dev", - "drupal/core-serialization": "11.0.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 88a1475821d7..da56de5b7efa 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.3.0", - "drupal/core-serialization": "11.0.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 40f058131064..94e3e6c137de 100644 --- a/core/lib/Drupal/Component/Gettext/composer.json +++ b/core/lib/Drupal/Component/Gettext/composer.json @@ -9,7 +9,7 @@ }, "require": { "php": ">=8.3.0", - "drupal/core-render": "11.0.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 b480ffc39449..bf7c2d3b42e3 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.3.0", - "drupal/core-file-security": "11.0.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 32fbf7ab1705..83a3bf936a3c 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.3.0", - "drupal/core-utility": "11.0.x-dev" + "drupal/core-utility": "11.x-dev" }, "autoload": { "psr-4": { -- GitLab