jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401965 )
Change subject: Use SPDX 3.0 license identifier ...................................................................... Use SPDX 3.0 license identifier SPDX released version 3 of their license list (<https://spdx.org/licenses/>), 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: I96fa91bb2c8777648da5571f76609214ef9eb66c --- M extension.json M includes/CentralAuthHooks.php 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: MarcoAurelio: Looks good to me, but someone else must approve Brion VIBBER: Looks good to me, but someone else must approve jenkins-bot: Verified Jforrester: Looks good to me, approved Zoranzoki21: Looks good to me, but someone else must approve diff --git a/extension.json b/extension.json index 41929f4..a01467e 100644 --- a/extension.json +++ b/extension.json @@ -3,7 +3,7 @@ "author": "Brion Vibber", "url": "https://www.mediawiki.org/wiki/Extension:CentralAuth";, "descriptionmsg": "centralauth-desc", - "license-name": "GPL-2.0", + "license-name": "GPL-2.0-or-later", "type": "specialpage", "requires": { "MediaWiki": ">= 1.30.0" diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php index 43a1e05..6ee4faf 100644 --- a/includes/CentralAuthHooks.php +++ b/includes/CentralAuthHooks.php @@ -56,7 +56,7 @@ 'url' => 'https://www.mediawiki.org/wiki/Extension:CentralAuth', 'author' => [ 'Kunal Mehta', 'Marius Hoch', 'Chris Steipp' ], 'descriptionmsg' => 'centralauth-rename-desc', - 'license-name' => 'GPL-2.0', + 'license-name' => 'GPL-2.0-or-later', ]; } @@ -68,7 +68,7 @@ 'url' => 'https://www.mediawiki.org/wiki/Extension:CentralAuth', 'author' => 'Sam Reed', 'descriptionmsg' => 'centralauth-antispoof-desc', - 'license-name' => 'GPL-2.0', + 'license-name' => 'GPL-2.0-or-later', ]; $wgAutoloadClasses['CentralAuthSpoofUser'] = "$caBase/AntiSpoof/CentralAuthSpoofUser.php"; @@ -94,7 +94,7 @@ 'author' => 'Bryan Davis', 'url' => '//www.mediawiki.org/wiki/Extension:CentralAuth', 'descriptionmsg' => 'globalrenamerequest-desc', - 'license-name' => 'GPL-2.0', + 'license-name' => 'GPL-2.0-or-later', ]; $wgSpecialPages['GlobalRenameRequest'] = 'SpecialGlobalRenameRequest'; @@ -104,7 +104,7 @@ 'author' => 'Bryan Davis', 'url' => '//www.mediawiki.org/wiki/Extension:CentralAuth', 'descriptionmsg' => 'globalrenamequeue-desc', - 'license-name' => 'GPL-2.0', + 'license-name' => 'GPL-2.0-or-later', ]; $wgSpecialPages['GlobalRenameQueue'] = 'SpecialGlobalRenameQueue'; $wgResourceModules['ext.centralauth.globalrenamequeue'] = [ -- To view, visit https://gerrit.wikimedia.org/r/401965 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96fa91bb2c8777648da5571f76609214ef9eb66c Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Legoktm <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: MarcoAurelio <[email protected]> Gerrit-Reviewer: Werdna <[email protected]> Gerrit-Reviewer: Zoranzoki21 <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
