Skip to content

Bundle antlr as core no longer provides it #148

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

Merged
merged 4 commits into from
Nov 2, 2022
Merged

Conversation

basil
Copy link
Member

@basil basil commented Oct 29, 2022

This plugin consumes ANTLR 2 transitively, and excludes the JAR under the assumption that it is bundled in core. That assumption is no longer true as of jenkinsci/jenkins#7293, so this PR updates the baseline and removes the exclusion accordingly. I couldn't think of a way to prepare this plugin in advance, since if I just excluded the dependency while keeping the core baseline at its original value then Maven HPI plugin wouldn't bundle the JAR. But with this PR I confirmed the JAR does get bundled:

[WARNING] Bundling transitive dependency antlr-2.7.7.jar (via hibernate-entitymanager)

I am planning on merging jenkinsci/jenkins#7293 tomorrow toward 2.376, so this would need to be updated to the final released version and released at the same time. CC @timja

basil added 2 commits October 29, 2022 08:19

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
@basil
Copy link
Member Author

basil commented Oct 29, 2022

Used my admin powers to replay the build with the Jenkinsfile changes: https://ci.jenkins.io/job/Plugins/job/database-plugin/view/change-requests/job/PR-148/2/

@basil basil marked this pull request as ready for review November 2, 2022 02:18
@basil basil requested a review from a team as a code owner November 2, 2022 02:18
@basil
Copy link
Member Author

basil commented Nov 2, 2022

PR build with Jenkinsfile changes is green. From my perspective this is ready to merge and release.

@timja timja changed the title Adapt to https://github.com/jenkinsci/jenkins/pull/7293 Bundle antlr as core no longer provides it Nov 2, 2022
@timja timja merged commit f8ebe4c into jenkinsci:master Nov 2, 2022
@timja
Copy link
Member

timja commented Nov 2, 2022

PR build with Jenkinsfile changes is green. From my perspective this is ready to merge and release.

Thanks for the PR :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants