Verified Commit e3da4cc3 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3437783 by mfb, catch, pradhumanjain2311, longwave: Use standardized... 

Issue #3437783 by mfb, catch, pradhumanjain2311, longwave: Use standardized SPDX license identifiers
parent 90981ea9

core/core.libraries.yml

+26 −26
Original line number Diff line number Diff line
@@ -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:
@@ -840,7 +840,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:
@@ -896,7 +896,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:

core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php

+4 −2
Original line number Diff line number Diff line
@@ -186,7 +186,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,

        ];
@@ -362,7 +362,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.

core/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "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": ">= 1.6",

core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerLazyUnitTest.php

+2 −2
Original line number Diff line number Diff line
@@ -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,

    ];

core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerUnitTest.php

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public function testCssImport() { 
    $mock_file_system = $this->createMock(FileSystemInterface::class);

    $this->optimizer = new CssCollectionOptimizer($mock_grouper, $mock_optimizer, $mock_dumper, $mock_state, $mock_file_system);

    $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,

    ];
@@ -123,7 +123,7 @@ public function testCssLicenseAggregation() { 
    $mock_file_system = $this->createMock(FileSystemInterface::class);

    $this->optimizer = new CssCollectionOptimizer($mock_grouper, $mock_optimizer, $mock_dumper, $mock_state, $mock_file_system);

    $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,

    ];