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

[JENKINS-68696] Remove javax.servlet:servlet-api dependency #7478

Merged
merged 3 commits into from
Dec 8, 2022

Conversation

basil
Copy link
Member

@basil basil commented Dec 5, 2022

See JENKINS-68696.

https://github.com/jenkinsci/jenkins/blob/a4f9f5b64b441172f6a1d871a7c615c03ac26235/pom.xml#L115-L132= is a trick added in commit 982a8fa apparently to prevent plugins (and core?) from bundling Servlet API 2.x. javax.servlet:servlet-api has been banned through Enforcer in the plugin parent POM since jenkinsci/plugin-pom@a608967 and in the core parent POM since jenkinsci/pom@82f73fef, so it is longer necessary to keep this trick in core. Keeping it complicates jenkinsci/jenkins/pom.xml and our Dependabot configuration, so I think it is best to dispense with it from both the core dependency tree and the Dependendabot exclusions list and rely on the abovementioned Enforcer bans to keep it out of our dependency trees.

Testing done

Proposed changelog entries

N/A

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples).
    • Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

@basil basil added the work-in-progress The PR is under active development, not ready to the final review label Dec 5, 2022
basil added a commit to basil/bom that referenced this pull request Dec 6, 2022
@basil basil added skip-changelog Should not be shown in the changelog and removed work-in-progress The PR is under active development, not ready to the final review labels Dec 6, 2022
@basil basil marked this pull request as ready for review December 6, 2022 16:19
@NotMyFault NotMyFault requested a review from a team December 7, 2022 08:50
@timja
Copy link
Member

timja commented Dec 7, 2022

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Dec 7, 2022
@basil basil merged commit ef2cc88 into jenkinsci:master Dec 8, 2022
@basil basil deleted the JENKINS-68696 branch December 8, 2022 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback skip-changelog Should not be shown in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants