From 135e3ba103d952d1c0615c78417d60ecab3a1fbe Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 9 Apr 2024 20:56:31 +0100
Subject: [PATCH] Issue #3437783 by mfb, pradhumanjain2311: Use standardized
SPDX license identifiers
---
core/core.libraries.yml | 52 +++++++++----------
.../Core/Asset/LibraryDiscoveryParser.php | 6 ++-
core/package.json | 2 +-
.../AssetAggregationAcrossPagesTest.php | 8 +--
...nTelemetryAuthenticatedPerformanceTest.php | 4 +-
.../OpenTelemetryFrontPagePerformanceTest.php | 4 +-
.../StandardPerformanceTest.php | 6 +--
.../CssCollectionOptimizerLazyUnitTest.php | 4 +-
.../Core/Asset/LibraryDiscoveryParserTest.php | 2 +-
...t_with_import.css.optimized.aggregated.css | 2 +-
.../css_license.css.optimized.aggregated.css | 2 +-
11 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index b0c78fce2331..275a3ac685df 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -21,7 +21,7 @@ ckeditor5:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -38,7 +38,7 @@ ckeditor5.editorClassic:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -50,7 +50,7 @@ ckeditor5.editorDecoupled:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -63,7 +63,7 @@ ckeditor5.essentials:
remote: https://github.com/ckeditor/ckeditor5
version: "35.1.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://github.com/ckeditor/ckeditor5/blob/v35.1.0/LICENSE.md
gpl-compatible: true
js:
@@ -76,7 +76,7 @@ ckeditor5.heading:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -89,7 +89,7 @@ ckeditor5.basic:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -102,7 +102,7 @@ ckeditor5.specialCharacters:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -115,7 +115,7 @@ ckeditor5.blockquote:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -128,7 +128,7 @@ ckeditor5.image:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -141,7 +141,7 @@ ckeditor5.link:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -154,7 +154,7 @@ ckeditor5.list:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -167,7 +167,7 @@ ckeditor5.horizontalLine:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -180,7 +180,7 @@ ckeditor5.htmlSupport:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -193,7 +193,7 @@ ckeditor5.alignment:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -206,7 +206,7 @@ ckeditor5.removeFormat:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -219,7 +219,7 @@ ckeditor5.pasteFromOffice:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -231,7 +231,7 @@ ckeditor5.indent:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -244,7 +244,7 @@ ckeditor5.sourceEditing:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -257,7 +257,7 @@ ckeditor5.table:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -270,7 +270,7 @@ ckeditor5.language:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -283,7 +283,7 @@ ckeditor5.codeBlock:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -296,7 +296,7 @@ ckeditor5.showBlocks:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v37.1.0/LICENSE.md
gpl-compatible: true
js:
@@ -308,7 +308,7 @@ ckeditor5.style:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -330,7 +330,7 @@ ckeditor5.autoformat:
remote: https://github.com/ckeditor/ckeditor5
version: "41.2.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v41.2.0/LICENSE.md
gpl-compatible: true
js:
@@ -788,7 +788,7 @@ internal.jquery.form:
# Internal library. Do not depend on it outside core nor add new core usage.
version: "4.3.0"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://raw.githubusercontent.com/jquery-form/form/master/LICENSE
gpl-compatible: true
js:
@@ -831,7 +831,7 @@ once:
remote: https://git.drupalcode.org/project/once
version: "1.0.1"
license:
- name: GNU-GPL-2.0-or-later
+ name: GPL-2.0-or-later
url: https://git.drupalcode.org/project/once/-/raw/v1.0.1/LICENSE.md
gpl-compatible: true
js:
diff --git a/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php b/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
index e3e8ce08f946..45ead977e0ff 100644
--- a/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
+++ b/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
@@ -182,7 +182,7 @@ public function buildByExtension($extension) {
// Assign Drupal's license to libraries that don't have license info.
if (!isset($library['license'])) {
$library['license'] = [
- 'name' => 'GNU-GPL-2.0-or-later',
+ 'name' => 'GPL-2.0-or-later',
'url' => 'https://www.drupal.org/licensing/faq',
'gpl-compatible' => TRUE,
];
@@ -358,7 +358,9 @@ public function buildByExtension($extension) {
* repository URL for reference.
* - license: If the remote property is set, the license information is
* required. It has 3 properties:
- * - name: The human-readable name of the license.
+ * - name: A System Package Data Exchange (SPDX) license identifier such as
+ * "GPL-2.0-or-later" (see https://spdx.org/licenses/), or if not
+ * applicable, the human-readable name of the license.
* - url: The URL of the license file/information for the version of the
* library used.
* - gpl-compatible: A Boolean for whether this library is GPL compatible.
diff --git a/core/package.json b/core/package.json
index a5cd1dd12a08..d9bc56010160 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,7 +1,7 @@
{
"name": "Drupal",
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
- "license": "GPL-2.0",
+ "license": "GPL-2.0-or-later",
"private": true,
"engines": {
"yarn": ">= 4.1.1",
diff --git a/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php b/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php
index 5204151bd104..b8817153a3e4 100644
--- a/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php
+++ b/core/profiles/demo_umami/tests/src/FunctionalJavascript/AssetAggregationAcrossPagesTest.php
@@ -25,9 +25,9 @@ class AssetAggregationAcrossPagesTest extends PerformanceTestBase {
public function testFrontAndRecipesPages() {
$performance_data = $this->doRequests();
$this->assertSame(4, $performance_data->getStylesheetCount());
- $this->assertSame(82363, $performance_data->getStylesheetBytes());
+ $this->assertSame(82347, $performance_data->getStylesheetBytes());
$this->assertSame(2, $performance_data->getScriptCount());
- $this->assertSame(14150, $performance_data->getScriptBytes());
+ $this->assertSame(14134, $performance_data->getScriptBytes());
}
/**
@@ -39,9 +39,9 @@ public function testFrontAndRecipesPagesAuthenticated() {
$this->rebuildAll();
$performance_data = $this->doRequests();
$this->assertSame(4, $performance_data->getStylesheetCount());
- $this->assertSame(89183, $performance_data->getStylesheetBytes());
+ $this->assertSame(89167, $performance_data->getStylesheetBytes());
$this->assertSame(2, $performance_data->getScriptCount());
- $this->assertSame(264166, $performance_data->getScriptBytes());
+ $this->assertSame(264134, $performance_data->getScriptBytes());
}
/**
diff --git a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryAuthenticatedPerformanceTest.php b/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryAuthenticatedPerformanceTest.php
index 7ac127792ba3..45e292430ce6 100644
--- a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryAuthenticatedPerformanceTest.php
+++ b/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryAuthenticatedPerformanceTest.php
@@ -36,9 +36,9 @@ public function testFrontPageAuthenticatedWarmCache(): void {
$this->drupalGet('<front>');
}, 'authenticatedFrontPage');
$this->assertSame(2, $performance_data->getStylesheetCount());
- $this->assertSame(44966, $performance_data->getStylesheetBytes());
+ $this->assertSame(44958, $performance_data->getStylesheetBytes());
$this->assertSame(1, $performance_data->getScriptCount());
- $this->assertSame(132083, $performance_data->getScriptBytes());
+ $this->assertSame(132067, $performance_data->getScriptBytes());
$expected_queries = [
'SELECT "session" FROM "sessions" WHERE "sid" = "SESSION_ID" LIMIT 0, 1',
diff --git a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php b/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php
index 5f3fbff2c45d..f3ef2a416d86 100644
--- a/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php
+++ b/core/profiles/demo_umami/tests/src/FunctionalJavascript/OpenTelemetryFrontPagePerformanceTest.php
@@ -64,9 +64,9 @@ public function testFrontPageHotCache() {
$this->assertSame(1, $performance_data->getCacheTagIsValidCount());
$this->assertSame(0, $performance_data->getCacheTagInvalidationCount());
$this->assertSame(1, $performance_data->getScriptCount());
- $this->assertSame(7075, $performance_data->getScriptBytes());
+ $this->assertSame(7067, $performance_data->getScriptBytes());
$this->assertSame(2, $performance_data->getStylesheetCount());
- $this->assertSame(41556, $performance_data->getStylesheetBytes());
+ $this->assertSame(41548, $performance_data->getStylesheetBytes());
}
/**
diff --git a/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php b/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php
index 7faf06c45a14..daa12b392fcc 100644
--- a/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php
+++ b/core/profiles/standard/tests/src/FunctionalJavascript/StandardPerformanceTest.php
@@ -55,7 +55,7 @@ public function testAnonymous() {
}, 'standardFrontPage');
$this->assertNoJavaScript($performance_data);
$this->assertSame(1, $performance_data->getStylesheetCount());
- $this->assertSame(3495, $performance_data->getStylesheetBytes());
+ $this->assertSame(3491, $performance_data->getStylesheetBytes());
$expected_queries = [
'SELECT "base_table"."id" AS "id", "base_table"."path" AS "path", "base_table"."alias" AS "alias", "base_table"."langcode" AS "langcode" FROM "path_alias" "base_table" WHERE ("base_table"."status" = 1) AND ("base_table"."alias" LIKE "/node" ESCAPE ' . "'\\\\'" . ') AND ("base_table"."langcode" IN ("en", "und")) ORDER BY "base_table"."langcode" ASC, "base_table"."id" DESC',
@@ -106,7 +106,7 @@ public function testAnonymous() {
}, 'standardNodePage');
$this->assertNoJavaScript($performance_data);
$this->assertSame(1, $performance_data->getStylesheetCount());
- $this->assertSame(3220, $performance_data->getStylesheetBytes());
+ $this->assertSame(3216, $performance_data->getStylesheetBytes());
$expected_queries = [
'SELECT "base_table"."id" AS "id", "base_table"."path" AS "path", "base_table"."alias" AS "alias", "base_table"."langcode" AS "langcode" FROM "path_alias" "base_table" WHERE ("base_table"."status" = 1) AND ("base_table"."alias" LIKE "/node/1" ESCAPE ' . "'\\\\'" . ') AND ("base_table"."langcode" IN ("en", "und")) ORDER BY "base_table"."langcode" ASC, "base_table"."id" DESC',
@@ -135,7 +135,7 @@ public function testAnonymous() {
}, 'standardUserPage');
$this->assertNoJavaScript($performance_data);
$this->assertSame(1, $performance_data->getStylesheetCount());
- $this->assertSame(3220, $performance_data->getStylesheetBytes());
+ $this->assertSame(3216, $performance_data->getStylesheetBytes());
$expected_queries = [
'SELECT "base_table"."id" AS "id", "base_table"."path" AS "path", "base_table"."alias" AS "alias", "base_table"."langcode" AS "langcode" FROM "path_alias" "base_table" WHERE ("base_table"."status" = 1) AND ("base_table"."alias" LIKE "/user/2" ESCAPE ' . "'\\\\'" . ') AND ("base_table"."langcode" IN ("en", "und")) ORDER BY "base_table"."langcode" ASC, "base_table"."id" DESC',
diff --git a/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerLazyUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerLazyUnitTest.php
index 561807d20eb4..798735a2c8a1 100644
--- a/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerLazyUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerLazyUnitTest.php
@@ -54,7 +54,7 @@ public function testCssImport(): void {
$mock_language = $this->createMock(LanguageManagerInterface::class);
$optimizer = new CssCollectionOptimizerLazy($mock_grouper, $mock_optimizer, $mock_theme_manager, $mock_dependency_resolver, new RequestStack(), $mock_file_system, $mock_config_factory, $mock_file_url_generator, $mock_time, $mock_language);
$gpl_license = [
- 'name' => 'GNU-GPL-2.0-or-later',
+ 'name' => 'GPL-2.0-or-later',
'url' => 'https://www.drupal.org/licensing/faq',
'gpl-compatible' => TRUE,
];
@@ -113,7 +113,7 @@ public function testCssLicenseAggregation(): void {
$mock_language = $this->createMock(LanguageManagerInterface::class);
$optimizer = new CssCollectionOptimizerLazy($mock_grouper, $mock_optimizer, $mock_theme_manager, $mock_dependency_resolver, new RequestStack(), $mock_file_system, $mock_config_factory, $mock_file_url_generator, $mock_time, $mock_language);
$gpl_license = [
- 'name' => 'GNU-GPL-2.0-or-later',
+ 'name' => 'GPL-2.0-or-later',
'url' => 'https://www.drupal.org/licensing/faq',
'gpl-compatible' => TRUE,
];
diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
index 1e92c3da121b..67b440fb2f9e 100644
--- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
@@ -568,7 +568,7 @@ public function testLibraryWithLicenses() {
$this->assertCount(1, $library['js']);
$this->assertTrue(isset($library['license']));
$default_license = [
- 'name' => 'GNU-GPL-2.0-or-later',
+ 'name' => 'GPL-2.0-or-later',
'url' => 'https://www.drupal.org/licensing/faq',
'gpl-compatible' => TRUE,
];
diff --git a/core/tests/Drupal/Tests/Core/Asset/css_test_files/css_input_with_import.css.optimized.aggregated.css b/core/tests/Drupal/Tests/Core/Asset/css_test_files/css_input_with_import.css.optimized.aggregated.css
index cad7c7f0cfb7..1c7d77fbf52e 100644
--- a/core/tests/Drupal/Tests/Core/Asset/css_test_files/css_input_with_import.css.optimized.aggregated.css
+++ b/core/tests/Drupal/Tests/Core/Asset/css_test_files/css_input_with_import.css.optimized.aggregated.css
@@ -1,5 +1,5 @@
@import url("https://fonts.fontprovider.com/css2?family=Roboto+Mono:wght@300;400&family=Roboto:ital,wght@0,300;0,400;1,300;1,400&display=swap") print;@import url('import1.css') screen;@import url("http://example.com/style.css");@import url("//example.com/style.css");@import url("https://fonts.fontprovider.com/css2?family=Roboto+Mono:wght@300;400&family=Roboto:ital,wght@0,300;0,400;1,300;1,400&display=swap");@import url("http://example.com/style.css") screen and (orientation:landscape);@import "http://example.com/style.css" screen;@import "http://example.com/style.css" supports(display:table-cell);@import "http://example.com/style.css" supports(display:table-cell) screen;@import url("http://example.com/style.css") screen and (orientation:landscape);@import url("http://example.com/style.css") screen;@import url("http://user:pass@example.com/style.css") screen and (orientation:landscape);@import url(http://example.com/cus\(t;om.css);@import url('http://example.com/cu(st;o)m.css');@import url("http://user:pass@example.com/cu(s)t;om.css");@import url(http://user:pass@example.com/cu\(s\)t;om.css);
-/* @license GNU-GPL-2.0-or-later https://www.drupal.org/licensing/faq */
+/* @license GPL-2.0-or-later https://www.drupal.org/licensing/faq */
ul,select{font:1em/160% Verdana,sans-serif;color:#494949;}.ui-icon{background-image:url(images/icon.png);}.data .double-quote{background-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");}.data .single-quote{background-image:url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDACAWGBwYFCAcGhwkIiAmMFA0MCwsMGJGSjpQdGZ6eHJmcG6AkLicgIiuim5woNqirr7EztDOfJri8uDI8LjKzsb/2wBDASIkJDAqMF40NF7GhHCExsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsb/wAARCAABAAEDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAb/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AKAAH//Z');}.data .no-quote{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAEAQAAAAAo/mtHAAAAIElEQVQIHWMRnWHwcRNLN8NZ7QYWwT8PlBlYsgqVBRsAankIMw5MtnoAAAAASUVORK5CYII=);}
p,select{font:1em/160% Verdana,sans-serif;color:#494949;}
ul,select{font:1em/160% Verdana,sans-serif;color:#494949;}.ui-icon{background-image:url(images/icon.png);}.data .double-quote{background-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");}.data .single-quote{background-image:url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDACAWGBwYFCAcGhwkIiAmMFA0MCwsMGJGSjpQdGZ6eHJmcG6AkLicgIiuim5woNqirr7EztDOfJri8uDI8LjKzsb/2wBDASIkJDAqMF40NF7GhHCExsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsb/wAARCAABAAEDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAb/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AKAAH//Z');}.data .no-quote{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAEAQAAAAAo/mtHAAAAIElEQVQIHWMRnWHwcRNLN8NZ7QYWwT8PlBlYsgqVBRsAankIMw5MtnoAAAAASUVORK5CYII=);}
diff --git a/core/tests/Drupal/Tests/Core/Asset/css_test_files/css_license.css.optimized.aggregated.css b/core/tests/Drupal/Tests/Core/Asset/css_test_files/css_license.css.optimized.aggregated.css
index 40e901073483..07fb5aa45708 100644
--- a/core/tests/Drupal/Tests/Core/Asset/css_test_files/css_license.css.optimized.aggregated.css
+++ b/core/tests/Drupal/Tests/Core/Asset/css_test_files/css_license.css.optimized.aggregated.css
@@ -1,5 +1,5 @@
@import url("https://fonts.fontprovider.com/css2?family=Roboto+Mono:wght@300;400&family=Roboto:ital,wght@0,300;0,400;1,300;1,400&display=swap") print;@import url('import1.css') screen;@import url("http://example.com/style.css");@import url("//example.com/style.css");@import url("https://fonts.fontprovider.com/css2?family=Roboto+Mono:wght@300;400&family=Roboto:ital,wght@0,300;0,400;1,300;1,400&display=swap");@import url("http://example.com/style.css") screen and (orientation:landscape);@import "http://example.com/style.css" screen;@import "http://example.com/style.css" supports(display:table-cell);@import "http://example.com/style.css" supports(display:table-cell) screen;@import url("http://example.com/style.css") screen and (orientation:landscape);@import url("http://example.com/style.css") screen;@import url("http://user:pass@example.com/style.css") screen and (orientation:landscape);@import url(http://example.com/cus\(t;om.css);@import url('http://example.com/cu(st;o)m.css');@import url("http://user:pass@example.com/cu(s)t;om.css");@import url(http://user:pass@example.com/cu\(s\)t;om.css);
-/* @license GNU-GPL-2.0-or-later https://www.drupal.org/licensing/faq */
+/* @license GPL-2.0-or-later https://www.drupal.org/licensing/faq */
ul,select{font:1em/160% Verdana,sans-serif;color:#494949;}.ui-icon{background-image:url(images/icon.png);}.data .double-quote{background-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");}.data .single-quote{background-image:url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDACAWGBwYFCAcGhwkIiAmMFA0MCwsMGJGSjpQdGZ6eHJmcG6AkLicgIiuim5woNqirr7EztDOfJri8uDI8LjKzsb/2wBDASIkJDAqMF40NF7GhHCExsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsb/wAARCAABAAEDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAb/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AKAAH//Z');}.data .no-quote{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAEAQAAAAAo/mtHAAAAIElEQVQIHWMRnWHwcRNLN8NZ7QYWwT8PlBlYsgqVBRsAankIMw5MtnoAAAAASUVORK5CYII=);}
p,select{font:1em/160% Verdana,sans-serif;color:#494949;}
ul,select{font:1em/160% Verdana,sans-serif;color:#494949;}.ui-icon{background-image:url(images/icon.png);}.data .double-quote{background-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7");}.data .single-quote{background-image:url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDACAWGBwYFCAcGhwkIiAmMFA0MCwsMGJGSjpQdGZ6eHJmcG6AkLicgIiuim5woNqirr7EztDOfJri8uDI8LjKzsb/2wBDASIkJDAqMF40NF7GhHCExsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsb/wAARCAABAAEDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAb/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AKAAH//Z');}.data .no-quote{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAEAQAAAAAo/mtHAAAAIElEQVQIHWMRnWHwcRNLN8NZ7QYWwT8PlBlYsgqVBRsAankIMw5MtnoAAAAASUVORK5CYII=);}
--
GitLab