core/core.libraries.yml | 36 +++++++++++----------- core/lib/Drupal/Core/Asset/LibraryDiscovery.php | 2 +- .../Tests/Core/Asset/LibraryDiscoveryTest.php | 2 +- .../library_test_files/licenses.libraries.yml | 8 ++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/core/core.libraries.yml b/core/core.libraries.yml index 2349d9f..952501b 100644 --- a/core/core.libraries.yml +++ b/core/core.libraries.yml @@ -5,7 +5,7 @@ backbone: version: 1.1.0 license: name: MIT - remote: https://github.com/jashkenas/backbone/blob/1.1.0/LICENSE + url: https://github.com/jashkenas/backbone/blob/1.1.0/LICENSE gpl-compatible: true js: assets/vendor/backbone/backbone.js: { weight: -19 } @@ -18,7 +18,7 @@ classList: version: master license: name: Public Domain - remote: https://github.com/eligrey/classList.js/blob/master/LICENSE.md + url: https://github.com/eligrey/classList.js/blob/master/LICENSE.md gpl-compatible: true js: assets/vendor/classList/classList.min.js: { weight: -21, browsers: { IE: 'lte IE 9', '!IE': false } } @@ -30,7 +30,7 @@ ckeditor: commit: 887d81ac1824008b690e439a1b29eb4f13b51212 license: name: GNU-GPL-2.0-or-later - remote: https://github.com/ckeditor/ckeditor-dev/blob/887d81ac1824008b690e439a1b29eb4f13b51212/LICENSE.md + url: https://github.com/ckeditor/ckeditor-dev/blob/887d81ac1824008b690e439a1b29eb4f13b51212/LICENSE.md gpl-compatible: true js: assets/vendor/ckeditor/ckeditor.js: { preprocess: false } @@ -40,7 +40,7 @@ domready: version: 1.0.4 license: name: MIT - remote: https://github.com/ded/domready/blob/v1.0.4/LICENSE + url: https://github.com/ded/domready/blob/v1.0.4/LICENSE gpl-compatible: true js: assets/vendor/domready/ready.min.js: { weight: -21 } @@ -297,7 +297,7 @@ html5shiv: version: 3.6.2 license: name: GNU-GPL-2.0-or-later - remote: http://www.gnu.org/licenses/gpl-2.0.html + url: http://www.gnu.org/licenses/gpl-2.0.html gpl-compatible: true js: assets/vendor/html5shiv/html5.js: { every_page: true, weight: -22, browsers: { IE: 'lte IE 8', '!IE': false } } @@ -307,7 +307,7 @@ jquery: version: 2.1.0 license: name: MIT - remote: https://github.com/jquery/jquery/blob/2.1.0/MIT-LICENSE.txt + url: https://github.com/jquery/jquery/blob/2.1.0/MIT-LICENSE.txt gpl-compatible: true js: assets/vendor/jquery/jquery.js: { weight: -20 } @@ -317,7 +317,7 @@ jquery.cookie: version: v1.4.0 license: name: MIT - remote: https://github.com/carhartl/jquery-cookie/blob/v1.4.0/MIT-LICENSE.txt + url: https://github.com/carhartl/jquery-cookie/blob/v1.4.0/MIT-LICENSE.txt gpl-compatible: true js: assets/vendor/jquery.cookie/jquery.cookie.js: {} @@ -330,7 +330,7 @@ jquery.farbtastic: version: 1.2 license: name: GNU-GPL-2.0-or-later - remote: https://github.com/mattfarina/farbtastic/blob/master/LICENSE.txt + url: https://github.com/mattfarina/farbtastic/blob/master/LICENSE.txt gpl-compatible: true js: assets/vendor/farbtastic/farbtastic.js: {} @@ -345,7 +345,7 @@ jquery.form: version: 3.50 license: name: GNU-GPL-2.0-or-later - remote: http://malsup.github.com/gpl-license-v2.txt + url: http://malsup.github.com/gpl-license-v2.txt gpl-compatible: true js: assets/vendor/jquery-form/jquery.form.js: {} @@ -364,7 +364,7 @@ jquery.joyride: version: v2.0.3 license: name: MIT - remote: https://github.com/zurb/joyride/blob/v2.0.3/README.markdown + url: https://github.com/zurb/joyride/blob/v2.0.3/README.markdown gpl-compatible: true js: assets/vendor/jquery-joyride/jquery.joyride-2.0.3.js: {} @@ -377,7 +377,7 @@ jquery.once: version: 1.2.3 license: name: GNU-GPL-2.0-or-later - remote: https://github.com/RobLoach/jquery-once/blob/1.2.3/LICENSE + url: https://github.com/RobLoach/jquery-once/blob/1.2.3/LICENSE gpl-compatible: true js: assets/vendor/jquery-once/jquery.once.js: { weight: -19 } @@ -389,7 +389,7 @@ jquery.ui: version: &jquery_ui_version 1.10.2 license: &jquery_ui_license name: MIT - remote: https://github.com/jquery/jquery-ui/blob/1.10.2/MIT-LICENSE.txt + url: https://github.com/jquery/jquery-ui/blob/1.10.2/MIT-LICENSE.txt gpl-compatible: true js: assets/vendor/jquery.ui/ui/jquery.ui.core.js: { weight: -11 } @@ -725,7 +725,7 @@ jquery.ui.touch-punch: version: 0.2.2 license: name: GNU-GPL-2.0-or-later - remote: https://github.com/furf/jquery-ui-touch-punch + url: https://github.com/furf/jquery-ui-touch-punch gpl-compatible: true js: assets/vendor/jquery-ui-touch-punch/jquery.ui.touch-punch.js: {} @@ -747,7 +747,7 @@ matchmedia: version: VERSION license: name: MIT - remote: https://github.com/paulirish/matchMedia.js/blob/0.1.0/LICENSE.txt + url: https://github.com/paulirish/matchMedia.js/blob/0.1.0/LICENSE.txt gpl-compatible: true js: misc/matchmedia.js: {} @@ -758,7 +758,7 @@ modernizr: remote: https://github.com/Modernizr/Modernizr license: name: MIT - remote: http://modernizr.com/license/ + url: http://modernizr.com/license/ gpl-compatible: true version: v2.6.2 js: @@ -769,7 +769,7 @@ normalize: version: 3.0.1 license: name: MIT - remote: https://github.com/necolas/normalize.css/blob/master/LICENSE.md + url: https://github.com/necolas/normalize.css/blob/master/LICENSE.md gpl-compatible: true css: base: @@ -782,7 +782,7 @@ picturefill: version: VERSION license: name: MIT - remote: https://github.com/scottjehl/picturefill/blob/master/LICENSE + url: https://github.com/scottjehl/picturefill/blob/master/LICENSE gpl-compatible: true js: assets/vendor/picturefill/picturefill.js: { weight: -10 } @@ -794,7 +794,7 @@ underscore: version: 1.5.2 license: name: MIT - remote: https://github.com/jashkenas/underscore/blob/1.5.2/LICENSE + url: https://github.com/jashkenas/underscore/blob/1.5.2/LICENSE gpl-compatible: true js: assets/vendor/underscore/underscore.js: { weight: -20 } diff --git a/core/lib/Drupal/Core/Asset/LibraryDiscovery.php b/core/lib/Drupal/Core/Asset/LibraryDiscovery.php index 2798bf3..fe1d284 100644 --- a/core/lib/Drupal/Core/Asset/LibraryDiscovery.php +++ b/core/lib/Drupal/Core/Asset/LibraryDiscovery.php @@ -178,7 +178,7 @@ protected function buildLibrariesByExtension($extension) { if (!isset($library['license'])) { $library['license'] = array( 'name' => 'GNU-GPL-2.0-or-later', - 'remote' => 'https://drupal.org/licensing/faq', + 'url' => 'https://drupal.org/licensing/faq', 'gpl-compatible' => TRUE, ); } diff --git a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php index 815e942..a1ef67f 100644 --- a/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryTest.php @@ -397,7 +397,7 @@ public function testLibraryWithLicenses() { $this->assertTrue(isset($library['license'])); $default_license = array( 'name' => 'GNU-GPL-2.0-or-later', - 'remote' => 'https://drupal.org/licensing/faq', + 'url' => 'https://drupal.org/licensing/faq', 'gpl-compatible' => TRUE, ); $this->assertEquals($library['license'], $default_license, 'Default license is applied.'); diff --git a/core/tests/Drupal/Tests/Core/Asset/library_test_files/licenses.libraries.yml b/core/tests/Drupal/Tests/Core/Asset/library_test_files/licenses.libraries.yml index 3284c96..455b4c5 100644 --- a/core/tests/Drupal/Tests/Core/Asset/library_test_files/licenses.libraries.yml +++ b/core/tests/Drupal/Tests/Core/Asset/library_test_files/licenses.libraries.yml @@ -12,7 +12,7 @@ gpl2: version: 1.0 license: name: gpl2 - remote: https://url-to-gpl2-license + url: https://url-to-gpl2-license gpl-compatible: true js: gpl2.js: {} @@ -25,7 +25,7 @@ mit: version: 1.0 license: name: MIT - remote: https://url-to-mit-license + url: https://url-to-mit-license gpl-compatible: true js: mit.js: {} @@ -38,7 +38,7 @@ public-domain: version: 1.0 license: name: Public Domain - remote: https://url-to-public-domain-license + url: https://url-to-public-domain-license gpl-compatible: true js: public-domain.js: {} @@ -51,7 +51,7 @@ apache: version: 1.0 license: name: apache - remote: https://url-to-apache-license + url: https://url-to-apache-license gpl-compatible: false js: apache.js: {}