You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by os...@apache.org on 2016/01/18 11:11:47 UTC
[3/4] jena git commit: updated on the basis of current
apache-jena/{LICENSE, NOTICE}
updated on the basis of current apache-jena/{LICENSE,NOTICE}
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ae352514
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ae352514
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ae352514
Branch: refs/heads/master
Commit: ae352514cb600bcc1d2a4af28043970cf189160b
Parents: aba57c3
Author: Osma Suominen <os...@helsinki.fi>
Authored: Fri Jan 15 13:24:32 2016 +0200
Committer: Osma Suominen <os...@apache.org>
Committed: Mon Jan 18 12:10:25 2016 +0200
----------------------------------------------------------------------
jena-sdb/dist/LICENSE | 34 +++++++++++++++++++++++++++++++---
jena-sdb/dist/NOTICE | 20 +++++++++++++++++++-
2 files changed, 50 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ae352514/jena-sdb/dist/LICENSE
----------------------------------------------------------------------
diff --git a/jena-sdb/dist/LICENSE b/jena-sdb/dist/LICENSE
index 49a0679..03cb600 100644
--- a/jena-sdb/dist/LICENSE
+++ b/jena-sdb/dist/LICENSE
@@ -178,9 +178,9 @@
The following files contain code contributed by Plugged In Software:
-src/main/java/com/hp/hpl/jena/rdf/arp/ExtendedHandler.java
-src/main/java/com/hp/hpl/jena/rdf/arp/impl/XMLHandler.java
-src/main/java/com/hp/hpl/jena/rdf/arp/ARP.java
+src/main/java/org/apache/jena/rdf/arp/ExtendedHandler.java
+src/main/java/org/apache/jena/rdf/arp/impl/XMLHandler.java
+src/main/java/org/apache/jena/rdf/arp/ARP.java
(c) Copyright 2003, Plugged In Software
@@ -244,3 +244,31 @@ Copyright (c) 2005 Brian Goetz and Tim Peierls.
See http://www.jcip.net and the Creative Commons Attribution License
(http://creativecommons.org/licenses/by/2.5)
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+Dexx Collections
+https://github.com/andrewoma/dexx
+BSD-Style License
+ https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
+
+Copyright (c) 2014 Andrew O'Malley
+
+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 the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED 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.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
http://git-wip-us.apache.org/repos/asf/jena/blob/ae352514/jena-sdb/dist/NOTICE
----------------------------------------------------------------------
diff --git a/jena-sdb/dist/NOTICE b/jena-sdb/dist/NOTICE
index f7f8f47..0a5a198 100644
--- a/jena-sdb/dist/NOTICE
+++ b/jena-sdb/dist/NOTICE
@@ -4,8 +4,11 @@ Copyright 2011, 2012, 2013, 2014, 2015, 2016 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed by
+PluggedIn Software and under a BSD license.
+
Portions of this software were originally based on the following:
- - Copyright 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
+ - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
- Copyright 2010, 2011 Epimorphics Ltd.
- Copyright 2010, 2011 Talis Systems Ltd.
These have been licensed to the Apache Software Foundation under a software grant.
@@ -40,3 +43,18 @@ http://slf4j.org/
Copyright (c) 2004-2008 QOS.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+Dexx Collections
+Copyright (c) 2014 Andrew O'Malley
+https://github.com/andrewoma/dexx
+BSD-Style License
+ https://github.com/andrewoma/dexx/blob/master/LICENSE.txt
+
+and includes the following NOTICE
+----------
+Portions based on code from the Scala standard library.
+Copyright (c) 2002-2014 EPFL
+Copyright (c) 2011-2014 Typesafe, Inc.
+Licensed under BSD-style license (see licenses/LICENSE_Scala.txt)
+----------
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=