You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/01/31 13:49:04 UTC
[netbeans] 01/01: Merge pull request #1903 from apache/master
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch release113
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 090a21448c308c29c7ede623e33518a4714b0487
Merge: e911149 dcb9ac3
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Jan 31 14:48:51 2020 +0100
Merge pull request #1903 from apache/master
sync master to release 113 branch for beta2
enterprise/servletjspapi/build.xml | 1 +
.../servletjspapi/nbproject/project.properties | 4 +-
.../web/beans/impl/model/EnableBeansFilter.java | 135 ++--
.../web/jsf/editor/facelets/libdefs/core.xml | 11 +-
.../web/jsf/editor/facelets/libdefs/html.xml | 6 +-
.../jsf/editor/facelets/mojarra/ConfigManager.java | 8 +-
enterprise/web.jsf/licenseinfo.xml | 1 +
.../org/netbeans/modules/web/jsf/JSFCatalog.java | 17 +-
.../jsf/impl/facesmodel/JSFConfigModelImpl.java | 8 +-
.../web/jsf/impl/facesmodel/JSFConfigQNames.java | 109 +++
.../jsf/resources/web-facelettaglibrary_2_3.xsd | 776 +++++++++++++++++++++
.../web/jsf/resources/web-faces-mime-resolver.xml | 10 +
enterprise/web.jsf20/external/binaries-list | 2 +-
...7-license.txt => javax.faces-2.3.9-license.txt} | 2 +-
.../nbproject/org-netbeans-modules-web-jsf20.sig | 8 +-
enterprise/web.jsf20/nbproject/project.properties | 8 +-
.../netbeans/modules/web/jsf20/Bundle.properties | 8 +-
.../src/org/netbeans/modules/web/jsf20/jsf20.xml | 4 +-
.../web.jspparser/nbproject/project.properties | 1 +
enterprise/web.struts/nbproject/project.properties | 3 +-
.../src/org/netbeans/modules/websvc/swdp/swdp.xml | 7 +-
.../external/javafx-linux-13-license.txt | 748 +++++++++-----------
.../external/javafx-mac-13-license.txt | 748 +++++++++-----------
.../external/javafx-win-13-license.txt | 748 +++++++++-----------
.../java/queries/OpenGradleProjectForBinary.java | 6 +-
groovy/gradle/nbproject/project.properties | 4 +
.../netbeans/modules/gradle/GradleDataObject.java | 2 +-
.../modules/gradle/{actions => }/ReloadAction.java | 12 +-
.../netbeans/modules/libs/groovy/groovy-all.xml | 6 +-
ide/libs.jaxb/nbproject/project.properties | 18 +-
ide/libs.jaxb/nbproject/project.xml | 6 +-
ide/libs.jaxb/src/org/netbeans/libs/jaxb/jaxb.xml | 8 +-
.../client/bindings/CompletionProviderImpl.java | 75 +-
.../modules/textmate/lexer/TextmateTokenId.java | 61 +-
java/j2ee.eclipselink/external/binaries-list | 1 +
.../external/eclipselink-2.5.2-license.txt | 2 +-
java/j2ee.eclipselink/nbproject/project.properties | 2 +-
.../modules/j2ee/eclipselink/eclipselink_lib.xml | 2 +
.../modules/j2ee/eclipselink/jpa20-persistence.xml | 2 +-
java/j2ee.persistence/nbproject/project.properties | 10 +-
.../org-netbeans-modules-java-api-common.sig | 2 +-
java/java.api.common/nbproject/project.properties | 1 +
java/java.api.common/nbproject/project.xml | 17 +
.../common/singlesourcefile/CompileProcess.java | 77 ++
.../api/common/singlesourcefile/DebugProcess.java | 84 +++
.../api/common/singlesourcefile/Description.html | 32 +-
.../api/common/singlesourcefile/File.java.template | 45 +-
.../api/common/singlesourcefile/JPDAStart.java | 179 +++++
.../common/{ => singlesourcefile}/RunProcess.java | 2 +-
.../SingleJavaSourceDebugActionProvider.java | 103 +++
.../SingleJavaSourceRunActionProvider.java | 2 +-
.../SingleSourceCompilerOptQueryImpl.java | 81 +++
.../singlesourcefile/SingleSourceFileUtil.java | 61 ++
.../api/common/singlesourcefile/package-info.java | 26 +
.../{ => singlesourcefile}/JavaFileTest.java | 2 +-
.../modules/java/hints/errors/Bundle.properties | 2 +-
.../errors/EnablePreviewSingleSourceFile.java | 206 ++++++
.../java/hints/jdk/ConvertTextBlockToString.java | 107 +++
.../modules/java/hints/resources/layer.xml | 1 +
.../hints/jdk/ConvertTextBlockToStringTest.java | 370 ++++++++++
.../modules/java/source/JavadocHelper.java | 70 +-
.../modules/java/source/save/CasualDiff.java | 5 +-
.../modules/java/source/save/Reformatter.java | 3 +
.../src/org/netbeans/modules/java/JavaNode.java | 21 +-
.../modules/java/source/JBrowseModule.java | 10 +-
.../api/java/source/ui/HTMLJavadocParser.java | 5 +-
.../api/java/source/ui/HTMLJavadocParserTest.java | 91 ++-
.../api/java/source/ui/Javadoc11Class.html | 376 ++++++++++
.../netbeans/api/java/source/ui/Javadoc11Enum.html | 422 +++++++++++
.../netbeans/api/java/source/ui/Javadoc8Class.html | 338 +++++++++
.../netbeans/api/java/source/ui/Javadoc8Enum.html | 383 ++++++++++
.../external/nb-javac-13-api-license.txt | 748 +++++++++-----------
.../external/nb-javac-13-impl-license.txt | 748 +++++++++-----------
.../external/jshell-9-license.txt | 748 +++++++++-----------
.../queries/RepositoryForBinaryQueryImpl.java | 30 +-
.../queries/RepositoryForBinaryQueryImplTest.java | 111 ++-
.../callhierarchy/CallHierarchyTopComponent.form | 8 +-
.../callhierarchy/CallHierarchyTopComponent.java | 8 +-
.../netbeans/modules/websvc/jaxws21/jaxws21.xml | 1 -
nbbuild/cluster.properties | 1 +
nbbuild/external/langtools-9-license.txt | 748 +++++++++-----------
.../external/sigtest-maven-plugin-1.2-license.txt | 748 +++++++++-----------
nbbuild/licenses/GPL-2-CP | 748 +++++++++-----------
.../netbeans-dev_snap/snap/snapcraft.yaml | 2 +-
.../packaging/netbeans_snap/snap/snapcraft.yaml | 2 +-
.../modules/php/project/api/PhpSourcePath.java | 2 +-
platform/core.kit/nbproject/project.xml | 6 +
.../jsf20/jsf20.xml => platform/janitor/build.xml | 23 +-
.../jsf20.xml => platform/janitor/licenseinfo.xml | 27 +-
platform/janitor/manifest.mf | 5 +
.../janitor/nbproject/project.properties | 5 +-
platform/janitor/nbproject/project.xml | 106 +++
.../org/netbeans/modules/janitor/Bundle.properties | 3 +-
.../src/org/netbeans/modules/janitor/Janitor.java | 236 +++++++
.../netbeans/modules/janitor/resources/clean.gif | Bin 0 -> 852 bytes
.../javahelp/external/jhall-2.0_05-license.txt | 748 +++++++++-----------
platform/libs.flatlaf/external/binaries-list | 2 +-
...0.25.1-license.txt => flatlaf-0.26-license.txt} | 4 +-
platform/libs.flatlaf/nbproject/project.properties | 2 +-
platform/libs.flatlaf/nbproject/project.xml | 4 +-
.../external/lib-javafx-13.03-beta-license.txt | 748 +++++++++-----------
.../netbeans/swing/laf/flatlaf/FlatLaf.properties | 3 +-
.../swing/laf/flatlaf/FlatLightLaf.properties | 4 +
.../modules/progress/ui/AbstractWindowRunner.java | 9 +-
.../modules/quicksearch/QuickSearchComboBar.java | 5 +
.../nodejs/file/NpmDebugLogDataObject.java | 2 +-
.../nodejs/file/PackageLockJsonDataObject.java | 2 +-
.../editor/TypeScriptDataObjectDataObject.java | 3 +-
108 files changed, 8490 insertions(+), 4824 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists