Skip to content
New issue

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

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

depend on jersey2-api #435

Merged
merged 3 commits into from
May 10, 2022
Merged

depend on jersey2-api #435

merged 3 commits into from
May 10, 2022

Conversation

jetersen
Copy link
Member

@jetersen jetersen commented Apr 19, 2022

to avoid class path conflicts. Currently class path conflicts exist between gitlab-api plugin and jira plugin

cc @basil @dcendents

jenkinsci/jersey2-api-plugin#19

🚨 Please review the guidelines for contributing to this repository.

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

to avoid class path conflicts
pom.xml Outdated
<groupId>io.jenkins.plugins</groupId>
<artifactId>jersey2-api</artifactId>
<!-- TODO remove the explicit version number once this has made it into the plugin BOM -->
<version>2.35-7</version> <!-- TODO https://github.com/jenkinsci/bom/pull/1022 -->
Copy link
Member Author

Choose a reason for hiding this comment

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

Need release of
jenkinsci/bom#1022

@jetersen
Copy link
Member Author

jetersen commented Apr 19, 2022

@rantoniuk would you be able to take the HPI and do some sanity testing?
https://repo.jenkins-ci.org/incrementals/org/jenkins-ci/plugins/jira/3.8-rc1363.0a_029e634220/

I don't have test setup for Jira 😅

Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

I think @dcendents had a way of reproducing the problem? It would be nice to get confirmation that the incremental build from this PR resolves the issue.

Co-authored-by: Basil Crow <me@basilcrow.com>
@jetersen
Copy link
Member Author

@rantoniuk I think you can remove the waiting for LTS label.

Nothing has changed from the HPI point of view. Though I appreciate if someone would be able to test it. I don't use Jira 😅

@dcendents
Copy link

As I mentionned before we don't really use the JIRA plugin but since we have a JIRA instance here I tried the incremental build.

It correctly scanned the JIRA issue from the git comment and added a link in the jenkins changes section.
jiraComment pipeline script correctly adds a comment to the issue in JIRA.

I could not see any errors in the logs (but I am plagued by https://issues.jenkins.io/browse/JENKINS-68057 so hopefully I didn't miss it)

@basil
Copy link
Member

basil commented Apr 25, 2022

Thanks for doing a smoke test Daniel. From my perspective this is ready to land.

@rantoniuk
Copy link
Contributor

It's waiting for @olamy since he asked to stop merging any PRs temporarilly because of preparing a security release.

@rantoniuk rantoniuk merged commit f96fc82 into jenkinsci:master May 10, 2022
@jetersen jetersen deleted the fix/classPathConflict branch May 11, 2022 01:56
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants