Skip to content

Commit 64ac2cd

Browse files
CalvinKirsmartin-g
andauthored
AVRO-3936: Clean up NOTICE and LICENSE file (#3245)
* AVRO-3936: Clean up NOTICE and LICENSE file https://issues.apache.org/jira/browse/AVRO-1769 The implementation of Jansson has been removed. #307 The implementation of nunit.framework.dll,Newtonsoft.Json.dll and Castle.Core.dll has been removed. #2756 The implementation of m4 macros has been removed. 8a42cd0 Boost.hhThe implementation of Boost.hh has been removed. * Update copyright year in NOTICE.txt --------- Co-authored-by: Martin Grigorov <[email protected]>
1 parent a74d9b6 commit 64ac2cd

File tree

2 files changed

+1
-199
lines changed

2 files changed

+1
-199
lines changed

LICENSE.txt

Lines changed: 0 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -201,37 +201,6 @@
201201
See the License for the specific language governing permissions and
202202
limitations under the License.
203203

204-
----------------------------------------------------------------------
205-
License for the Jansson C JSON parser used in the C implementation:
206-
207-
Copyright (c) 2009-2011 Petri Lehtinen <[email protected]>
208-
209-
Some files include an additional copyright notice:
210-
* lang/c/jansson/src/pack_unpack.c
211-
Copyright (c) 2011 Graeme Smecher <[email protected]>
212-
* lang/c/jansson/test/suites/api/test_unpack.c
213-
Copyright (c) 2011 Graeme Smecher <[email protected]>
214-
* lang/c/jansson/src/memory.c
215-
Copyright (c) 2011 Basile Starynkevitch <[email protected]>
216-
217-
| Permission is hereby granted, free of charge, to any person obtaining a copy
218-
| of this software and associated documentation files (the "Software"), to deal
219-
| in the Software without restriction, including without limitation the rights
220-
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
221-
| copies of the Software, and to permit persons to whom the Software is
222-
| furnished to do so, subject to the following conditions:
223-
|
224-
| The above copyright notice and this permission notice shall be included in
225-
| all copies or substantial portions of the Software.
226-
|
227-
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
228-
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
229-
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
230-
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
231-
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
232-
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
233-
| THE SOFTWARE.
234-
235204
----------------------------------------------------------------------
236205
License for msinttypes.h and msstdint.h used in the C implementation:
237206
Source from:
@@ -295,145 +264,6 @@ Copyright (C) 2006 Toni Ronkko
295264
| ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
296265
| OTHER DEALINGS IN THE SOFTWARE.
297266

298-
----------------------------------------------------------------------
299-
License for NUnit binary included with the C# implementation:
300-
File: nunit.framework.dll
301-
302-
| NUnit License
303-
|
304-
| Copyright © 2002-2015 Charlie Poole
305-
| Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
306-
| Copyright © 2000-2002 Philip A. Craig
307-
|
308-
| This software is provided 'as-is', without any express or implied warranty. In
309-
| no event will the authors be held liable for any damages arising from the use
310-
| of this software.
311-
|
312-
| Permission is granted to anyone to use this software for any purpose, including
313-
| commercial applications, and to alter it and redistribute it freely, subject to
314-
| the following restrictions:
315-
|
316-
| The origin of this software must not be misrepresented; you must not claim that
317-
| you wrote the original software. If you use this software in a product, an
318-
| acknowledgment (see the following) in the product documentation is required.
319-
|
320-
| Portions Copyright © 2002-2012 Charlie Poole or Copyright © 2002-2004 James W.
321-
| Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A.
322-
| Craig
323-
|
324-
| Altered source versions must be plainly marked as such, and must not be
325-
| misrepresented as being the original software.
326-
|
327-
| This notice may not be removed or altered from any source distribution.
328-
| License Note
329-
|
330-
| This license is based on the open source zlib/libpng license. The idea was to
331-
| keep the license as simple as possible to encourage use of NUnit in free and
332-
| commercial applications and libraries, but to keep the source code together and
333-
| to give credit to the NUnit contributors for their efforts. While this license
334-
| allows shipping NUnit in source and binary form, if shipping a NUnit variant is
335-
| the sole purpose of your product, please let us know.
336-
337-
----------------------------------------------------------------------
338-
License for the Json.NET binary included with the C# implementation:
339-
File: Newtonsoft.Json.dll
340-
341-
Copyright (c) 2007 James Newton-King
342-
343-
| Permission is hereby granted, free of charge, to any person obtaining
344-
| a copy of this software and associated documentation files (the
345-
| "Software"), to deal in the Software without restriction, including
346-
| without limitation the rights to use, copy, modify, merge, publish,
347-
| distribute, sublicense, and/or sell copies of the Software, and to
348-
| permit persons to whom the Software is furnished to do so, subject to
349-
| the following conditions:
350-
|
351-
| The above copyright notice and this permission notice shall be
352-
| included in all copies or substantial portions of the Software.
353-
|
354-
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
355-
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
356-
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
357-
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
358-
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
359-
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
360-
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
361-
362-
----------------------------------------------------------------------
363-
License for the Castle Core binary included with the C# implementation:
364-
File: Castle.Core.dll
365-
366-
Copyright (c) 2004-2015 Castle Project
367-
368-
License: Apache License version 2.0 (see above)
369-
URL: https://opensource.org/licenses/Apache-2.0
370-
371-
----------------------------------------------------------------------
372-
License for the log4net binary included with the C# implementation:
373-
File: log4net.dll
374-
375-
Copyright 2004-2015 The Apache Software Foundation.
376-
377-
License: Apache License version 2.0 (see above)
378-
379-
----------------------------------------------------------------------
380-
License for the m4 macros used by the C++ implementation:
381-
382-
Files:
383-
* lang/c++/m4/m4_ax_boost_system.m4
384-
Copyright (c) 2008 Thomas Porschberg <[email protected]>
385-
Copyright (c) 2008 Michael Tindal
386-
Copyright (c) 2008 Daniel Casimiro <[email protected]>
387-
* lang/c++/m4/m4_ax_boost_asio.m4
388-
Copyright (c) 2008 Thomas Porschberg <[email protected]>
389-
Copyright (c) 2008 Pete Greenwell <[email protected]>
390-
* lang/c++/m4/m4_ax_boost_filesystem.m4
391-
Copyright (c) 2009 Thomas Porschberg <[email protected]>
392-
Copyright (c) 2009 Michael Tindal
393-
Copyright (c) 2009 Roman Rybalko <[email protected]>
394-
* lang/c++/m4/m4_ax_boost_thread.m4
395-
Copyright (c) 2009 Thomas Porschberg <[email protected]>
396-
Copyright (c) 2009 Michael Tindal
397-
* lang/c++/m4/m4_ax_boost_regex.m4
398-
Copyright (c) 2008 Thomas Porschberg <[email protected]>
399-
Copyright (c) 2008 Michael Tindal
400-
* lang/c++/m4/m4_ax_boost_base.m4
401-
Copyright (c) 2008 Thomas Porschberg <[email protected]>
402-
403-
License text:
404-
| Copying and distribution of this file, with or without modification, are
405-
| permitted in any medium without royalty provided the copyright notice
406-
| and this notice are preserved. This file is offered as-is, without any
407-
| warranty.
408-
409-
----------------------------------------------------------------------
410-
License for the AVRO_BOOT_NO_TRAIT code in the C++ implementation:
411-
File: lang/c++/api/Boost.hh
412-
413-
| Boost Software License - Version 1.0 - August 17th, 2003
414-
|
415-
| Permission is hereby granted, free of charge, to any person or organization
416-
| obtaining a copy of the software and accompanying documentation covered by
417-
| this license (the "Software") to use, reproduce, display, distribute,
418-
| execute, and transmit the Software, and to prepare derivative works of the
419-
| Software, and to permit third-parties to whom the Software is furnished to
420-
| do so, all subject to the following:
421-
|
422-
| The copyright notices in the Software and this entire statement, including
423-
| the above license grant, this restriction and the following disclaimer,
424-
| must be included in all copies of the Software, in whole or in part, and
425-
| all derivative works of the Software, unless such copies or derivative
426-
| works are solely in the form of machine-executable object code generated by
427-
| a source language processor.
428-
|
429-
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
430-
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
431-
| FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
432-
| SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
433-
| FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
434-
| ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
435-
| DEALINGS IN THE SOFTWARE.
436-
437267
----------------------------------------------------------------------
438268
License for jquery.tipsy.js, tipsy.js, and tipsy.css used by the Java IPC implementation:
439269

NOTICE.txt

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,9 @@
11
Apache Avro
2-
Copyright 2010-2019 The Apache Software Foundation
2+
Copyright 2010-2025 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (https://www.apache.org/).
66

7-
NUnit license acknowledgement:
8-
9-
| Portions Copyright © 2002-2012 Charlie Poole or Copyright © 2002-2004 James
10-
| W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002
11-
| Philip A. Craig
12-
13-
Based upon the representations of upstream licensors, it is understood that
14-
portions of the mapreduce API included in the Java implementation are licensed
15-
from various contributors under one or more contributor license agreements to
16-
Odiago, Inc. and were then contributed by Odiago to Apache Avro, which has now
17-
made them available under the Apache 2.0 license. The original file header text
18-
is:
19-
20-
| Licensed to Odiago, Inc. under one or more contributor license
21-
| agreements. See the NOTICE file distributed with this work for
22-
| additional information regarding copyright ownership. Odiago, Inc.
23-
| licenses this file to you under the Apache License, Version 2.0
24-
| (the "License"); you may not use this file except in compliance
25-
| with the License. You may obtain a copy of the License at
26-
|
27-
| https://www.apache.org/licenses/LICENSE-2.0
28-
|
29-
| Unless required by applicable law or agreed to in writing, software
30-
| distributed under the License is distributed on an "AS IS" BASIS,
31-
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
32-
| implied. See the License for the specific language governing
33-
| permissions and limitations under the License.
34-
357
The Odiago NOTICE at the time of the contribution:
368

379
| This product includes software developed by Odiago, Inc.

0 commit comments

Comments
 (0)