cxf-fediz git commit: More licensing/notice work

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
Report Content as Inappropriate

cxf-fediz git commit: More licensing/notice work

Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes f0745d674 -> 2ee464329

More licensing/notice work

Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/2ee46432
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/2ee46432
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/2ee46432

Branch: refs/heads/1.2.x-fixes
Commit: 2ee46432976f7bd6c4240e04118b72a0c482d81f
Parents: f0745d6
Author: Colm O hEigeartaigh <[hidden email]>
Authored: Mon May 15 11:41:49 2017 +0100
Committer: Colm O hEigeartaigh <[hidden email]>
Committed: Mon May 15 11:42:23 2017 +0100

 apache-fediz/src/main/release/LICENSE |  3 +++
 apache-fediz/src/main/release/NOTICE  | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/apache-fediz/src/main/release/LICENSE b/apache-fediz/src/main/release/LICENSE
index ec402f0..406dd2c 100644
--- a/apache-fediz/src/main/release/LICENSE
+++ b/apache-fediz/src/main/release/LICENSE
@@ -234,3 +234,6 @@ This project bundles JAXB core (CDDL 1.1 + GPLv2 with classpath exception licens
 This project bundles the Sun JAXB Reference Implementation Runtime (CDDL 1.1 + GPLv2 with classpath exception license)
  - See licenses/LICENSE-cddl-gpl-11.txt
+This project bundles JSTL (CDDL 1.1 + GPLv2 with classpath exception license)
+ - See licenses/LICENSE-cddl-gpl-11.txt

diff --git a/apache-fediz/src/main/release/NOTICE b/apache-fediz/src/main/release/NOTICE
index 6801038..a40b89d 100644
--- a/apache-fediz/src/main/release/NOTICE
+++ b/apache-fediz/src/main/release/NOTICE
@@ -18,3 +18,20 @@ Portions of the included XmlSchema library are Copyright 2006 International Busi
 Portions of the included XmlSchema library are Copyright (C) World Wide Web
 Consortium 2006, 2007 and licensed under the three-part BSD license.
+Portions of the included Apache Bval library includes software developed by
+Agimatec GmbH. Copyright 2007-2010 Agimatec GmbH. All rights reserved.
+OpenJPA includes software developed by the SERP project
+Copyright (c) 2002-2006, A. Abram White. All rights reserved.
+OpenJPA includes the persistence and orm schemas from the JPA specifications.
+Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
+OpenJPA elects to include this software in this distribution under the
+CDDL license.  You can obtain a copy of the License at:
+    https://glassfish.dev.java.net/public/CDDL+GPL.html
+The source code is available at:
+    https://glassfish.dev.java.net/source/browse/glassfish/
+OpenJPA includes software written by Miroslav Nachev