Skip to content

Consistent Jelly version for commons-jelly-tags-xml#10131

Merged
basil merged 2 commits into
jenkinsci:masterfrom
basil:jelly-xml
Jan 9, 2025
Merged

Consistent Jelly version for commons-jelly-tags-xml#10131
basil merged 2 commits into
jenkinsci:masterfrom
basil:jelly-xml

Conversation

@basil

@basil basil commented Jan 7, 2025

Copy link
Copy Markdown
Member

Like #10128, but for commons-jelly-tags-xml. See jenkinsci/jelly#144 for a description of the changes in this library. As of this PR all Jelly libraries in the WAR will be of a consistent version, and changes to Jelly can be tested easily. The only actual code change in this PR is apache/commons-jelly@357282d, which seems innocent enough and appears to be fully backward-compatible.

Testing done

Verified that no new JARs were in the WAR and that all Jelly JARs had a consistent version.

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](https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml)). Fill in the **Proposed upgrade guidelines** section only if there are breaking changes or changes that may require extra steps from users during upgrade.
- [x] 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](https://www.jenkins.io/doc/developer/security/csp/)).
- [ ] 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

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

### Maintainer checklist
- [ ] 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](https://github.com/jenkinsci/jenkins/pull/4387)).
- [ ] 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](https://issues.jenkins.io/issues/?filter=12146)).

@basil basil added the skip-changelog Should not be shown in the changelog label Jan 7, 2025

@A1exKH A1exKH left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

@basil LGTM.

@basil basil self-assigned this Jan 8, 2025
@basil

basil commented Jan 8, 2025

Copy link
Copy Markdown
Member Author

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback. Please see the merge process documentation for more information about the merge process.

@basil basil added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jan 8, 2025
@basil basil merged commit 53ad7f9 into jenkinsci:master Jan 9, 2025
MarkEWaite pushed a commit to MarkEWaite/jenkins that referenced this pull request Mar 17, 2025
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.

4 participants