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

Upgrading nb-javac to JDK 24b29. #8037

Merged
merged 1 commit into from
Dec 28, 2024
Merged

Conversation

lahodaj
Copy link
Contributor

@lahodaj lahodaj commented Dec 11, 2024

A first sketch (so far) to attempt to (nb-)javac from JDK 24.

@lahodaj lahodaj added Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form) LSP [ci] enable Language Server Protocol tests VSCode Extension [ci] enable VSCode Extension tests labels Dec 11, 2024
@lahodaj lahodaj added this to the NB25 milestone Dec 11, 2024
Object ordinary = null;

try {
ordinary = Enum.valueOf((Class<Enum>) Class.forName("com.sun.tools.javac.api.JavacScope$ScopeType"), "ORDINARY");
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The ScopeType is currently private in JavacScope. I'll see if there's something that can be done about it, but it seems somewhat unlikely it could be done in JDK24. So it seems we may need to live with code like this. My mistake.

@mbien mbien added Upgrade Library Library (Dependency) Upgrade ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) labels Dec 17, 2024
@mbien
Copy link
Member

mbien commented Dec 18, 2024

looks good! In past we would have bumped CI to the next major JDK version in this PR since it updates the major javac version. However, we have a chicken-egg problem with the SM removal proposals. (many java tests do also not work if JDK > nb-javac version and we can't bump CI here since it would fail due to required SM removal changes)

I temporarily merged this PR into #7928 which allows us to test both PRs fully for the first time on 24-ea and all tests passed which is great.

@lahodaj lahodaj marked this pull request as ready for review December 23, 2024 20:51
@mbien mbien changed the title Upgrading to JDK 24b27. Upgrading nb-javac to JDK 24b27. Dec 23, 2024
Copy link
Member

@mbien mbien left a comment

Choose a reason for hiding this comment

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

new javac for christmas :)

@lahodaj lahodaj added the ci:all-tests [ci] enable all tests label Dec 26, 2024
@apache apache locked and limited conversation to collaborators Dec 26, 2024
@apache apache unlocked this conversation Dec 26, 2024
@lahodaj
Copy link
Contributor Author

lahodaj commented Dec 26, 2024

Re-running with "all" tests enabled. If everything is green, and there are no objections, I'll integrate at some point - maybe tomorrow.

@matthiasblaesing
Copy link
Contributor

Restartet the 3 failing tests.

@mbien
Copy link
Member

mbien commented Dec 26, 2024

restarted twice more. we have to check

testOrdering1: org.netbeans.modules.java.hints.FieldForUnusedParamTest

at some point since it is another test which is failing relatively often.

The same happened to me in other PRs #7958 (comment) - so the javać update is not the cause of this.

@mbien mbien changed the title Upgrading nb-javac to JDK 24b27. Upgrading nb-javac to JDK 24b29. Dec 27, 2024
@mbien
Copy link
Member

mbien commented Dec 28, 2024

going to merge this PR once master is green so that we can start testing on JDK 24.

We might want to update javac to a later build before release anyway, dependent on what changes make it in till then.

@mbien mbien merged commit 35b31ef into apache:master Dec 28, 2024
77 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci:all-tests [ci] enable all tests ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form) LSP [ci] enable Language Server Protocol tests Upgrade Library Library (Dependency) Upgrade VSCode Extension [ci] enable VSCode Extension tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Syntactic error missing when inserting a switch in enum body
3 participants