You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/09/28 17:25:19 UTC
[incubator-nlpcraft] branch NLPCRAFT-108 updated: Fix for
NLPCRAFT-139
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-108
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-108 by this push:
new 70229ec Fix for NLPCRAFT-139
70229ec is described below
commit 70229ecddf93217f3ca131b8ed79685b2f3fc240
Author: Aaron Radzinski <ar...@datalingvo.com>
AuthorDate: Mon Sep 28 10:25:07 2020 -0700
Fix for NLPCRAFT-139
---
LICENSE | 18 ++++++++++++++++++
NOTICE | 4 ++++
bindist/LICENSE | 22 ++++++++++++++++++++--
bindist/NOTICE | 5 ++++-
4 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/LICENSE b/LICENSE
index fada246..38cd272 100644
--- a/LICENSE
+++ b/LICENSE
@@ -222,3 +222,21 @@ and licensed under MIT license:
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+
+File org.apache.nlpcraft.common.blowfish.NCBlowfishHasher.java is based on
+https://github.com/jeremyh/jBCrypt/blob/master/src/main/java/org/mindrot/BCrypt.java
+and licensed as follows:
+
+ Copyright (C) 2006 Damien Miller <dj...@mindrot.org>
+
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/NOTICE b/NOTICE
index b632779..1e7073f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -7,3 +7,7 @@ The Apache Software Foundation (http://www.apache.org/).
File org.apache.nlpcraft.common.util.NCIdGenerator.java
is based on https://github.com/peet/Hashids.java
Copyright (C) 2012 Ivan Akimov
+
+File org.apache.nlpcraft.common.blowfish.NCBlowfishHasher.java.
+Based on https://github.com/jeremyh/jBCrypt/blob/master/src/main/java/org/mindrot/BCrypt.java
+Copyright (C) 2006 Damien Miller <dj...@mindrot.org>
\ No newline at end of file
diff --git a/bindist/LICENSE b/bindist/LICENSE
index 2e771c4..7f4c352 100644
--- a/bindist/LICENSE
+++ b/bindist/LICENSE
@@ -207,7 +207,7 @@ https://en.wikipedia.org/wiki/Moby_Project for more information.
File org.apache.nlpcraft.common.util.NCIdGenerator.java is based on https://github.com/peet/hashids.java
and licensed under MIT license:
- Copyright 2012 Ivan Akimov
+ Copyright (C) 2012 Ivan Akimov
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -221,4 +221,22 @@ and licensed under MIT license:
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+ DEALINGS IN THE SOFTWARE.
+
+File org.apache.nlpcraft.common.blowfish.NCBlowfishHasher.java is based on
+https://github.com/jeremyh/jBCrypt/blob/master/src/main/java/org/mindrot/BCrypt.java
+and licensed as follows:
+
+ Copyright (C) 2006 Damien Miller <dj...@mindrot.org>
+
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
\ No newline at end of file
diff --git a/bindist/NOTICE b/bindist/NOTICE
index 3d34dc9..0cddaeb 100644
--- a/bindist/NOTICE
+++ b/bindist/NOTICE
@@ -6,5 +6,8 @@ The Apache Software Foundation (http://www.apache.org/).
File org.apache.nlpcraft.common.util.NCIdGenerator.java.
Based on https://github.com/peet/hashids.java
-Licensed under MIT license.
Copyright (C) 2012 Ivan Akimov
+
+File org.apache.nlpcraft.common.blowfish.NCBlowfishHasher.java.
+Based on https://github.com/jeremyh/jBCrypt/blob/master/src/main/java/org/mindrot/BCrypt.java
+Copyright (C) 2006 Damien Miller <dj...@mindrot.org>