Skip to content

[draft] Renovate bcel 6.7.0 + custom changes#2602

Closed
hazendaz wants to merge 2 commits intomasterfrom
saved/renovate/org.apache.bcel-bcel-6.x
Closed

[draft] Renovate bcel 6.7.0 + custom changes#2602
hazendaz wants to merge 2 commits intomasterfrom
saved/renovate/org.apache.bcel-bcel-6.x

Conversation

@hazendaz
Copy link
Copy Markdown
Member

@hazendaz hazendaz commented Oct 5, 2023

Before opening a 'pull request'

  • Search existing issues and pull requests to see if the issue was already discussed.
  • Check our discussions to see if the issue was already discussed.
  • Check for specific project we support to raise the issue on, under spotbugs
  • Do not open intellij plugin issues here, open them at intellij-plugin *

Make sure these boxes are checked before submitting your PR -- thank you!

  • Added an entry into CHANGELOG.md if you have changed SpotBugs code

@hazendaz hazendaz self-assigned this Oct 5, 2023
@hazendaz hazendaz force-pushed the saved/renovate/org.apache.bcel-bcel-6.x branch from ac6f1db to ca467ee Compare October 5, 2023 01:08
@hazendaz
Copy link
Copy Markdown
Member Author

hazendaz commented Oct 5, 2023

Sorry for the noise. Lesson learned, lets not merge stuff onto existing renovate branches. I wasn't thinking and clicked the check box to rebase which blew away the changes. Then strangely github had popped a window on me that looked to merge the other commits back, I selected that which simply merged the 6.7.0 to master. I've reverted that and restored the branch as it was before this happened but prefixed as 'saved/'.

@JuditKnoll Can you please double check I didn't lose anything from #2446?

@hazendaz hazendaz marked this pull request as draft October 5, 2023 01:37
@hazendaz hazendaz changed the title Saved/renovate/org.apache.bcel bcel 6.x [draft] Renovate bcel 6.x + custom changes Oct 5, 2023
@JuditKnoll
Copy link
Copy Markdown
Collaborator

Sorry for the noise. Lesson learned, lets not merge stuff onto existing renovate branches. I wasn't thinking and clicked the check box to rebase which blew away the changes. Then strangely github had popped a window on me that looked to merge the other commits back, I selected that which simply merged the 6.7.0 to master. I've reverted that and restored the branch as it was before this happened but prefixed as 'saved/'.

@JuditKnoll Can you please double check I didn't lose anything from #2446?

Not a problem, everyone makes mistakes. Maybe we could document it somewhere (e.g. contribution guidelines) so even newcomers will know - originally I wasn't sure, since the change belongs to the renovate PR.
Checked it, everything seems good :) The only difference is the bcel version change, where we should be careful when merging this PR.

renovate bot and others added 2 commits October 7, 2023 12:30
* Refactor deprecated tests to the new type

* Follow the changes in ConstantPool

---------

Co-authored-by: Judit Knoll <judit.knoll@sigmatechnology.com>
@hazendaz hazendaz force-pushed the saved/renovate/org.apache.bcel-bcel-6.x branch from ca467ee to be1110d Compare October 7, 2023 16:30
@hazendaz hazendaz changed the title [draft] Renovate bcel 6.x + custom changes [draft] Renovate bcel 6.7.0 + custom changes Oct 9, 2023
@hazendaz
Copy link
Copy Markdown
Member Author

hazendaz commented Dec 9, 2023

addressed, closing.

@hazendaz hazendaz closed this Dec 9, 2023
@JuditKnoll JuditKnoll deleted the saved/renovate/org.apache.bcel-bcel-6.x branch December 11, 2023 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants