Commit Graph

497 Commits

Author SHA1 Message Date
Rob Winch b4418014aa Merge branch '6.4.x' into 6.5.x 2025-06-10 10:49:05 -05:00
Rob Winch 29ec4c8736 Merge branch '6.3.x' into 6.4.x 2025-06-10 10:48:44 -05:00
Rob Winch 888d87619d Explicit Permissions for codeql.yml 2025-06-10 10:48:37 -05:00
Rob Winch 043acdae68 Merge branch '6.4.x' into 6.5.x 2025-05-20 16:03:39 -05:00
Rob Winch 233a6651cc Merge branch '6.3.x' into 6.4.x 2025-05-20 15:53:04 -05:00
Rob Winch 5da31ab8a8 Use spring-io/codeql-actions 2025-05-20 15:52:36 -05:00
Josh Cummings 184cd96ee6 Don't Update Minor Versions During RC Phase 2025-05-06 11:56:41 -06:00
Rob Winch 74e6bf2d11 Merge branch '6.4.x'
- remove update-dependabot action
2025-05-05 13:36:15 -05:00
Rob Winch b5e1c3770b Merge branch '6.3.x' into 6.4.x
- remove update-dependabot action
2025-05-05 13:36:01 -05:00
Rob Winch 9710492619 remove update-dependabot action 2025-05-05 13:34:16 -05:00
Rob Winch d4a0f8bbe8 Merge branch '6.4.x'
- Use pull-request: write for gradlew updates
2025-05-05 13:24:32 -05:00
Rob Winch 6dc8cd1f60 Merge branch '6.3.x' into 6.4.x
- Use pull-request: write for gradlew updates
2025-05-05 13:23:35 -05:00
Rob Winch 9436796973 Use pull-request: write for gradlew updates
Explicitly provide the permissions required for updating the Gradle
wrapper
2025-05-05 11:49:08 -05:00
Rob Winch 5c92d90e36 Align Dependabot PRs with CONTRIBUTING
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.
2025-05-02 15:04:20 -05:00
Rob Winch 084408c22c Merge branch '6.4.x'
- codeql uses ubuntu-latest
2025-05-02 11:50:08 -05:00
Rob Winch a26a64d213 Merge branch '6.3.x' into 6.4.x
- codeql uses ubuntu-latest
2025-05-02 11:49:50 -05:00
Rob Winch 3b7e3a6c5c codeql uses ubuntu-latest 2025-05-02 11:49:41 -05:00
Rob Winch 9bf1212420 Merge branch '6.4.x'
- rm mark-duplicate-dependabot-prs.yml
2025-05-02 11:26:59 -05:00
Rob Winch fa533ea5e2 Merge branch '6.3.x' into 6.4.x
- rm mark-duplicate-dependabot-prs.yml
2025-05-02 11:26:47 -05:00
Rob Winch a04025c114 rm mark-duplicate-dependabot-prs.yml 2025-05-02 11:26:41 -05:00
Rob Winch 771fe108b3 Merge branch '6.4.x'
- Remove automerge forward
2025-05-02 11:24:28 -05:00
Rob Winch 99cede5e08 Merge branch '6.3.x' into 6.4.x
- Remove automerge forward
2025-05-02 11:23:14 -05:00
Rob Winch 1564076276 Remove automerge forward 2025-05-02 11:23:01 -05:00
Rob Winch e062be6c99 Merge branch '6.4.x'
- Add .github/workflows/codeql.yml
2025-05-02 11:17:40 -05:00
Rob Winch 389ba794fa Merge branch '6.3.x' into 6.4.x
- Add .github/workflows/codeql.yml
2025-05-02 11:17:07 -05:00
Rob Winch ae09f36291 Add .github/workflows/codeql.yml 2025-05-02 11:15:37 -05:00
Josh Cummings eda9142b6b Merge branch '6.4.x' 2025-04-28 11:13:50 -06:00
Josh Cummings e6957bb854 Merge branch '6.3.x' into 6.4.x 2025-04-28 11:13:09 -06:00
Rob Winch db48d4ca50 rm merge-dependabot-pr.yml from Unsupported Branch 2025-04-25 13:17:14 -05:00
Rob Winch 25e4b74cfa Delete .github/workflows/codeql.yml
Signed-off-by: Rob Winch <362503+rwinch@users.noreply.github.com>
2025-04-23 15:42:22 -05:00
Rob Winch 68ea952d5a Update codeql.yml
Signed-off-by: Rob Winch <362503+rwinch@users.noreply.github.com>
2025-04-23 15:09:15 -05:00
Rob Winch 21b4763d1c Explicitly disable the default codeql setup
Signed-off-by: Rob Winch <362503+rwinch@users.noreply.github.com>
2025-04-23 14:56:46 -05:00
Rob Winch 5c407483a0 Create codeql.yml
Signed-off-by: Rob Winch <362503+rwinch@users.noreply.github.com>
2025-04-23 14:49:25 -05:00
dependabot[bot] f3c8262a00 Bump spring-io/spring-doc-actions from 0.0.19 to 0.0.20
Bumps [spring-io/spring-doc-actions](https://github.com/spring-io/spring-doc-actions) from 0.0.19 to 0.0.20.
- [Commits](https://github.com/spring-io/spring-doc-actions/compare/c2038265125ec6f305a4a041d892ee44c156a754...e28269199d1d27975cf7f65e16d6095c555b3cd0)

---
updated-dependencies:
- dependency-name: spring-io/spring-doc-actions
  dependency-version: 0.0.20
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-06 17:22:18 -07:00
dependabot[bot] 1eff176776 Bump spring-io/spring-doc-actions from 0.0.19 to 0.0.20
Bumps [spring-io/spring-doc-actions](https://github.com/spring-io/spring-doc-actions) from 0.0.19 to 0.0.20.
- [Commits](https://github.com/spring-io/spring-doc-actions/compare/c2038265125ec6f305a4a041d892ee44c156a754...e28269199d1d27975cf7f65e16d6095c555b3cd0)

---
updated-dependencies:
- dependency-name: spring-io/spring-doc-actions
  dependency-version: 0.0.20
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-06 17:17:16 -07:00
dependabot[bot] 2f04512e01 Bump spring-io/spring-doc-actions from 0.0.18 to 0.0.19
Bumps [spring-io/spring-doc-actions](https://github.com/spring-io/spring-doc-actions) from 0.0.18 to 0.0.19.
- [Commits](https://github.com/spring-io/spring-doc-actions/compare/852920ba3fb1f28b35a2f13201133bc00ef33677...c2038265125ec6f305a4a041d892ee44c156a754)

---
updated-dependencies:
- dependency-name: spring-io/spring-doc-actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-23 18:49:53 -07:00
dependabot[bot] a9acb6dabc Bump spring-io/spring-doc-actions from 0.0.18 to 0.0.19
Bumps [spring-io/spring-doc-actions](https://github.com/spring-io/spring-doc-actions) from 0.0.18 to 0.0.19.
- [Commits](https://github.com/spring-io/spring-doc-actions/compare/852920ba3fb1f28b35a2f13201133bc00ef33677...c2038265125ec6f305a4a041d892ee44c156a754)

---
updated-dependencies:
- dependency-name: spring-io/spring-doc-actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-23 17:32:20 -07:00
Josh Cummings 6ce8307885 Merge branch '6.4.x' 2025-03-17 09:50:07 -06:00
Josh Cummings 4993fa863a Merge branch '6.3.x' into 6.4.x 2025-03-17 09:49:01 -06:00
Josh Cummings e793a962c5 Remove s101 From Builds
Issue gh-16752
2025-03-17 09:42:49 -06:00
Josh Cummings 6707b06fcc Merge branch '6.4.x' 2025-01-24 11:31:53 -07:00
Josh Cummings 47fc2bff95 Merge branch '6.3.x' into 6.4.x 2025-01-24 11:31:44 -07:00
Josh Cummings 43a2fbf5ad Ensure s101 Runs After Assemble
Issue gh-16482
2025-01-24 11:31:22 -07:00
Josh Cummings 351f6c9a1e Merge branch '6.4.x' 2025-01-24 11:26:09 -07:00
Josh Cummings f4d2b61405 Merge branch '6.3.x' into 6.4.x 2025-01-24 11:25:42 -07:00
Josh Cummings d6b295ba2c S101 Depends On Assemble
Closes gh-16482
2025-01-24 11:25:26 -07:00
Steve Riesenberg ddca7dc629 Merge branch '6.4.x'
Closes gh-16425
2025-01-15 11:47:18 -06:00
Steve Riesenberg b4befb4263 Merge branch '6.3.x' into 6.4.x
Closes gh-16424
2025-01-15 11:46:01 -06:00
Steve Riesenberg a3f6825f9c Fix missing GChat notifications with workaround
This fix was suggested by GitHub Support as a workaround for a bug where
`failure()` is not working for reusable workflows that will be fixed in
a few months.

Closes gh-16423
2025-01-15 11:42:10 -06:00
Steve Riesenberg 071e414bbc Update release-scheduler.yml
Remove 5.8.x and 6.2.x branches from release-scheduler.yml

Signed-off-by: Steve Riesenberg <5248162+sjohnr@users.noreply.github.com>
2025-01-13 09:41:43 -06:00