You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/05/25 22:52:20 UTC
svn commit: r1342809 - in /jena/trunk: apache-jena/LICENSE
apache-jena/NOTICE jena-fuseki/dist/LICENSE-dist jena-fuseki/dist/NOTICE-dist
Author: andy
Date: Fri May 25 20:52:19 2012
New Revision: 1342809
URL: http://svn.apache.org/viewvc?rev=1342809&view=rev
Log:
Removal of text about ICU (and so the Unicode Consortium)
Modified:
jena/trunk/apache-jena/LICENSE
jena/trunk/apache-jena/NOTICE
jena/trunk/jena-fuseki/dist/LICENSE-dist
jena/trunk/jena-fuseki/dist/NOTICE-dist
Modified: jena/trunk/apache-jena/LICENSE
URL: http://svn.apache.org/viewvc/jena/trunk/apache-jena/LICENSE?rev=1342809&r1=1342808&r2=1342809&view=diff
==============================================================================
--- jena/trunk/apache-jena/LICENSE (original)
+++ jena/trunk/apache-jena/LICENSE Fri May 25 20:52:19 2012
@@ -244,90 +244,3 @@ Copyright (c) 2005 Brian Goetz and Tim P
See http://www.jcip.net and the Creative Commons Attribution License
(http://creativecommons.org/licenses/by/2.5)
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-ICU License - ICU 1.8.1 and later
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 1995-2011 International Business Machines Corporation and others
-
-All rights reserved.
-
-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, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, provided that the above copyright notice(s) and this
-permission notice appear in all copies of the Software and that both the
-above copyright notice(s) and this permission notice appear in supporting
-documentation.
-
-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 OF THIRD PARTY
-RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL 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.
-
-Except as contained in this notice, the name of a copyright holder shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization of the
-copyright holder.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
- Unicode Data Files include all data files under the directories
-http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
-http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF
-online code charts under the directory http://www.unicode.org/Public/.
-Software includes any source code published in the Unicode Standard or under
-the directories http://www.unicode.org/Public/,
-http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.
-
- NOTICE TO USER: Carefully read the following legal agreement. BY
-DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES
-("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND
-AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF
-YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA
-FILES OR SOFTWARE.
-
- COPYRIGHT AND PERMISSION NOTICE
-
- Copyright © 1991-2011 Unicode, Inc. All rights reserved. Distributed under
-the Terms of Use in http://www.unicode.org/copyright.html.
-
- Permission is hereby granted, free of charge, to any person obtaining a
-copy of the Unicode data files and any associated documentation (the "Data
-Files") or Unicode software and any associated documentation (the "Software")
-to deal in the Data Files or Software without restriction, including without
-limitation the rights to use, copy, modify, merge, publish, distribute, and/or
-sell copies of the Data Files or Software, and to permit persons to whom the
-Data Files or Software are furnished to do so, provided that (a) the above
-copyright notice(s) and this permission notice appear with all copies of the
-Data Files or Software, (b) both the above copyright notice(s) and this
-permission notice appear in associated documentation, and (c) there is clear
-notice in each modified Data File or in the Software as well as in the
-documentation associated with the Data File(s) or Software that the data or
-software has been modified.
-
- THE DATA FILES AND SOFTWARE ARE 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 OF THIRD
-PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
-THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL 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 THE
-DATA FILES OR SOFTWARE.
-
- Except as contained in this notice, the name of a copyright holder shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in these Data Files or Software without prior written authorization
-of the copyright holder.
Modified: jena/trunk/apache-jena/NOTICE
URL: http://svn.apache.org/viewvc/jena/trunk/apache-jena/NOTICE?rev=1342809&r1=1342808&r2=1342809&view=diff
==============================================================================
--- jena/trunk/apache-jena/NOTICE (original)
+++ jena/trunk/apache-jena/NOTICE Fri May 25 20:52:19 2012
@@ -37,12 +37,6 @@ Copyright (c) 2005 Brian Goetz and Tim P
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-For ICU4J:
- Copyright (c) 1995-2011 International Business Machines Corporation and others
- Copyright © 1991-2011 Unicode, Inc.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
Simple Logging Facade for Java (SLF4J)
http://slf4j.org/
Modified: jena/trunk/jena-fuseki/dist/LICENSE-dist
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/dist/LICENSE-dist?rev=1342809&r1=1342808&r2=1342809&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/dist/LICENSE-dist (original)
+++ jena/trunk/jena-fuseki/dist/LICENSE-dist Fri May 25 20:52:19 2012
@@ -230,41 +230,6 @@ http://www.slf4j.org/license.html
- - - - - - - - - - - - - - - - - - - - - - -
-ICU License - ICU 1.8.1 and later
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 1995-2011 International Business Machines Corporation and others
-
-All rights reserved.
-
-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, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, provided that the above copyright notice(s) and this
-permission notice appear in all copies of the Software and that both the
-above copyright notice(s) and this permission notice appear in supporting
-documentation.
-
-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 OF THIRD PARTY
-RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL 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.
-
-Except as contained in this notice, the name of a copyright holder shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization of the
-copyright holder.
-
-- - - - - - - - - - - - - - - - - - - - - - -
-
==============================================================
Jetty Web Container
Copyright 1995-2012 Mort Bay Consulting Pty Ltd.
Modified: jena/trunk/jena-fuseki/dist/NOTICE-dist
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/dist/NOTICE-dist?rev=1342809&r1=1342808&r2=1342809&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/dist/NOTICE-dist (original)
+++ jena/trunk/jena-fuseki/dist/NOTICE-dist Fri May 25 20:52:19 2012
@@ -18,14 +18,6 @@ slf4j:
- - - - - - - - - - - - - - - - - - - - - - -
-ICU License - ICU 1.8.1 and later
-
-Copyright (c) 1995-2011 International Business Machines Corporation and others
-
-All rights reserved.
-
-- - - - - - - - - - - - - - - - - - - - - - -
-
(c) Copyright 2003, Plugged In Software
This product includes software developed by
PluggedIn Software under a BSD license.