Skip to content

Conversation

mawinter69
Copy link
Contributor

To be able to remove commons-lang from core all direct and indirect usages must be replaced with commons-lang3 or native Java

use XS_DATETIME_FORMATTER2 instead of deprecated XS_DATETIME_FORMATTER from core
use commons-lang3 api plugin instead of commons-lang provided by core

Testing done

Submitter checklist

  • 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 demonstrate the feature works or the issue is fixed

@mawinter69 mawinter69 requested a review from a team as a code owner May 26, 2025 18:58
@jglick
Copy link
Member

jglick commented May 30, 2025

Comment on lines 96 to 95
.filter(StringUtils::isNotBlank)
.filter(s -> s != null && !s.trim().isEmpty())
Copy link
Member

Choose a reason for hiding this comment

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

Note that this sort of mechanical search-and-replace leaves behind a lot of spots like this one where the original use of isNotBlank does not seem to make much sense. Why would an entry in

be null, or "", or start or end with whitespace? At least the first two seem actually impossible.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

actually tests are failing when not filtering the blank ones

Copy link
Member

Choose a reason for hiding this comment

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

Strange, perhaps an artifact of a bad test?

Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

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

#659 (comment) possible regression

@jglick
Copy link
Member

jglick commented Jul 31, 2025

@mawinter69 please avoid force-pushing into a PR branch unless you accidentally committed a secret or something, as it breaks the GitHub feature of allowing maintainers to incrementally review changes.

@jglick jglick changed the title remove usages of commons-lang from core Remove dep on commons-lang3-api Jul 31, 2025
Comment on lines +225 to +228
ArrayList<String> var5 = new ArrayList<>(Arrays.asList(dirScanner.getIncludedFiles()));
var5.addAll(Stream.of(dirScanner.getNotFollowedSymlinks())
.map(s -> dir.toPath().relativize(Paths.get(s)).toString())
.toList());
Copy link
Member

Choose a reason for hiding this comment

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

BTW Stream.concat could also be used.

@jglick
Copy link
Member

jglick commented Jul 31, 2025

@jglick jglick enabled auto-merge July 31, 2025 18:17
@mawinter69
Copy link
Contributor Author

test failure seems unrelated. Worked fine locally on windows

@jglick jglick merged commit 5be146d into jenkinsci:master Aug 11, 2025
16 of 17 checks passed
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.

3 participants