From 032015a70a399972b07e0131393369d76d6aa4b8 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 20 Apr 2013 06:00:02 -0400 Subject: [PATCH] updated license information Former-commit-id: 69776b7dc082cf132d6b9eca21347690629f9622 --- NOTICES.txt | 10 +++++++--- README.md | 12 ++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/NOTICES.txt b/NOTICES.txt index cb27124b1..6660906ff 100644 --- a/NOTICES.txt +++ b/NOTICES.txt @@ -1,5 +1,5 @@ DependencyCheck -Copyright (c) 2012 Jeremy Long. All Rights Reserved. +Copyright (c) 2012-2013 Jeremy Long. All Rights Reserved. This product includes software developed by The Apache Software Foundation (http://www.apache.org/). @@ -7,5 +7,9 @@ The Apache Software Foundation (http://www.apache.org/). This product includes software developed by Jquery.com (http://jquery.com/). -This product includes software developed by -H2 (http://www.h2database.com). +This software contains unmodified binary redistributions for H2 database engine (http://www.h2database.com/), which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License) or under the (unmodified) EPL 1.0 (Eclipse Public License). +An original copy of the license agreement can be found at: http://www.h2database.com/html/license.html + +This product includes data from the Common Weakness Enumeration (CWE): http://cwe.mitre.org/ + +This product downloads and utilizes data from the National Vulnerability Database hosted by NIST: http://nvd.nist.gov/download.cfm \ No newline at end of file diff --git a/README.md b/README.md index fff4e5dda..b29934e74 100644 --- a/README.md +++ b/README.md @@ -21,14 +21,18 @@ Mailing List Subscribe: [dependency-check+subscribe@googlegroups.com] [subscribe] Post: [dependency-check@googlegroups.com] [post] -License +Copyright & License - -[GPLv3] +Dependency-Check is Copyright (c) 2012-2013 Jeremy Long. All Rights Reserved. + +Permission to modify and redistribute is granted under the terms of the GPLv3 license. See the [LICENSE.txt] [GPLv3] file for the full license. + +Dependency-Check makes use of several other open source libraries. Please see the [NOTICE.txt] [notices] file for more information. -Copyright (c) 2012-2013 Jeremy Long. All Rights Reserved. [wiki]: https://github.com/jeremylong/DependencyCheck/wiki [subscribe]: mailto:dependency-check+subscribe@googlegroups.com [post]: mailto:dependency-check@googlegroups.com - [GPLv3]: https://github.com/jeremylong/DependencyCheck/blob/master/LICENSE.txt \ No newline at end of file + [GPLv3]: https://github.com/jeremylong/DependencyCheck/blob/master/LICENSE.txt + [notices]: https://github.com/jeremylong/DependencyCheck/blob/master/NOTICES.txt \ No newline at end of file