Skip to content

[ELY-2962] add JDK-25 to bld. Removed obsolete elements from workflow#2345

Merged
darranl merged 2 commits intowildfly-security:2.xfrom
rsearls:ELY-2962-JDK25-github-workflow-2.x
Nov 28, 2025
Merged

[ELY-2962] add JDK-25 to bld. Removed obsolete elements from workflow#2345
darranl merged 2 commits intowildfly-security:2.xfrom
rsearls:ELY-2962-JDK25-github-workflow-2.x

Conversation

@rsearls
Copy link
Copy Markdown
Contributor

@rsearls rsearls commented Nov 18, 2025

@@ -40,5 +52,20 @@ jobs:
restore-keys: ${{ runner.os }}-m2
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

One small point, I think it is good to include the Java version in the restore key name as well

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rsearls just a reminder that this small point was not addressed

@rsearls rsearls force-pushed the ELY-2962-JDK25-github-workflow-2.x branch from 873d981 to 9825477 Compare November 19, 2025 17:18
@darranl
Copy link
Copy Markdown
Contributor

darranl commented Nov 20, 2025

Sorry @rsearls I think this conflicts now with your other PR I just merged - do we need both of your PRs for Java 24 and Java 25? Maybe these can be combined into one?

@rsearls
Copy link
Copy Markdown
Contributor Author

rsearls commented Nov 20, 2025

We do want this change. It contains the performance improvement Ken recommended yesterday by slimplifying the host file rules.

@skyllarr
Copy link
Copy Markdown
Contributor

Hi @rsearls , I think you have to rebase this one now as it has conflicts

@rsearls rsearls force-pushed the ELY-2962-JDK25-github-workflow-2.x branch from 9825477 to 486cecc Compare November 21, 2025 19:20
@rsearls
Copy link
Copy Markdown
Contributor Author

rsearls commented Nov 21, 2025

Rebase complete

- name: Check for file existence
id: file_check
run: |
if git ls-files --error-unmatch IsJdk24.txt > /dev/null 2>&1; then
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hi @rsearls , where should the file IsJdk24.txt be created?

Copy link
Copy Markdown
Contributor

@skyllarr skyllarr Nov 24, 2025

Choose a reason for hiding this comment

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

I understand now, it is in this PR https://github.com/wildfly-security/wildfly-elytron/pull/2344/files , so the jdk 25 build will be happening after that one is merged

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Now that the PR- 2344 has been merged. I'll rebase this one which will pickup the desired changes.
IsJdk24.txt is in the root directory of this PR.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Opps sorry PR-2344 has NOT been merged yet. I'll wait for that and then rebase this one.
I will check that IsJdk24.txt is present I had to remove it in order to check that the first "if" check worked.
Perhaps I did not return it to the bld.

@darranl darranl added the +1 DAL label Nov 28, 2025
@darranl darranl merged commit e638c19 into wildfly-security:2.x Nov 28, 2025
9 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