From d3684e45636fc03f0b891ffaa72bba58489f665a Mon Sep 17 00:00:00 2001 From: anomiex Date: Mon, 22 Jan 2024 16:41:33 +0000 Subject: [PATCH] Changelogger: Default `--deduplicate` to 0 (#35138) When set to 1, it looks at the previous changelog entry and removes any from the current entry that already show there. While that makes sense in the case of "normal" changes that might have been backported, it makes much less sense for perennial things like "Updated dependencies". So probably better if people have to opt in to that behavior. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/7614274709 --- composer.json | 2 +- composer.lock | 12 ++++++------ .../jetpack-device-detection/composer.json | 2 +- vendor/composer/installed.json | 4 ++-- vendor/composer/installed.php | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index c5ae28de..7e611587 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ }, "require-dev": { "yoast/phpunit-polyfills": "1.1.0", - "automattic/jetpack-changelogger": "^4.0.5" + "automattic/jetpack-changelogger": "^4.1.0-alpha" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 6ce11d83..29c400ec 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b903b4c8e77c0e02bdd8c76226aa5da1", + "content-hash": "963ff3f78d42412c833c21844da574e8", "packages": [ { "name": "automattic/jetpack-device-detection", @@ -12,13 +12,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "c904e39929821d06575bd1185dc1c2a871d1a9cb" + "reference": "607904f1ed12c57f1f866d6287c9b94212dabb95" }, "require": { "php": ">=7.0" }, "require-dev": { - "automattic/jetpack-changelogger": "^4.0.5", + "automattic/jetpack-changelogger": "^4.1.0-alpha", "yoast/phpunit-polyfills": "1.1.0" }, "suggest": { @@ -60,11 +60,11 @@ "packages-dev": [ { "name": "automattic/jetpack-changelogger", - "version": "4.0.5", + "version": "4.1.0-alpha.1705940930", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "288d3b9310aef0cb567a2feb06f9718089fd36e1" + "reference": "b0edb13dc7d7e42d8314bdc389c12889fe7b9592" }, "require": { "php": ">=7.0", @@ -82,7 +82,7 @@ "extra": { "autotagger": true, "branch-alias": { - "dev-trunk": "4.0.x-dev" + "dev-trunk": "4.1.x-dev" }, "mirror-repo": "Automattic/jetpack-changelogger", "version-constants": { diff --git a/vendor/automattic/jetpack-device-detection/composer.json b/vendor/automattic/jetpack-device-detection/composer.json index b184d1e8..5493a4b5 100644 --- a/vendor/automattic/jetpack-device-detection/composer.json +++ b/vendor/automattic/jetpack-device-detection/composer.json @@ -8,7 +8,7 @@ }, "require-dev": { "yoast/phpunit-polyfills": "1.1.0", - "automattic/jetpack-changelogger": "^4.0.5" + "automattic/jetpack-changelogger": "^4.1.0-alpha" }, "suggest": { "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package." diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 4a7883fb..acde836e 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -7,13 +7,13 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "c904e39929821d06575bd1185dc1c2a871d1a9cb" + "reference": "607904f1ed12c57f1f866d6287c9b94212dabb95" }, "require": { "php": ">=7.0" }, "require-dev": { - "automattic/jetpack-changelogger": "^4.0.5", + "automattic/jetpack-changelogger": "^4.1.0-alpha", "yoast/phpunit-polyfills": "1.1.0" }, "suggest": { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index ed450ac9..3d3160f7 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -13,7 +13,7 @@ 'automattic/jetpack-device-detection' => array( 'pretty_version' => '2.0.1', 'version' => '2.0.1.0', - 'reference' => 'c904e39929821d06575bd1185dc1c2a871d1a9cb', + 'reference' => '607904f1ed12c57f1f866d6287c9b94212dabb95', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-device-detection', 'aliases' => array(),