Previously Dependabot was setup to submit PRs to every branch.
However, this does not align with the contributing guidelines which
state to only submit a PR on the oldest branch so that merge forward
strategy can be used.
This changes the dependabot configuration to better align with our
contributing guidelines:
- PRs for github actions are submitted against the oldest branch since
all branches will need updated using a merge forward stategy. Merging a
github action will require us to merge forward manually and preserve
the changes in the oldest branch to pickup the github actions update.
- Java dependencieds are submitted against each branch since they will
need to merge -s ours to preserve the correct major.minor semantics.
Merging a java dependency will now require us to do the merging manually.
This brings the labels in line with the other dependency updates that
aren't of interest for the release notes. It also avoids adding labels
that aren't already defined by the project.
This commit removes unnecessary main-branch merges starting from
8750608b5b and adds the following
needed commit(s) that were made afterward:
- 5dce82c48b
Rob Winch
Josh Cummings
Steve Riesenberg
Josh Cummings
Marcus Hert Da Coregio
marcusdacoregio
Steve Riesenberg