-
Notifications
You must be signed in to change notification settings - Fork 846
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
[cnd] merge master into cnd for JDK21-ga builds #6538
Conversation
Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](google/gson@gson-parent-2.8.5...gson-parent-2.8.9) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.9. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](google/gson@gson-parent-2.8.5...gson-parent-2.8.9) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
These are added adjacent to the existing synthetic keycodes for mouse wheel events used in editor zooming actions.
…728). Registers both mouse buttons 4 and 6 as back, and 5 and 7 as forward, due to cross-platform differences. Need to filter out the synthetic mouse keycodes in the menu action to fix menu shortcut display.
When NB is run on JDK 21, building/running NB modules fails with: Error starting modern compiler at org.apache.tools.ant.taskdefs.compilers.Javac13.execute(Javac13.java:64) ... Caused by: java.lang.IllegalAccessError: class com.sun.tools.javac.main.Main (in unnamed module @0x50ba363b) cannot access class jdk.internal.opt.CommandLine$UnmatchedQuote (in module jdk.internal.opt) because module jdk.internal.opt does not export jdk.internal.opt to unnamed module @0x50ba363b at com.sun.tools.javac.main.Main.compile(Main.java:224) ... adding jdk.internal.opt to the java module flags list fixes this.
- apache#6432 - Show errors when argument uppacking is used after named arguments ```php <?php function test($a, $b, $c) {} test(...[1,2], c: 3); // OK test(a: 3, ...[1,2]); // NG ```
LSP: Modified to prevent NPEs.
… build section, but the compiler plugin is not registered.
@supports selector(h2 > p) { } @supports font-tech(color-COLRv1) { } @supports font-format(opentype) { } Closes: apache#6060
Closes: apache#5975
…after-unpacking Fix wrong `IncorectNamedArgumentHintError` apache#6432
- apache#4685 - Add "After Use Trait" option - Add unit tests
Update nb-javac to jdk-21u.
…rectories from getResource/getResources methods, while normal ClassLoaders do - fixing.
Switch CI from JDK 21-ea to 21-ga.
JakartaEE: Fix more cases where jakarta namespace has to be supported
- switches from jdk15on to jdk18on (which is for JDK 8+) - updates from 1.70 to 1.76
…ng-path-var-param Micronaut: Add missing path variable parameter fix.
update npm module debug (moderate severity vulnerability)
Native Execution Binaries workflow and changes for macOS Arm.
Update bouncycastle to jdk18on-1.76.
Update to maven-indexer 7.0.4 and lucene 9.8.0.
Upgrading Apache Ant, Commons Compress, Commons IO and Maven, FlexMark and Guava
Upgrading the JDOM library in maven.embedder from version 1.0 to 2.0.6.1
…isc/prepare-bundles/com.google.code.gson-gson-2.8.9 Bump gson from 2.8.5 to 2.8.9 in /nbbuild/misc/prepare-bundles
…/typescript.editor/bundles/prepare/com.google.code.gson-gson-2.8.9 Bump gson from 2.8.5 to 2.8.9 in /webcommon/typescript.editor/bundles/prepare
…ncies Build with dependencies before main action
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The merge commit has exactly two parents, where one is the current head CND and the other was the head of master yesterday. There are no changes in the commit itself, so to me this looks like a straight merge. Thanks.
Should we consider, as @vieiro has suggested a few times, doing this in the other direction? Would it be better to merge CND into master with CND in the full cluster but not the release cluster until it is ready for release similar to how rust module development is being handled? |
well. this here is mostly done so that the build works again. I suggested to cherrypick a single commit, but merging everything has the same effect. Merging CND into master is ultimately the goal but since it conflicts with existing C/C++ support there probably have to be some issues resolved first. See thread. We could explore to merge it to master and build it completely separate as first step. |
@mbien @bitrunner Yeah, let's see if we can keep some compatibility with cpplite, as it's used somewhere. |
FWIW, a few weeks ago, I was experimenting with "merging" CND and cpplite. I'll need to adjust that to this merge and finish, but it is unlikely I'd have time for that in the next ~2 weeks. |
Hi @jlahoda . Let me know if I can advance adding support for multiple LSP servers (clangd, ccls, etc.) within those two weeks! |
Sure, feel free to do anything in CND. I was deleting stuff from cpplite, and attempting to rebase cpplite debugger on top of the CND debugger common. |
In PR #6440 we talked about bringing PR #6469 so that CND can be build with JDK21-ga.
This PR brings master to cnd again (including the #6469) so that we can build this JDK version.
I'd appreciate a second look, as I'm doing this in a hurry and tired. Thanks!