update license references explicitly to BSD-2-Clause

jeffpaul · jeffpaul · commit 499ef85eccc2 · 2025-10-22T15:18:35.000-05:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ![Microsoft Azure Storage for WordPress](https://github.com/10up/windows-azure-storage/blob/develop/.wordpress-org/banner-1544x500.png)
 
-[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) ![Required PHP Version](https://img.shields.io/wordpress/plugin/required-php/windows-azure-storage?label=Requires%20PHP) ![Required WP Version](https://img.shields.io/wordpress/plugin/wp-version/windows-azure-storage?label=Requires%20WordPress) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/windows-azure-storage?label=WordPress) [![BSD 2-Clause License](https://img.shields.io/github/license/10up/windows-azure-storage.svg)](https://github.com/10up/windows-azure-storage/blob/trunk/LICENSE) [![Dependency Review](https://github.com/10up/windows-azure-storage/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/10up/windows-azure-storage/actions/workflows/dependency-review.yml) [![E2E test](https://github.com/10up/windows-azure-storage/actions/workflows/cypress.yml/badge.svg)](https://github.com/10up/windows-azure-storage/actions/workflows/cypress.yml) [![PHP Compatibility](https://github.com/10up/windows-azure-storage/actions/workflows/php-compatibility.yml/badge.svg)](https://github.com/10up/windows-azure-storage/actions/workflows/php-compatibility.yml) [![CodeQL](https://github.com/10up/windows-azure-storage/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/10up/windows-azure-storage/actions/workflows/github-code-scanning/codeql) [![WordPress Playground Demo](https://img.shields.io/wordpress/plugin/v/windows-azure-storage?logo=wordpress&logoColor=FFFFFF&label=Playground%20Demo&labelColor=3858E9&color=3858E9)](https://playground.wordpress.net/?blueprint-url=https://raw.githubusercontent.com/10up/windows-azure-storage/add/playground/.wordpress-org/blueprints/blueprint.json)
+[![Support Level](https://img.shields.io/badge/support-stable-blue.svg)](#support-level) ![Required PHP Version](https://img.shields.io/wordpress/plugin/required-php/windows-azure-storage?label=Requires%20PHP) ![Required WP Version](https://img.shields.io/wordpress/plugin/wp-version/windows-azure-storage?label=Requires%20WordPress) ![WordPress tested up to version](https://img.shields.io/wordpress/plugin/tested/windows-azure-storage?label=WordPress) [![BSD-2-Clause License](https://img.shields.io/github/license/10up/windows-azure-storage.svg)](https://github.com/10up/windows-azure-storage/blob/trunk/LICENSE) [![Dependency Review](https://github.com/10up/windows-azure-storage/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/10up/windows-azure-storage/actions/workflows/dependency-review.yml) [![E2E test](https://github.com/10up/windows-azure-storage/actions/workflows/cypress.yml/badge.svg)](https://github.com/10up/windows-azure-storage/actions/workflows/cypress.yml) [![PHP Compatibility](https://github.com/10up/windows-azure-storage/actions/workflows/php-compatibility.yml/badge.svg)](https://github.com/10up/windows-azure-storage/actions/workflows/php-compatibility.yml) [![CodeQL](https://github.com/10up/windows-azure-storage/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/10up/windows-azure-storage/actions/workflows/github-code-scanning/codeql) [![WordPress Playground Demo](https://img.shields.io/wordpress/plugin/v/windows-azure-storage?logo=wordpress&logoColor=FFFFFF&label=Playground%20Demo&labelColor=3858E9&color=3858E9)](https://playground.wordpress.net/?blueprint-url=https://raw.githubusercontent.com/10up/windows-azure-storage/add/playground/.wordpress-org/blueprints/blueprint.json)
 
 > Use the Microsoft Azure Storage service to host your website's media files.
 
diff --git a/bin/wp-cli.php b/bin/wp-cli.php
@@ -1,14 +1,10 @@
 <?php
 /**
  * Microsoft Azure Storage command line client.
- *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -36,7 +32,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  */
 class Windows_Azure_Storage_CLI extends WP_CLI_Command {
diff --git a/includes/class-windows-azure-config-provider.php b/includes/class-windows-azure-config-provider.php
@@ -4,12 +4,9 @@
  * Microsoft Azure Storage config provider.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -37,7 +34,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  */
 class Windows_Azure_Config_Provider {
diff --git a/includes/class-windows-azure-file-contents-provider.php b/includes/class-windows-azure-file-contents-provider.php
@@ -4,12 +4,9 @@
  * Microsoft Azure Storage file contents provider.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -37,7 +34,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  * @since     4.0.0
  */
diff --git a/includes/class-windows-azure-filesystem-access-provider.php b/includes/class-windows-azure-filesystem-access-provider.php
@@ -4,12 +4,9 @@
  * Microsoft Azure Storage REST API client.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -37,7 +34,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  * @since     4.0.0
  */
diff --git a/includes/class-windows-azure-generic-list-response.php b/includes/class-windows-azure-generic-list-response.php
@@ -7,12 +7,9 @@
  * Microsoft Azure Storage REST API list containers response.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -40,7 +37,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  * @since     4.0.0
  */
diff --git a/includes/class-windows-azure-helper.php b/includes/class-windows-azure-helper.php
@@ -4,12 +4,9 @@
  * Microsoft Azure Storage helper class.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -37,7 +34,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  * @since     4.0.0
  */
diff --git a/includes/class-windows-azure-list-blobs-response.php b/includes/class-windows-azure-list-blobs-response.php
@@ -6,12 +6,9 @@
  * Microsoft Azure Storage REST API list blobs response.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -39,7 +36,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  * @since     4.0.0
  */
diff --git a/includes/class-windows-azure-list-containers-response.php b/includes/class-windows-azure-list-containers-response.php
@@ -6,12 +6,9 @@
  * Microsoft Azure Storage REST API list containers response.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -39,7 +36,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  * @since     4.0.0
  */
diff --git a/includes/class-windows-azure-replace-media.php b/includes/class-windows-azure-replace-media.php
@@ -4,12 +4,9 @@
  * Microsoft Azure Storage REST API client.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -37,7 +34,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  */
 
diff --git a/includes/class-windows-azure-rest-api-client.php b/includes/class-windows-azure-rest-api-client.php
@@ -4,12 +4,9 @@
  * Microsoft Azure Storage REST API client.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -37,7 +34,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  * @since     4.0.0
  */
diff --git a/includes/class-windows-azure-wp-filesystem-direct.php b/includes/class-windows-azure-wp-filesystem-direct.php
@@ -4,12 +4,9 @@
  * Microsoft Azure Storage REST API client.
  *
  * Version: 4.0.0
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -37,7 +34,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  * @since     4.0.0
  */
diff --git a/readme.txt b/readme.txt
@@ -3,8 +3,8 @@ Contributors:      msopentech, 10up, morganestes, stevegrunwell, lpawlik, rittes
 Tags:              Microsoft Azure Storage, Media Files, Upload, CDN, blob storage
 Tested up to:      6.8
 Stable tag:        4.5.1
-License:           BSD 2-Clause
-License URI:       http://www.opensource.org/licenses/bsd-license.php
+License:           BSD-2-Clause
+License URI:       https://spdx.org/licenses/BSD-2-Clause.html
 
 Use the Microsoft Azure Storage service to host your website's media files.
 
diff --git a/windows-azure-storage-dialog.php b/windows-azure-storage-dialog.php
@@ -3,12 +3,9 @@
  * Shows popup dialog when clicked on the Microsoft Azure Toolbar
  *
  * Version: 3.0.1
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -36,7 +33,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  */
 
diff --git a/windows-azure-storage-settings.php b/windows-azure-storage-settings.php
@@ -3,12 +3,9 @@
  * Shows various settings for Microsoft Azure Storage Plugin
  *
  * Version: 3.0.1
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -36,7 +33,7 @@
  * @package   Microsoft_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  */
 
diff --git a/windows-azure-storage-util.php b/windows-azure-storage-util.php
@@ -3,12 +3,9 @@
  * Various utility functions for accessing Microsoft Azure Storage
  *
  * Version: 3.0.1
- *
  * Author: Microsoft Open Technologies, Inc.
- *
  * Author URI: http://www.microsoft.com/
- *
- * License: New BSD License (BSD)
+ * License: BSD-2-Clause
  *
  * Copyright (c) Microsoft Open Technologies, Inc.
  * All rights reserved.
@@ -36,7 +33,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  */
 
@@ -47,7 +44,7 @@
  * @package   Windows_Azure_Storage_For_WordPress
  * @author    Microsoft Open Technologies, Inc. <msopentech@microsoft.com>
  * @copyright Microsoft Open Technologies, Inc.
- * @license   New BSD license, (http://www.opensource.org/licenses/bsd-license.php)
+ * @license   BSD-2-Clause, (http://www.opensource.org/licenses/bsd-license.php)
  * @link      http://www.microsoft.com
  */
 class WindowsAzureStorageUtil {
diff --git a/windows-azure-storage.php b/windows-azure-storage.php
@@ -8,8 +8,8 @@
  * Requires PHP:      8.0
  * Author:            10up, Microsoft Open Technologies
  * Author URI:        https://10up.com/
- * License:           BSD 2-Clause
- * License URI:       http://www.opensource.org/licenses/bsd-license.php
+ * License:           BSD-2-Clause
+ * License URI:       https://spdx.org/licenses/BSD-2-Clause.html
  * Text Domain:       windows-azure-storage
  * Domain Path:       /languages
  */
