You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2020/04/12 08:58:59 UTC
[incubator-nlpcraft] 02/02: Merge branch 'master' into NLPCRAFT-30
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-30
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 137c730d1fbc18a8721ccb1ece7e0b049075d7c7
Merge: efa4550 914c3c4
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Sun Apr 12 11:58:38 2020 +0300
Merge branch 'master' into NLPCRAFT-30
KEYS | 57 +++++++++++++++
LICENSE | 28 +------
NOTICE | 30 ++++----
README.md | 1 +
bin/prepare.sh | 3 +-
bindist/LICENSE | 41 -----------
openapi/README.md | 1 +
pom.xml | 9 ++-
.../scala/org/apache/nlpcraft/examples/README.md | 1 +
.../org/apache/nlpcraft/examples/alarm/README.md | 1 +
.../org/apache/nlpcraft/examples/echo/README.md | 1 +
.../apache/nlpcraft/examples/helloworld/README.md | 1 +
.../apache/nlpcraft/examples/lightswitch/README.md | 1 +
.../org/apache/nlpcraft/examples/phone/README.md | 1 +
.../org/apache/nlpcraft/examples/time/README.md | 1 +
.../org/apache/nlpcraft/examples/weather/README.md | 1 +
.../intent/dsl/{NCDslTest.java => NCDslTest.scala} | 48 ++++++------
.../nlpcraft/models/stm/NCStmTestModelSpec.java | 85 ----------------------
.../nlpcraft/models/stm/NCStmTestModelSpec.scala | 83 +++++++++++++++++++++
19 files changed, 200 insertions(+), 194 deletions(-)
diff --cc pom.xml
index 550229c,0050c98..f5df355
--- a/pom.xml
+++ b/pom.xml
@@@ -110,10 -110,8 +110,9 @@@
<jackson.yaml.ver>2.10.1</jackson.yaml.ver>
<apache.math.ver>3.6.1</apache.math.ver>
<apache.common.lang.ver>3.8.1</apache.common.lang.ver>
+ <apache.common.graph.ver>0.8.1</apache.common.graph.ver>
<apache.httpcomponents.ver>4.5.7</apache.httpcomponents.ver>
<apache.opennlp.ver>1.9.1</apache.opennlp.ver>
- <stanford.corenlp.ver>3.9.2</stanford.corenlp.ver>
<maven.javadoc.plugin.ver>3.0.0-M1</maven.javadoc.plugin.ver>
<maven.shade.plugin.ver>3.2.1</maven.shade.plugin.ver>
<maven.source.plugin.ver>3.0.1</maven.source.plugin.ver>