This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch release121
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 26e6ce805bae6d79990354fb9bdc4971228f28ad
Merge: 95e4be4 0598a9d
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Tue Aug 18 09:53:15 2020 +0100
Merge pull request #2311 from apache/master
Sync master to release branch for NB 12.1-beta3
.../server/config/ConfigBuilderProvider.java | 2 +-
.../tooling/server/config/GlassFishV5_1.xml | 101 -
.../tooling/server/config/GlassFishV5_1_0.xml | 4 +-
.../tooling/server/config/JavaEEProfile.java | 2 +-
ide/html.validation/external/binaries-list | 8 +-
.../external/galimatias-0.1.3-license.txt | 25 +
.../{iri-0.5-license.txt => iri-0.8-license.txt} | 2 +-
.../external/langdetect-1.2-license.txt | 209 +
.../external/salvation-2.7.2-license.txt | 209 +
.../external/saxon9B-9.1.0.2-license.txt | 367 -
.../external/validator-20200626.patch | 251 +
.../external/validator-howto-build.txt | 15 +
ide/html.validation/external/validator.patch | 8898 --------------------
ide/html.validation/nbproject/project.properties | 19 +-
ide/html.validation/nbproject/project.xml | 18 +-
.../test/unit/data/testfiles/testEmbeddedCSS.xhtml | 37 +
.../html/validation/ValidationTransactionTest.java | 16 +
nbbuild/licenses/MIT-galimatias | 19 +
.../org/openide/filesystems/FileSystemCompat.java | 12 +-
19 files changed, 827 insertions(+), 9387 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
