This is an automated email from the git hooks/post-receive script. afif-guest pushed a commit to branch master in repository python-avro.
commit 175f78d244ed72a7eb00ff146fda8a0f80021a01 Author: Afif Elghraoui <[email protected]> Date: Tue Feb 2 23:07:11 2016 -0800 Imported Upstream version 1.8.0+dfsg --- CHANGES.txt | 44 +++++- LICENSE.txt | 152 ------------------- build.sh | 7 +- doc/LICENSE | 330 +++++++++++++++++++++++++++++++++++++++++ doc/NOTICE | 83 +++++++++++ doc/src/content/xdocs/spec.xml | 6 +- lang/py3/setup.py | 6 - share/docker/Dockerfile | 2 +- 8 files changed, 467 insertions(+), 163 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index a43559b..0d27f60 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,7 @@ Avro Change Log -Avro 1.8.0 (15 December 2015) +Avro 1.8.0 (22 January 2016) INCOMPATIBLE CHANGES @@ -65,6 +65,9 @@ Avro 1.8.0 (15 December 2015) OPTIMIZATIONS + AVRO-1760. Java: Thread scalability problem with the use of SynchronizedMap + (tomwhite) + IMPROVEMENTS AVRO-843. C#: Change Visual Studio project files to specify .NET 3.5. @@ -227,6 +230,45 @@ Avro 1.8.0 (15 December 2015) AVRO-1728: Java: Add LICENSE and NOTICE files to jars. (blue) + AVRO-1572: C: Fix EOF handling on data files that are multiples of + 4096 bytes. (Ben Walsh via martinkl) + + AVRO-1617: C: Fix equality checking of record schemas. (Skye + Wanderman-Milne via martinkl) + + AVRO-1560: C: Fix build for custom libsnappy location. (Ujjwal via martinkl) + + AVRO-1770. Python 3 overwrites custom README.txt (blue via tomwhite) + + AVRO-1771. Add LICENSE and NOTICE to avro-doc artifact. (blue via tomwhite) + + AVRO-1772. Ruby: load error in rubygem when loading schema normalization. + (blue and martinkl via tomwhite) + + AVRO-1725. Docs: clarify restrictions on enum symbols. (martinkl) + + AVRO-1779. Avro docs convenience artifact missing LICENSE/NOTICE. + (blue via tomwhite) + + AVRO-1781. Java: Fix Schema.parse thread safety bug introduced by logical + types. (blue) + + AVRO-1782. Ruby: Fix unit test failures in new versions of Ruby. (martinkl) + + AVRO-1769. C: Use operating system's libjansson instead of bundling + it with Avro. (Magnus Edenhill via martinkl) + + AVRO-1691. C: Allow schemas consisting only of a primitive type. + (Magnus Edenhill via martinkl) + + AVRO-1663. C: Fix handling of namespaces for enum and fixed types. + (martinkl) + + AVRO-1775. Ruby: Use test-unit gem for running tests. (martinkl) + + AVRO-1783. Ruby: Ensure correct binary encoding for byte strings. + (martinkl) + Avro 1.7.7 (23 July 2014) NEW FEATURES diff --git a/LICENSE.txt b/LICENSE.txt index d4444cd..acd07f2 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -233,158 +233,6 @@ Some files include an additional copyright notice: | THE SOFTWARE. ---------------------------------------------------------------------- -License for the libtool scripts used in the Jansson C JSON parser: - -libtool (GNU libtool) 2.2.10 -Written by Gordon Matzigkeit <[email protected]>, 1996 - -Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -2007, 2008, 2009, 2010 Free Software Foundation, Inc. - -Included under the terms of the Apache License version 2.0. - -| GNU Libtool is free software; you can redistribute it and/or modify -| it under the terms of the GNU General Public License as published by -| the Free Software Foundation; either version 2 of the License, or -| (at your option) any later version. -| -| As a special exception to the GNU General Public License, -| if you distribute this file as part of a program or library that -| is built using GNU Libtool, you may include this file under the -| same distribution terms that you use for the rest of that program. -| -| GNU Libtool is distributed in the hope that it will be useful, but -| WITHOUT ANY WARRANTY; without even the implied warranty of -| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -| General Public License for more details. -| -| You should have received a copy of the GNU General Public License -| along with GNU Libtool; see the file COPYING. If not, a copy -| can be downloaded from http://www.gnu.org/licenses/gpl.html, -| or obtained by writing to the Free Software Foundation, Inc., -| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ----------------------------------------------------------------------- -License for the configure script used in the Jansson C JSON parser: - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -Foundation, Inc. - -| This configure script is free software; the Free Software Foundation -| gives unlimited permission to copy, distribute and modify it. - -Portions of the configure script are from libtool (see above) and are -included under the terms of the Apache License version 2.0. - ----------------------------------------------------------------------- -License for the install-sh script used in the Jansson C JSON parser: - -Copyright (C) 1994 X Consortium - -| This originates from X11R5 (mit/util/scripts/install.sh), which was -| later released in X11R6 (xc/config/util/install.sh) with the -| following copyright and license. -| -| 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 -| X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -| AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -| TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -| -| Except as contained in this notice, the name of the X Consortium shall not -| be used in advertising or otherwise to promote the sale, use or other deal- -| ings in this Software without prior written authorization from the X Consor- -| tium. -| -| FSF changes to this file are in the public domain. - ----------------------------------------------------------------------- -License for the aclocal.m4 script used in the Jansson C JSON parser: - -Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - -| This file is free software; the Free Software Foundation -| gives unlimited permission to copy and/or distribute it, -| with or without modifications, as long as this notice is preserved. -| -| This program is distributed in the hope that it will be useful, -| but WITHOUT ANY WARRANTY, to the extent permitted by law; without -| even the implied warranty of MERCHANTABILITY or FITNESS FOR A -| PARTICULAR PURPOSE. - -Portions of the aclocal.m4 file are from libtool (see above) and are -included under the terms of the Apache License version 2.0. - ----------------------------------------------------------------------- -License for build scripts used in the Jansson C JSON parser: - -* config.guess - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -* missing - Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - Originally by Fran,cois Pinard <[email protected]>, 1996. -* config.sub - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, - Inc. -* depcomp - Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software - Foundation, Inc. - Originally written by Alexandre Oliva <[email protected]>. - -Included under the terms of the Apache License version 2.0. - -| This file is free software; you can redistribute it and/or modify it -| under the terms of the GNU General Public License as published by -| the Free Software Foundation; either version 2 of the License, or -| (at your option) any later version. -| -| This program is distributed in the hope that it will be useful, but -| WITHOUT ANY WARRANTY; without even the implied warranty of -| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -| General Public License for more details. -| -| You should have received a copy of the GNU General Public License -| along with this program; if not, write to the Free Software -| Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -| 02110-1301, USA. -| -| As a special exception to the GNU General Public License, if you -| distribute this file as part of a program that contains a -| configuration script generated by Autoconf, you may include it under -| the same distribution terms that you use for the rest of that program. - ----------------------------------------------------------------------- -License for Makefile.in files used in the Jansson C JSON parser: - -Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -2003, 2004, 2005, 2006 Free Software Foundation, Inc. - -| This Makefile.in is free software; the Free Software Foundation -| gives unlimited permission to copy and/or distribute it, -| with or without modifications, as long as this notice is preserved. -| -| This program is distributed in the hope that it will be useful, -| but WITHOUT ANY WARRANTY, to the extent permitted by law; without -| even the implied warranty of MERCHANTABILITY or FITNESS FOR A -| PARTICULAR PURPOSE. - ----------------------------------------------------------------------- License for msinttypes.h and msstdint.h used in the C implementation: Source from: http://code.google.com/p/msinttypes/downloads/detail?name=msinttypes-r26.zip diff --git a/build.sh b/build.sh index abfb7be..1758b84 100755 --- a/build.sh +++ b/build.sh @@ -84,6 +84,7 @@ case "$target" in mkdir -p build SRC_DIR=avro-src-$VERSION + DOC_DIR=avro-doc-$VERSION rm -rf build/${SRC_DIR} svn export --force . build/${SRC_DIR} @@ -124,7 +125,11 @@ case "$target" in # build docs (cd doc; ant) - (cd build; tar czf ../dist/avro-doc-$VERSION.tar.gz avro-doc-$VERSION) + # add LICENSE and NOTICE for docs + mkdir -p build/$DOC_DIR + cp doc/LICENSE build/$DOC_DIR + cp doc/NOTICE build/$DOC_DIR + (cd build; tar czf ../dist/avro-doc-$VERSION.tar.gz $DOC_DIR) cp DIST_README.txt dist/README.txt ;; diff --git a/doc/LICENSE b/doc/LICENSE new file mode 100644 index 0000000..d8e7294 --- /dev/null +++ b/doc/LICENSE @@ -0,0 +1,330 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +---------------------------------------------------------------------- +License for the AVRO_BOOT_NO_TRAIT code in the C++ implementation: +File: lang/c++/api/Boost.hh + +| Boost Software License - Version 1.0 - August 17th, 2003 +| +| Permission is hereby granted, free of charge, to any person or organization +| obtaining a copy of the software and accompanying documentation covered by +| this license (the "Software") to use, reproduce, display, distribute, +| execute, and transmit the Software, and to prepare derivative works of the +| Software, and to permit third-parties to whom the Software is furnished to +| do so, all subject to the following: +| +| The copyright notices in the Software and this entire statement, including +| the above license grant, this restriction and the following disclaimer, +| must be included in all copies of the Software, in whole or in part, and +| all derivative works of the Software, unless such copies or derivative +| works are solely in the form of machine-executable object code generated by +| a source language processor. +| +| 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT +| SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +| FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +| ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +| DEALINGS IN THE SOFTWARE. + +---------------------------------------------------------------------- +License for jQuery v1.7.1 used in the C# documentation + +Copyright 2010-2011, John Resig +Dual licensed under the MIT or GPL Version 2 licenses. +http://jquery.org/license + +jQuery includes Sizzle.js +http://sizzlejs.com/ +Copyright 2010-2011, The Dojo Foundation +Released under the MIT, BSD, and GPL Licenses. + +Both are included under the terms of the MIT license: + +| 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. + +---------------------------------------------------------------------- +License for portions of idl.jj in the Java compiler implementation: + +Portions of idl.jj were modeled after the example Java 1.5 +parser included with JavaCC. For those portions: + +Copyright (c) 2006, Sun Microsystems, Inc. +All rights reserved. + +| Redistribution and use in source and binary forms, with or without +| modification, are permitted provided that the following conditions are met: +| +| * Redistributions of source code must retain the above copyright notice, +| this list of conditions and the following disclaimer. +| * Redistributions in binary form must reproduce the above copyright +| notice, this list of conditions and the following disclaimer in the +| documentation and/or other materials provided with the distribution. +| * Neither the name of the Sun Microsystems, Inc. nor the names of its +| contributors may be used to endorse or promote products derived from +| this software without specific prior written permission. +| +| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +| ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +| LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +| CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +| SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +| INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +| CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +| ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +| THE POSSIBILITY OF SUCH DAMAGE. + +---------------------------------------------------------------------- +License for prototype.js included in the Avro documentation: + +Prototype JavaScript framework, version 1.4.0_pre4 +(c) 2005 Sam Stephenson <[email protected]> + +| Prototype is freely distributable under the terms of an MIT-style license. +| +| For details, see the Prototype web site: http://prototype.conio.net/ + +For a copy of the MIT license text, see above. + +---------------------------------------------------------------------- +License for Apache Forrest (skin), included in the Avro documentation: + +Copyright: 2009-2015 The Apache Software Foundation +License: http://www.apache.org/licenses/LICENSE-2.0 (see above) + +---------------------------------------------------------------------- +License for Doxygen-generated documentation for the C++ and C# implementations: + +Copyright © 1997-2015 by Dimitri van Heesch. + +| Doxygen license +| +| Permission to use, copy, modify, and distribute this software and its +| documentation under the terms of the GNU General Public License is hereby +| granted. No representations are made about the suitability of this software for +| any purpose. It is provided "as is" without express or implied warranty. See +| the GNU General Public License for more details. +| +| Documents produced by doxygen are derivative works derived from the input +| used in their production; they are not affected by this license. + diff --git a/doc/NOTICE b/doc/NOTICE new file mode 100644 index 0000000..8f118a0 --- /dev/null +++ b/doc/NOTICE @@ -0,0 +1,83 @@ +Apache Avro +Copyright 2010-2015 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +Based upon the representations of upstream licensors, it is understood that +portions of the mapreduce API included in the Java implementation are licensed +from various contributors under one or more contributor license agreements to +Odiago, Inc. and were then contributed by Odiago to Apache Avro, which has now +made them available under the Apache 2.0 license. The original file header text +is: + +| Licensed to Odiago, Inc. under one or more contributor license +| agreements. See the NOTICE file distributed with this work for +| additional information regarding copyright ownership. Odiago, Inc. +| licenses this file to you under the Apache License, Version 2.0 +| (the "License"); you may not use this file except in compliance +| with the License. You may obtain a copy of the License at +| +| http://www.apache.org/licenses/LICENSE-2.0 +| +| Unless required by applicable law or agreed to in writing, software +| distributed under the License is distributed on an "AS IS" BASIS, +| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +| implied. See the License for the specific language governing +| permissions and limitations under the License. + +The Odiago NOTICE at the time of the contribution: + +| This product includes software developed by Odiago, Inc. +| (http://www.wibidata.com). + +The documentation contains the default Apache Forrest skin. +Apache Forrest includes the following in its NOTICE file: + +| Apache Forrest +| Copyright 2002-2007 The Apache Software Foundation. +| +| This product includes software developed at +| The Apache Software Foundation (http://www.apache.org/). +| +| See also the file LICENSE.txt +| +| ------------------------------------------------------------------------ +| The purpose of this NOTICE.txt file is to contain notices that are +| required by the copyright owner and their license. Some of the +| accompanying products have an attribution requirement, so see below. +| Other accompanying products do not require attribution, so are not listed. +| +| ------------------------------------------------------------------------ +| This product includes software developed by the OpenSymphony Group +| http://www.opensymphony.com/ +| +| This product includes software developed for project Krysalis +| http://www.krysalis.org/ +| +| This product includes software developed by Andy Clark. +| http://people.apache.org/~andyc/neko/ +| +| This product includes software developed by the ExoLab Project +| http://www.exolab.org/ +| +| This product includes software developed by TouchGraph LLC +| http://www.touchgraph.com/ +| +| This product includes software developed by Marc De Scheemaecker +| http://nanoxml.cyberelf.be/ +| +| This product includes software developed by the ANTLR project +| http://www.antlr.org/ +| +| This product includes software developed by Chaperon +| http://chaperon.sourceforge.net/ +| +| This product includes software developed by Sal Mangano (included in the XSLT Cookbook published by O'Reilly) +| http://www.oreilly.com/catalog/xsltckbk/ +| +| This product includes software developed by The Werken Company. +| http://jaxen.werken.com/ +| +| This product includes software developed by the jfor project +| http://www.jfor.org/ diff --git a/doc/src/content/xdocs/spec.xml b/doc/src/content/xdocs/spec.xml index 83c0420..1e6f4e3 100644 --- a/doc/src/content/xdocs/spec.xml +++ b/doc/src/content/xdocs/spec.xml @@ -171,7 +171,9 @@ user of this schema (optional).</li> <li><code>symbols</code>: a JSON array, listing symbols, as JSON strings (required). All symbols in an enum must - be unique; duplicates are prohibited.</li> + be unique; duplicates are prohibited. Every symbol must + match the regular expression <code>[A-Za-z_][A-Za-z0-9_]*</code> + (the same requirement as for <a href="#names">names</a>).</li> </ul> <p>For example, playing card suits might be defined with:</p> <source> @@ -246,7 +248,7 @@ </section> <!-- end complex types --> - <section> + <section id="names"> <title>Names</title> <p>Record, enums and fixed are named types. Each has a <em>fullname</em> that is composed of two parts; diff --git a/lang/py3/setup.py b/lang/py3/setup.py index 3673f11..38f7117 100644 --- a/lang/py3/setup.py +++ b/lang/py3/setup.py @@ -59,12 +59,6 @@ def SetupSources(): # Avro top-level source directory: root_dir = os.path.dirname(os.path.dirname(py3_dir)) - # Copy README.txt from Avro top-level directory: - shutil.copy( - src=os.path.join(root_dir, 'README.txt'), - dst=os.path.join(py3_dir, 'README.txt'), - ) - # Read and copy Avro version: version_file_path = os.path.join(root_dir, 'share', VERSION_FILE_NAME) with open(version_file_path, 'r') as f: diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile index aa82a45..0176055 100644 --- a/share/docker/Dockerfile +++ b/share/docker/Dockerfile @@ -27,7 +27,7 @@ RUN curl -sL https://deb.nodesource.com/setup_4.x | bash - # Install dependencies from packages RUN apt-get update && apt-get install --no-install-recommends -y \ git subversion curl ant make maven \ - gcc cmake asciidoc source-highlight \ + gcc cmake libjansson-dev asciidoc source-highlight \ g++ flex bison libboost-all-dev doxygen \ mono-devel mono-gmcs nunit \ nodejs \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-avro.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
