From 7e27d2c1131d4c7690079bbc1c670e86443cc832 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Sun, 28 Mar 2021 14:54:29 +0200 Subject: [PATCH 1/3] Add NOTICE file (cherry picked from commit 12eb3e6e1540f8fb7e833b7fc654823da96caa7a) --- NOTICE.txt | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 NOTICE.txt diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 00000000000..d5efad53233 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,31 @@ +Elasticsearch .NET clients +Copyright 2012-2018 Elasticsearch B.V. + +========== +Notice for: Utf8Json +---------- +Based on the Utf8Json project by Yoshifumi Kawai, +licensed under the MIT license. https://github.com/neuecc/Utf8Json/ + +MIT License + +Copyright (c) 2017 Yoshifumi Kawai + +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. + From ab0d1d2792c6684da5a038f9bc8834a99aa6a7f0 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Sun, 28 Mar 2021 15:01:43 +0200 Subject: [PATCH 2/3] Include recyclable memorystream in notice for 7.x --- NOTICE.txt | 28 +++++++++++++++++++ .../Providers/RecyclableMemoryStream.cs | 4 --- .../RecyclableMemoryStreamManager-Events.cs | 4 --- .../RecyclableMemoryStreamManager.cs | 4 --- 4 files changed, 28 insertions(+), 12 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index d5efad53233..7473de65118 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -29,3 +29,31 @@ 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. +========== +Notice for: Microsoft.IO.RecyclableMemoryStream +---------- +Based on the Microsoft.IO.RecyclableMemoryStream project by Microsoft, +licensed under the MIT license. https://github.com/Microsoft/Microsoft.IO.RecyclableMemoryStream/ + +MIT License + +Copyright (c) 2015-2016 Microsoft + +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. + diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs index 54e5fdbb71c..48453cac0ec 100644 --- a/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs +++ b/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs @@ -1,7 +1,3 @@ -// Licensed to Elasticsearch B.V under one or more agreements. -// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information - // The MIT License (MIT) // // Copyright (c) 2015-2016 Microsoft diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs index 087a14f2990..5f50be98777 100644 --- a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs +++ b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs @@ -1,7 +1,3 @@ -// Licensed to Elasticsearch B.V under one or more agreements. -// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information - // --------------------------------------------------------------------- // Copyright (c) 2015 Microsoft // diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs index abc8ab40664..291c933e182 100644 --- a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs +++ b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs @@ -1,7 +1,3 @@ -// Licensed to Elasticsearch B.V under one or more agreements. -// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information - // --------------------------------------------------------------------- // Copyright (c) 2015-2016 Microsoft // From 575ba83bc588d849dee55934606cec68d9af7a80 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 20 Apr 2021 10:56:37 +0100 Subject: [PATCH 3/3] Update with PR feedback --- NOTICE.txt | 2 +- src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs | 4 ++++ .../Providers/RecyclableMemoryStreamManager-Events.cs | 4 ++++ .../Providers/RecyclableMemoryStreamManager.cs | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index 7473de65118..0764328bb67 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Elasticsearch .NET clients -Copyright 2012-2018 Elasticsearch B.V. +Copyright 2012-2021 Elasticsearch B.V. ========== Notice for: Utf8Json diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs index 48453cac0ec..54e5fdbb71c 100644 --- a/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs +++ b/src/Elasticsearch.Net/Providers/RecyclableMemoryStream.cs @@ -1,3 +1,7 @@ +// Licensed to Elasticsearch B.V under one or more agreements. +// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information + // The MIT License (MIT) // // Copyright (c) 2015-2016 Microsoft diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs index 5f50be98777..087a14f2990 100644 --- a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs +++ b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs @@ -1,3 +1,7 @@ +// Licensed to Elasticsearch B.V under one or more agreements. +// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information + // --------------------------------------------------------------------- // Copyright (c) 2015 Microsoft // diff --git a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs index 291c933e182..abc8ab40664 100644 --- a/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs +++ b/src/Elasticsearch.Net/Providers/RecyclableMemoryStreamManager.cs @@ -1,3 +1,7 @@ +// Licensed to Elasticsearch B.V under one or more agreements. +// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information + // --------------------------------------------------------------------- // Copyright (c) 2015-2016 Microsoft //