Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump stapler.version from 1539.v2f05ce93882d to 1563.v3da2d02f9572 #5549

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 1, 2021

Proposed changelog entries

  • Update stapler from 1539.v2f05ce93882d to 1563.v3da2d02f9572

Rest of input

Bumps stapler.version from 1539.v2f05ce93882d to 1563.v3da2d02f9572.
Updates stapler from 1539.v2f05ce93882d to 1563.v3da2d02f9572

Release notes

Sourced from stapler's releases.

1563.v3da2d02f9572

馃殌 New features and improvements

馃摝 Dependency updates

Commits

Updates stapler-groovy from 1539.v2f05ce93882d to 1563.v3da2d02f9572

Release notes

Sourced from stapler-groovy's releases.

1563.v3da2d02f9572

馃殌 New features and improvements

馃摝 Dependency updates

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Jun 1, 2021
@basil
Copy link
Member

basil commented Jun 3, 2021

Require upper bound dependencies error for com.github.spotbugs:spotbugs-annotations:4.2.0 paths to dependency are:
+-org.jenkins-ci.main:jenkins-core:2.297-rc31271.94d634b27bc1
  +-com.github.spotbugs:spotbugs-annotations:4.2.0
and
+-org.jenkins-ci.main:jenkins-core:2.297-rc31271.94d634b27bc1
  +-org.kohsuke.stapler:stapler:1563.v3da2d02f9572
    +-com.github.spotbugs:spotbugs-annotations:4.2.0 (managed) <-- com.github.spotbugs:spotbugs-annotations:4.2.3
and
+-org.jenkins-ci.main:jenkins-core:2.297-rc31271.94d634b27bc1
  +-org.kohsuke:access-modifier-annotation:1.21
    +-com.github.spotbugs:spotbugs-annotations:4.2.0 (managed) <-- com.github.spotbugs:spotbugs-annotations:4.2.3

These errors are fixed when this is rebased on top of #5554. So #5554 needs to be merged first, then this PR needs to be rebased, then this PR can be approved.

@basil
Copy link
Member

basil commented Jun 7, 2021

@dependabot rebase

@dependabot dependabot bot force-pushed the dependabot/maven/stapler.version-1563.v3da2d02f9572 branch from 4ccffe0 to 0b32bab Compare June 7, 2021 14:33
@basil
Copy link
Member

basil commented Jun 10, 2021

@dependabot rebase

@dependabot dependabot bot force-pushed the dependabot/maven/stapler.version-1563.v3da2d02f9572 branch from 0b32bab to 89546dc Compare June 10, 2021 05:39
@basil
Copy link
Member

basil commented Jun 18, 2021

@dependabot rebase

Bumps `stapler.version` from 1539.v2f05ce93882d to 1563.v3da2d02f9572.

Updates `stapler` from 1539.v2f05ce93882d to 1563.v3da2d02f9572
- [Release notes](https://github.com/stapler/stapler/releases)
- [Changelog](https://github.com/stapler/stapler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stapler/stapler/commits)

Updates `stapler-groovy` from 1539.v2f05ce93882d to 1563.v3da2d02f9572
- [Release notes](https://github.com/stapler/stapler/releases)
- [Changelog](https://github.com/stapler/stapler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stapler/stapler/commits)

---
updated-dependencies:
- dependency-name: org.kohsuke.stapler:stapler
  dependency-type: direct:production
- dependency-name: org.kohsuke.stapler:stapler-groovy
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/maven/stapler.version-1563.v3da2d02f9572 branch from 89546dc to f97cbf9 Compare June 18, 2021 16:10
@timja timja requested a review from a team June 18, 2021 19:27
@timja timja added the rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted label Jun 18, 2021
@timja timja added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jun 18, 2021
@timja
Copy link
Member

timja commented Jun 18, 2021

This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@res0nance res0nance merged commit 5655b08 into master Jun 20, 2021
@res0nance res0nance deleted the dependabot/maven/stapler.version-1563.v3da2d02f9572 branch June 20, 2021 05:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file java Pull requests that update Java code ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback rfe For changelog: Minor enhancement. use `major-rfe` for changes to be highlighted
Projects
None yet
3 participants