This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-70_NEW in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit c107ec54653fd469d8bb9e2d6b44821a47346b8a Merge: 2ef4dfd 2b344d7 Author: Sergey Kamov <[email protected]> AuthorDate: Tue Jul 20 12:59:38 2021 +0300 Merge branch 'master' into NLPCRAFT-70_NEW README.md | 4 +- docker/readme.md | 12 ++--- nlpcraft-examples/alarm/pom.xml | 2 +- nlpcraft-examples/echo/pom.xml | 2 +- nlpcraft-examples/helloworld/pom.xml | 2 +- nlpcraft-examples/lightswitch/pom.xml | 2 +- .../lightswitch/LightSwitchGroovyModel.groovy | 2 +- .../examples/lightswitch/LightSwitchJavaModel.java | 2 +- .../examples/lightswitch/LightSwitchKotlinModel.kt | 2 +- .../lightswitch/LightSwitchScalaModel.scala | 2 +- nlpcraft-examples/minecraft/pom.xml | 2 +- nlpcraft-examples/phone/pom.xml | 2 +- nlpcraft-examples/sql/pom.xml | 2 +- nlpcraft-examples/time/pom.xml | 2 +- nlpcraft-examples/weather/pom.xml | 2 +- nlpcraft-stanford/pom.xml | 2 +- nlpcraft/pom.xml | 2 +- nlpcraft/src/main/resources/cli/templates.zip | Bin 82469 -> 82479 bytes .../apache/nlpcraft/common/version/NCVersion.scala | 1 + .../scala/org/apache/nlpcraft/model/NCIntent.java | 20 +++++++- .../org/apache/nlpcraft/model/NCIntentRef.java | 14 +++++- .../org/apache/nlpcraft/model/NCIntentSample.java | 2 +- .../apache/nlpcraft/model/NCIntentSampleRef.java | 2 +- .../org/apache/nlpcraft/model/NCIntentTerm.java | 20 +++++++- .../scala/org/apache/nlpcraft/model/NCToken.java | 7 +-- .../scala/org/apache/nlpcraft/model/NCVariant.java | 27 ++++++++++ .../nlpcraft/model/tools/cmdline/NCCli.scala | 38 +++++++------- .../tools/cmdline/NCCliFileNameCompleter.java | 3 -- .../tools/cmdline/NCCliModelClassCompleter.java | 56 ++++++++++++++++++++- openapi/nlpcraft_swagger.yml | 2 +- pom.xml | 4 +- 31 files changed, 185 insertions(+), 57 deletions(-)
