Skip to content

Fix file format#603

Closed
eva-mueller wants to merge 2 commits into
jenkinsci:masterfrom
eva-mueller:apply-spotless
Closed

Fix file format#603
eva-mueller wants to merge 2 commits into
jenkinsci:masterfrom
eva-mueller:apply-spotless

Conversation

@eva-mueller
Copy link
Copy Markdown
Contributor

It seems with #480 a formatting issue slipped through.

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

@eva-mueller eva-mueller requested a review from a team as a code owner June 9, 2025 14:56
@jtnord
Copy link
Copy Markdown
Member

jtnord commented Jun 9, 2025

I had the failure locally on windows, so fixed it in #480

this breaks windows again https://github.com/jenkinsci/oic-auth-plugin/pull/603/checks?check_run_id=43740246493 Spotless is braindead.

@jtnord
Copy link
Copy Markdown
Member

jtnord commented Jun 9, 2025

likely some regression in spotless in #591

@jtnord
Copy link
Copy Markdown
Member

jtnord commented Jun 9, 2025

#605

@jtnord
Copy link
Copy Markdown
Member

jtnord commented Jun 9, 2025

likely some regression in spotless in #591

Indeed #605 fixes the build. Will need to check the spotless versions and file an upstream issue ☹️

@jglick
Copy link
Copy Markdown
Member

jglick commented Jun 26, 2025

@jtnord
Copy link
Copy Markdown
Member

jtnord commented Jul 1, 2025

#615 🤞

@jglick
Copy link
Copy Markdown
Member

jglick commented Jul 1, 2025

@jtnord you committed CRNL by accident.

@jtnord
Copy link
Copy Markdown
Member

jtnord commented Jul 1, 2025

@jtnord you committed CRNL by accident.

? where

❯ git fetch origin && rm -fr * && git reset --hard origin/master && c:\cygwin\bin\find * -type f -exec dos2unix -q {} ; && git status
HEAD is now at bbd7376 Merge pull request #607 from jenkinsci/dependabot/maven/master/org.wiremock-wiremock-standalone-3.13.1
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

my local tree is not doing line normalizations so should show if CRNL was committed.

Additionally GH UI would normally show CRLF inside a change in the file view?

IF you mean all the spam from Jenkins about

19:45:47 [ERROR] src\main\java\org\jenkinsci\plugins\oic\OicUserDetails.java:[1] (misc) NewlineAtEndOfFile: Expected line ending for file is LF(\n), but CRLF(\r\n) is detected.

This is because Jenkins windows nodes do line end replacement (yuck). so they intentioanlly change all line ends from \n to \r\n by setting core.autocrl=true.

@jtnord
Copy link
Copy Markdown
Member

jtnord commented Jul 1, 2025

this is the spotless issue that behaves differently on windows and Unix, looking locally there is no windows line end here.

[2025-07-01T18:53:51.100Z] [ERROR]     src\main\java\org\jenkinsci\plugins\oic\LogoutQueryParameter.java
[2025-07-01T18:53:51.100Z] [ERROR]         @@ -21,8 +21,8 @@
[2025-07-01T18:53:51.100Z] [ERROR]          ��������@Override
[2025-07-01T18:53:51.100Z] [ERROR]          ��������public�FormValidation�doCheckKey(@QueryParameter�String�key)�{
[2025-07-01T18:53:51.100Z] [ERROR]          ������������return�switch�(key.trim())�{
[2025-07-01T18:53:51.100Z] [ERROR]         -����������������case�"id_token_hint",�"state",�"post_logout_redirect_uri"�->
[2025-07-01T18:53:51.100Z] [ERROR]         -��������������������FormValidation.error(key�+�"�is�a�reserved�word");
[2025-07-01T18:53:51.100Z] [ERROR]         +����������������case�"id_token_hint",�"state",�"post_logout_redirect_uri"�->�FormValidation.error(
[2025-07-01T18:53:51.100Z] [ERROR]         +������������������������key�+�"�is�a�reserved�word");
[2025-07-01T18:53:51.101Z] [ERROR]          ����������������default�->�FormValidation.ok();
[2025-07-01T18:53:51.101Z] [ERROR]          ������������};
[2025-07-01T18:53:51.101Z] [ERROR]          ��������}

Checked out the PR locally and there are no windows line ends either.

This is just spotless being brain dead as far as I can see which should not occur with the given parent?

@jglick
Copy link
Copy Markdown
Member

jglick commented Jul 7, 2025

I think the problem is that maven-checkstyle-plugin and its associated XML files needs to be deleted; it is not needed when we have Spotless. The spotless-maven-plugin configuration should also be deleted, leaving the Jenkins project default.

@jtnord
Copy link
Copy Markdown
Member

jtnord commented Jul 21, 2025

obsolete -> #615

@jtnord jtnord closed this Jul 21, 2025
@eva-mueller eva-mueller deleted the apply-spotless branch July 21, 2025 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants