From: Kunal Mehta Date: Tue, 6 Mar 2018 01:14:07 +0000 (-0800) Subject: Use SPDX 3.0 license identifier X-Git-Tag: 1.31.0-rc.0~355 X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=2d5c742db3c2a0302e7c699a25fbf94cae0a2d7e;p=lhc%2Fweb%2Fwiklou.git Use SPDX 3.0 license identifier SPDX released version 3 of their license list (), which changed the FSF licenses to explicitly end in -only or -or-later instead of relying on an easy to miss + symbol. Bug: T183858 Change-Id: I4cbb98ea2bbacf46a57401dbba2bdb076fca1d3a --- diff --git a/composer.json b/composer.json index 178c280c2f..0569b03069 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits" } ], - "license": "GPL-2.0+", + "license": "GPL-2.0-or-later", "support": { "issues": "https://bugs.mediawiki.org/", "irc": "irc://irc.freenode.net/mediawiki", diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index fad49e48c8..538c1b25a9 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -7335,7 +7335,7 @@ $wgAutoloadAttemptLowercase = true; * 'version' => '1.9.0', * 'url' => 'https://example.org/example-extension/', * 'descriptionmsg' => 'exampleextension-desc', - * 'license-name' => 'GPL-2.0+', + * 'license-name' => 'GPL-2.0-or-later', * ]; * @endcode * @@ -7369,7 +7369,7 @@ $wgAutoloadAttemptLowercase = true; * localizable message (omit in favour of 'descriptionmsg'). * * - license-name: Short name of the license (used as label for the link), such - * as "GPL-2.0+" or "MIT" (https://spdx.org/licenses/ for a list of identifiers). + * as "GPL-2.0-or-later" or "MIT" (https://spdx.org/licenses/ for a list of identifiers). */ $wgExtensionCredits = []; diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 73315a0966..22202c0c11 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -2465,7 +2465,7 @@ abstract class ApiBase extends ContextSource { realpath( __DIR__ ) ?: __DIR__ => [ 'path' => $IP, 'name' => 'MediaWiki', - 'license-name' => 'GPL-2.0+', + 'license-name' => 'GPL-2.0-or-later', ], realpath( "$IP/extensions" ) ?: "$IP/extensions" => null, realpath( $extDir ) ?: $extDir => null, diff --git a/includes/libs/HtmlArmor.php b/includes/libs/HtmlArmor.php index 1c141ab0bb..6e6ad7c9b4 100644 --- a/includes/libs/HtmlArmor.php +++ b/includes/libs/HtmlArmor.php @@ -16,7 +16,7 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GPL-2.0+ + * @license GPL-2.0-or-later * @author Kunal Mehta */ diff --git a/includes/libs/http/HttpAcceptNegotiator.php b/includes/libs/http/HttpAcceptNegotiator.php index 84c1182c0c..4de8e77e39 100644 --- a/includes/libs/http/HttpAcceptNegotiator.php +++ b/includes/libs/http/HttpAcceptNegotiator.php @@ -10,7 +10,7 @@ namespace Wikimedia\Http; * To use this with a request header, first parse the header value into an array of weights * using HttpAcceptParser, then call getBestSupportedKey. * - * @license GPL-2.0+ + * @license GPL-2.0-or-later * @author Daniel Kinzler * @author Thiemo Kreuz */ diff --git a/includes/libs/http/HttpAcceptParser.php b/includes/libs/http/HttpAcceptParser.php index bce071e726..df22b414f1 100644 --- a/includes/libs/http/HttpAcceptParser.php +++ b/includes/libs/http/HttpAcceptParser.php @@ -4,7 +4,7 @@ * Utility for parsing a HTTP Accept header value into a weight map. May also be used with * other, similar headers like Accept-Language, Accept-Encoding, etc. * - * @license GPL-2.0+ + * @license GPL-2.0-or-later * @author Daniel Kinzler */ diff --git a/tests/phpunit/data/composer/composer.json b/tests/phpunit/data/composer/composer.json index bcd196f4fd..9b902ae810 100644 --- a/tests/phpunit/data/composer/composer.json +++ b/tests/phpunit/data/composer/composer.json @@ -9,7 +9,7 @@ "homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits" } ], - "license": "GPL-2.0", + "license": "GPL-2.0-only", "support": { "issues": "https://bugzilla.wikimedia.org/", "irc": "irc://irc.freenode.net/mediawiki", diff --git a/tests/phpunit/data/composer/composer.lock b/tests/phpunit/data/composer/composer.lock index cae6a478a0..5c030db8f4 100644 --- a/tests/phpunit/data/composer/composer.lock +++ b/tests/phpunit/data/composer/composer.lock @@ -162,7 +162,7 @@ "notification-url": "https://packagist.org/downloads/", "license": [ "MIT", - "GPL-3.0" + "GPL-3.0-only" ], "authors": [ { @@ -207,7 +207,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -265,7 +265,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+", + "GPL-2.0-or-later", "MIT" ], "description": "The primary aim is to allow users to select a language and configure its support in an easy way. Main features are language selection, input methods and web fonts.", @@ -374,7 +374,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0" + "GPL-2.0-only" ], "authors": [ { diff --git a/tests/phpunit/data/composer/installed.json b/tests/phpunit/data/composer/installed.json index ddac980156..88a6bae237 100644 --- a/tests/phpunit/data/composer/installed.json +++ b/tests/phpunit/data/composer/installed.json @@ -30,7 +30,7 @@ "notification-url": "https://packagist.org/downloads/", "license": [ "MIT", - "GPL-3.0" + "GPL-3.0-only" ], "authors": [ { diff --git a/tests/phpunit/data/composer/new-composer.json b/tests/phpunit/data/composer/new-composer.json index 0634c2ddbf..3a886769e2 100644 --- a/tests/phpunit/data/composer/new-composer.json +++ b/tests/phpunit/data/composer/new-composer.json @@ -9,7 +9,7 @@ "homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits" } ], - "license": "GPL-2.0", + "license": "GPL-2.0-only", "support": { "issues": "https://bugzilla.wikimedia.org/", "irc": "irc://irc.freenode.net/mediawiki", diff --git a/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php b/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php index 23225b6b06..05ae2a377b 100644 --- a/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php +++ b/tests/phpunit/includes/libs/composer/ComposerInstalledTest.php @@ -20,7 +20,7 @@ class ComposerInstalledTest extends MediaWikiTestCase { 'leafo/lessphp' => [ 'version' => '0.5.0', 'type' => 'library', - 'licenses' => [ 'MIT', 'GPL-3.0' ], + 'licenses' => [ 'MIT', 'GPL-3.0-only' ], 'authors' => [ [ 'name' => 'Leaf Corcoran', diff --git a/tests/phpunit/includes/libs/composer/ComposerLockTest.php b/tests/phpunit/includes/libs/composer/ComposerLockTest.php index eef7e274a2..dc81e1d38f 100644 --- a/tests/phpunit/includes/libs/composer/ComposerLockTest.php +++ b/tests/phpunit/includes/libs/composer/ComposerLockTest.php @@ -20,7 +20,7 @@ class ComposerLockTest extends MediaWikiTestCase { 'wikimedia/cdb' => [ 'version' => '1.0.1', 'type' => 'library', - 'licenses' => [ 'GPL-2.0' ], + 'licenses' => [ 'GPL-2.0-only' ], 'authors' => [ [ 'name' => 'Tim Starling', @@ -44,7 +44,7 @@ class ComposerLockTest extends MediaWikiTestCase { 'leafo/lessphp' => [ 'version' => '0.5.0', 'type' => 'library', - 'licenses' => [ 'MIT', 'GPL-3.0' ], + 'licenses' => [ 'MIT', 'GPL-3.0-only' ], 'authors' => [ [ 'name' => 'Leaf Corcoran', @@ -89,7 +89,7 @@ class ComposerLockTest extends MediaWikiTestCase { 'mediawiki/translate' => [ 'version' => '2014.12', 'type' => 'mediawiki-extension', - 'licenses' => [ 'GPL-2.0+' ], + 'licenses' => [ 'GPL-2.0-or-later' ], 'authors' => [ [ 'name' => 'Niklas Laxström', @@ -109,7 +109,7 @@ class ComposerLockTest extends MediaWikiTestCase { 'mediawiki/universal-language-selector' => [ 'version' => '2014.12', 'type' => 'mediawiki-extension', - 'licenses' => [ 'GPL-2.0+', 'MIT' ], + 'licenses' => [ 'GPL-2.0-or-later', 'MIT' ], 'authors' => [], 'description' => 'The primary aim is to allow users to select a language ' . 'and configure its support in an easy way. ' .