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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update parent pom, use plugin bom, remove powermock #279

Merged
merged 3 commits into from
Jan 17, 2022
Merged

update parent pom, use plugin bom, remove powermock #279

merged 3 commits into from
Jan 17, 2022

Conversation

jetersen
Copy link
Member

@jetersen jetersen commented Dec 18, 2021

Updated to latest plugin parent pom.
Added plugin bom to help manage plugin versions for other plugins. You can read more about plugin bom here: https://github.com/jenkinsci/bom
Updated jenkins.version according to https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/
Added plugin bom to make it easier to manage the plugin and the dependencies.
Updated JCasC test to use the JCasC test-harness.

replaced all powermock tests with mockito's mockStatic

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

@jetersen
Copy link
Member Author

linking jenkinsci/plugin-pom#441 so that this PR is discoverable for anyone else who is struggling with powermock to mockito mockStatic migration 😅

@offa
Copy link
Contributor

offa commented Dec 20, 2021

Related: jenkinsci/plugin-pom#442

This PR is of particular importance for Java 11+ compatibility.

powermock tests written using mockito's mockStatic

added configuration-as-code test-harness

update jenkins.version
@jetersen
Copy link
Member Author

@scaytrase resolved merge conflict :)

@jetersen
Copy link
Member Author

This PR should take care of most dependabot PRs 😄

<relativePath />
</parent>
<packaging>hpi</packaging>
<properties>
<revision>1.25</revision>
<changelist>-SNAPSHOT</changelist>
<!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
<jenkins.version>2.60.3</jenkins.version>
<jenkins.version>2.303.1</jenkins.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note for myself. This is an LTE relase 5 months old

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can drop it down a little with a matching plugin bom

Copy link
Member

@scaytrase scaytrase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@jetersen
Copy link
Member Author

jenkinsci/configuration-as-code-plugin#1815 was the reason for this PR to fix plugin loading conflict

@scaytrase scaytrase merged commit 640dbc5 into jenkinsci:release/1.x Jan 17, 2022
@scaytrase
Copy link
Member

thanks @jetersen !

@jetersen jetersen deleted the fix/plugin-version-compatibility branch January 17, 2022 11:01
@jetersen
Copy link
Member Author

@scaytrase your welcome!

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.

None yet

3 participants