You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nlpcraft.apache.org by sm...@apache.org on 2020/06/23 11:50:45 UTC

[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-69

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

smakov pushed a commit to branch NLPCRAFT-69
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git

commit 8fe125c6a5cd5cbf774b4f17966492c4ab9ebe84
Merge: 577d98c fc43f32
Author: smakov <sm...@apache.org>
AuthorDate: Tue Jun 23 14:50:23 2020 +0300

    Merge branch 'master' into NLPCRAFT-69

 LICENSE                                            | 47 ++++++-------
 bin/prepare.sh                                     |  2 +-
 bindist/LICENSE                                    | 26 +------
 nlpcraft-stanford/pom.xml                          |  2 +-
 nlpcraft/pom.xml                                   |  2 +-
 nlpcraft/src/main/resources/opennlp/models.txt     |  2 -
 nlpcraft/src/main/resources/synonyms/synonyms.json | 14 ----
 .../apache/nlpcraft/common/version/NCVersion.scala |  2 +-
 .../org/apache/nlpcraft/server/NCServer.scala      |  3 -
 .../server/nlp/synonym/NCSynonymManager.scala      | 80 ----------------------
 .../server/nlp/synonym/NCSynonymType.scala         | 32 ---------
 pom.xml                                            |  2 +-
 12 files changed, 28 insertions(+), 186 deletions(-)