Skip to content

Fixes for the bcel update#2757

Merged
hazendaz merged 2 commits intospotbugs:renovate/org.apache.bcel-bcel-6.xfrom
JuditKnoll:renovate/org.apache.bcel-bcel-6.x
Dec 9, 2023
Merged

Fixes for the bcel update#2757
hazendaz merged 2 commits intospotbugs:renovate/org.apache.bcel-bcel-6.xfrom
JuditKnoll:renovate/org.apache.bcel-bcel-6.x

Conversation

@JuditKnoll
Copy link
Copy Markdown
Collaborator

@JuditKnoll JuditKnoll commented Dec 8, 2023

This PR applies the custom changes from #2602, and migrates the tests to be compatible with the current master with the junit migration.
The base for this PR is not the master branch, but renovate/org.apache.bcel-bcel-6.x, which will be merged to master by #2756.


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

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

JuditKnoll and others added 2 commits December 8, 2023 10:34
* Refactor deprecated tests to the new type

* Follow the changes in ConstantPool

---------

Co-authored-by: Judit Knoll <judit.knoll@sigmatechnology.com>
@hazendaz
Copy link
Copy Markdown
Member

hazendaz commented Dec 9, 2023

@JuditKnoll Going to go ahead and merge so I can get bcel update to run again and apply on top. We should have a change log noted. Can you take care of getting change log over for this after?

@hazendaz hazendaz merged commit a513816 into spotbugs:renovate/org.apache.bcel-bcel-6.x Dec 9, 2023
@hazendaz
Copy link
Copy Markdown
Member

hazendaz commented Dec 9, 2023

@JuditKnoll Lets not do this to add onto renovate. It will catch us every time. If fixing renovate item, just new PR to master with the renovate changes is good enough. Otherwise its a deviation of normal pattern and not typical Renovate usage IMO so like before I clicked the button on Renovate before this showed up so it wiped the change again. I'll fix the issue but had noted then to just stay away from applying on Renovate for that reason :) So my fault but think its best we don't tack on items to renovate since that button click is far too easy and there is no recourse after clicked.

@hazendaz
Copy link
Copy Markdown
Member

hazendaz commented Dec 9, 2023

argghhh. to fix taking same path, just easier. I added your remote and just repulled your branch then merged in upstream renovate, will quickly merge it. I'll add change log to that as well now so no worries there.

hazendaz pushed a commit that referenced this pull request Dec 9, 2023
* fix(deps): update dependency org.apache.bcel:bcel to v6.8.0

* Fixes for the bcel update (#2757)

* Partial fix org.apache.bcel:bcel dependency update (#2446)

* Refactor deprecated tests to the new type

* Follow the changes in ConstantPool

---------

Co-authored-by: Judit Knoll <judit.knoll@sigmatechnology.com>

* migrate the tests to junit jupiter

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Judit Knoll <123470644+JuditKnoll@users.noreply.github.com>
@JuditKnoll
Copy link
Copy Markdown
Collaborator Author

@JuditKnoll Going to go ahead and merge so I can get bcel update to run again and apply on top. We should have a change log noted. Can you take care of getting change log over for this after?

I see that, meanwhile you updated the changelog as well, so I won't add another entry. Thanks 😄

@JuditKnoll Lets not do this to add onto renovate. It will catch us every time. If fixing renovate item, just new PR to master with the renovate changes is good enough. Otherwise its a deviation of normal pattern and not typical Renovate usage IMO so like before I clicked the button on Renovate before this showed up so it wiped the change again. I'll fix the issue but had noted then to just stay away from applying on Renovate for that reason :) So my fault but think its best we don't tack on items to renovate since that button click is far too easy and there is no recourse after clicked.

I'm sorry for the problems. Next time I will create a new PR directly to master with the renovate changes as well.

@JuditKnoll JuditKnoll deleted the renovate/org.apache.bcel-bcel-6.x branch December 11, 2023 08:27
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