directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1785522 - in /directory/shared/trunk: LICENSE distribution/src/main/release/NOTICE distribution/src/main/release/licenses/jbcrypt-LICENSE.txt
Date Sat, 04 Mar 2017 23:27:05 GMT
Author: elecharny
Date: Sat Mar  4 23:27:05 2017
New Revision: 1785522

URL: http://svn.apache.org/viewvc?rev=1785522&view=rev
Log:
Updated the L&N files to include jbcrypt

Added:
    directory/shared/trunk/distribution/src/main/release/licenses/jbcrypt-LICENSE.txt
Modified:
    directory/shared/trunk/LICENSE
    directory/shared/trunk/distribution/src/main/release/NOTICE

Modified: directory/shared/trunk/LICENSE
URL: http://svn.apache.org/viewvc/directory/shared/trunk/LICENSE?rev=1785522&r1=1785521&r2=1785522&view=diff
==============================================================================
--- directory/shared/trunk/LICENSE (original)
+++ directory/shared/trunk/LICENSE Sat Mar  4 23:27:05 2017
@@ -226,3 +226,23 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER L
 OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+==================================================================================================
+jBCrypt 0.4.1 license
+--------------------------------------------------------------------------------------------------
+jBCrypt is subject to the following license:
+
+/*
+ * Copyright (c) 2006 Damien Miller <djm@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

Modified: directory/shared/trunk/distribution/src/main/release/NOTICE
URL: http://svn.apache.org/viewvc/directory/shared/trunk/distribution/src/main/release/NOTICE?rev=1785522&r1=1785521&r2=1785522&view=diff
==============================================================================
--- directory/shared/trunk/distribution/src/main/release/NOTICE (original)
+++ directory/shared/trunk/distribution/src/main/release/NOTICE Sat Mar  4 23:27:05 2017
@@ -31,3 +31,5 @@ This product includes/uses software, SLF
 developed by QOS.ch  (http://www.qos.ch)
 
 This product includes/uses software, XMLPullParser 3 - xpp3:xpp3:jar:1.1.3.4.O (http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/)
+
+This product includes/uses software, jBCrypt 0.4.1 (http://www.mindrot.org/files/jBCrypt)
\ No newline at end of file

Added: directory/shared/trunk/distribution/src/main/release/licenses/jbcrypt-LICENSE.txt
URL: http://svn.apache.org/viewvc/directory/shared/trunk/distribution/src/main/release/licenses/jbcrypt-LICENSE.txt?rev=1785522&view=auto
==============================================================================
--- directory/shared/trunk/distribution/src/main/release/licenses/jbcrypt-LICENSE.txt (added)
+++ directory/shared/trunk/distribution/src/main/release/licenses/jbcrypt-LICENSE.txt Sat
Mar  4 23:27:05 2017
@@ -0,0 +1,18 @@
+jBCrypt is subject to the following license:
+
+/*
+ * Copyright (c) 2006 Damien Miller <djm@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.
+ */
+



Mime
View raw message