This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release126 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 9cacf1fd305b775b176576c8b633b10b73524861 Merge: 22aebab c0d6b2b Author: Neil C Smith <neilcsm...@apache.org> AuthorDate: Thu Nov 11 16:03:18 2021 +0000 Merge pull request #3309 from apache/delivery Merge delivery into release126 for 12.6-rc3 .../modules/payara/tooling/data/JDKVersion.java | 49 +++++++++++---- .../payara/tooling/data/StartupArgsEntity.java | 3 +- .../modules/payara/tooling/server/ServerTasks.java | 2 +- .../tooling/server/parser/JvmConfigReader.java | 10 ++- .../payara/tooling/data/JDKVersionTest.java | 18 +++--- .../org/netbeans/modules/gradle/queries/Info.java | 4 ++ .../gradle/AbstractGradleProjectTestCase.java | 5 ++ extide/libs.gradle/external/binaries-list | 2 +- ...ense.txt => gradle-tooling-api-7.3-license.txt} | 4 +- ...otice.txt => gradle-tooling-api-7.3-notice.txt} | 0 extide/libs.gradle/nbproject/project.properties | 2 +- extide/libs.gradle/nbproject/project.xml | 2 +- .../git/ui/history/SearchHistoryAction.java | 71 ++++++++++------------ .../netbeans/libs/graalsdk/impl/GraalEngine.java | 18 +++--- .../jpda/truffle/access/TruffleAccess.java | 5 +- .../jdk/mapreduce/ForLoopToFunctionalHint.java | 5 +- .../jdk/mapreduce/ForLoopToFunctionalHintTest.java | 52 ++++++++-------- .../debugger/displayer/JavaVariablesDisplayer.java | 65 +++++++++++++++++--- .../netbeans/api/java/source/TreeUtilities.java | 4 +- 19 files changed, 203 insertions(+), 118 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists