This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch release120 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 16abbbfa644b6b17d1baaed7f59454da9f8857ca Merge: 6a0e13f ac4e72f Author: Eric Barboni <[email protected]> AuthorDate: Sat May 23 12:51:29 2020 +0200 Merge pull request #2146 from apache/master Sync master to release 12.0 beta 5 .../modules/j2ee/common/ClasspathUtil.java | 23 +++- .../ide/ergonomics/fod/ConfigurationPanel.java | 2 +- .../ide/ergonomics/fod/FindComponentModules.java | 2 +- .../ide/ergonomics/fod/FoDUpdateUnitProvider.java | 2 +- .../modules/editor/fold/ui/FoldViewFactory.java | 35 +++--- .../org/netbeans/api/editor/caret/EditorCaret.java | 12 ++ .../git/jgit/commands/IgnoreUnignoreCommand.java | 4 +- .../libs/git/jgit/AbstractGitTestCase.java | 28 ++--- .../libs/git/jgit/commands/IgnoreTest.java | 9 ++ ide/o.eclipse.jgit/external/binaries-list | 2 +- ....eclipse.jgit-5.5.1.201910021850-r-license.txt} | 2 +- ide/o.eclipse.jgit/nbproject/project.properties | 2 +- ide/o.eclipse.jgit/nbproject/project.xml | 2 +- .../netbeans/modules/java/completion/BaseTask.java | 3 + .../JavaCompletionTask18FeaturesTest.java | 4 + .../release/scripts/build-langtools-consol.xml | 6 +- .../java/openjdk/jtreg/ActionProviderImpl.java | 10 +- .../java/openjdk/project/ActionProviderImpl.java | 26 +++- .../modules/java/openjdk/project/Settings.java | 20 ++++ .../{TestCategory.form => BuildCategory.form} | 63 ++++------ .../openjdk/project/customizer/BuildCategory.java | 132 +++++++++++++++++++++ .../openjdk/project/customizer/Bundle.properties | 3 + .../openjdk/project/customizer/TestCategory.form | 2 + .../openjdk/project/customizer/TestCategory.java | 2 +- .../modules/java/source/save/Reformatter.java | 132 +++++++++++++++------ .../modules/java/source/save/Reindenter.java | 103 ++++++++++++++++ .../modules/java/source/save/FormatingTest.java | 102 ++++++++++++++++ .../modules/java/source/save/ReindenterTest.java | 89 ++++++++++++++ .../netbeans/modules/maven/ActionProviderImpl.java | 29 ++++- .../src/org/netbeans/modules/applemenu/layer.xml | 2 +- 30 files changed, 721 insertions(+), 132 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
