This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git

commit ca2ca1534e4d17fc2fb16606aa69b1fa9995c11b
Merge: f72cb97 073558a
Author: Jaroslav Tulach <jaroslav.tul...@apidesign.org>
AuthorDate: Thu Dec 24 10:56:13 2020 +0100

    Merging with changes in master

 Jenkinsfile.groovy                                 |   2 +-
 .../netbeans/html/boot/fx/AbstractFXPresenter.java |  21 +-
 .../java/org/netbeans/html/boot/fx/FXConsole.java  |  11 +-
 .../net/java/html/boot/script/DynamicHTTP.java     |   2 +-
 .../java/html/boot/script/KnockoutEnvJSTest.java   |   9 +-
 .../{SingleCase.java => ScriptEngineCase.java}     |  57 +-
 ...riptTst.java => ScriptEngineJavaScriptTCK.java} |  18 +-
 ...23JavaScriptTest.java => ScriptEngineTest.java} |  48 +-
 .../net/java/html/boot/script/ScriptsTest.java     |   2 +-
 .../org/netbeans/html/boot/impl/JsCallback.java    |  15 +-
 .../main/java/org/netbeans/html/boot/spi/Fn.java   |   5 +
 .../html/boot/impl/JavaScriptProcesorTest.java     | 187 +++---
 .../netbeans/html/boot/impl/JsCallbackTest.java    |   8 +-
 .../org/netbeans/html/boot/impl/JsMethods.java     |  28 +-
 .../java/org/netbeans/html/boot/impl/JsUtils.java  |  27 +-
 .../html/presenters/browser/DynamicHTTP.java       |   2 +-
 .../presenters/browser/JavaScriptUtilities.java    |  11 +-
 .../org/netbeans/html/presenters/spi/Generic.java  | 213 ++++---
 .../org/netbeans/html/geo/impl/JsGLProvider.java   |  36 +-
 .../netbeans/html/geo/impl/GeoProcessorTest.java   |  69 +-
 json-tck/pom.xml                                   |   8 -
 .../main/java/net/java/html/js/tests/Bodies.java   | 151 +++--
 .../java/net/java/html/js/tests/Factorial.java     |   7 +-
 .../main/java/net/java/html/js/tests/Receiver.java |   8 +-
 .../src/main/java/net/java/html/js/tests/Sum.java  |  20 +-
 .../net/java/html/json/tests/GCKnockoutTest.java   |  36 +-
 .../net/java/html/json/tests/KnockoutTest.java     | 306 ++++-----
 .../java/net/java/html/json/tests/MinesTest.java   |  49 +-
 .../java/html/json/tests/ObtainAndComputeTest.java | 136 ++++
 .../main/java/net/java/html/json/tests/Utils.java  |  92 +--
 .../org/netbeans/html/json/tck/JavaScriptTCK.java  |  44 +-
 .../java/org/netbeans/html/json/tck/KOTest.java    |  10 +-
 .../org/netbeans/html/json/tck/KnockoutTCK.java    |  53 +-
 .../netbeans/html/json/impl/ModelProcessor.java    |  70 +-
 .../net/java/html/json/ModelProcessorTest.java     | 710 +++++++++++----------
 .../html/ko/felix/test/KnockoutFelixTCKImpl.java   |  11 +-
 .../netbeans/html/ko/felix/test/DynamicHTTP.java   |   2 +-
 .../html/ko/osgi/test/KnockoutEquinoxTCKImpl.java  |  11 +-
 .../netbeans/html/ko/osgi/test/DynamicHTTP.java    |   2 +-
 .../java/org/netbeans/html/wstyrus/LoadJSON.java   |  11 +-
 .../netbeans/html/wstyrus/TyrusDynamicHTTP.java    |   2 +-
 .../netbeans/html/wstyrus/TyrusKnockoutTest.java   |  11 +-
 .../main/java/org/netbeans/html/ko4j/Knockout.java | 234 +++----
 .../main/java/org/netbeans/html/ko4j/LoadJSON.java |  88 +--
 .../main/java/org/netbeans/html/ko4j/LoadWS.java   |  59 +-
 .../java/org/netbeans/html/ko4j/DynamicHTTP.java   |   2 +-
 .../src/test/java/org/netbeans/html/ko4j/KOFx.java |   2 +
 .../org/netbeans/html/ko4j/KnockoutFXTest.java     |  16 +-
 pom.xml                                            |   8 +-
 .../org/netbeans/html/presenters/render/Show.java  |   2 +-
 .../html/presenters/webkit/UnJarResources.java     |   4 +-
 .../org/netbeans/html/presenters/webkit/Case.java  |  10 +-
 .../html/presenters/webkit/DynamicHTTP.java        |   2 +-
 .../html/presenters/webkit/GtkJavaScriptTest.java  |  37 +-
 .../html/presenters/webkit/GtkKnockoutTest.java    |  69 +-
 .../java/org/netbeans/html/xhr4j/LoadJSON.java     |  24 +-
 .../org/netbeans/html/xhr4j/JsonDynamicHTTP.java   |   2 +-
 .../org/netbeans/html/xhr4j/JsonKnockoutTest.java  |  11 +-
 58 files changed, 1702 insertions(+), 1389 deletions(-)

diff --cc pom.xml
index 0ac2c4b,bbd2559..9097ebf
--- a/pom.xml
+++ b/pom.xml
@@@ -33,8 -33,7 +33,8 @@@
    </parent>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       <netbeans.version>RELEASE121</netbeans.version>
+       <netbeans.version>RELEASE122</netbeans.version>
 +      <graalvm.version>20.3.0</graalvm.version>
        <grizzly.version>2.3.8</grizzly.version>
        <license>COPYING</license>
        <publicPackages />


---------------------------------------------------------------------
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

Reply via email to