From b0d23deb602ea6cd1e54f6c02c146736cf044479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20J=C4=99drzejczyk?=
 <dariusz.jedrzejczyk@broadcom.com>
Date: Thu, 22 Feb 2024 13:47:59 +0100
Subject: [PATCH] Cleanup changelog and dependency upgrades (#3732)

Excluded chores, dependency upgrades and test changes from the release
notes. Also, labeling transitive or shaded dependencies upgraded by
Dependabot as enhancements to be included in the changelog.
---
 .github/dependabot.yml | 17 ++++++++++++++++-
 .github/release.yml    | 10 ++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f3d22c97b3..58976435bb 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,5 +1,17 @@
 version: 2
 updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      "type/enhancement"
+    reviewers:
+      - "reactor/core-team"
+    target-branch: "3.4.x"
+    allow:
+      - dependency-name: "org.reactivestreams:*"
+      - dependency-name: "net.bytebuddy:*"
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
@@ -11,6 +23,9 @@ updates:
     # updates in oldest maintenance branch, we'll forward-merge up to main
     target-branch: "3.4.x"
     ignore:
+      # Updated by the enhancement type grouping
+      - dependency-name: "org.reactivestreams:*"
+      - dependency-name: "net.bytebuddy:*"
       # JSR166 backport is fixed
       - dependency-name: "io.projectreactor:jsr166"
       # JSR305 backport is fixed to last version with annotations (3.0.1)
@@ -50,7 +65,7 @@ updates:
     schedule:
       interval: "weekly"
     labels:
-      - "type/chores"
+      - "type/dependency-upgrade"
     reviewers:
       - "reactor/core-team"
     # updates in oldest maintenance branch, we'll forward-merge up to main
diff --git a/.github/release.yml b/.github/release.yml
index 8f4a94b1eb..8292ad4a47 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -2,6 +2,9 @@ changelog:
   exclude:
     labels:
       - ignore-changelog
+      - type/test
+      - type/chores
+      - type/dependency-upgrade
   categories:
     - title: ":warning: Update considerations and deprecations"
       labels:
@@ -16,14 +19,9 @@ changelog:
     - title: ":lady_beetle: Bug fixes"
       labels:
         - "type/bug"
-    - title: ":book: Documentation, Tests and Build"
+    - title: ":book: Documentation"
       labels:
         - "type/documentation"
-        - "type/chores"
-        - "type/test"
-    - title: ":up: Dependency Upgrades"
-      labels:
-        - "type/dependency-upgrade"
     - title: ":question: Other Changes"
       labels:
         - "*"