From 4053591a3da260cb43b5ab9e616178f0cde921e6 Mon Sep 17 00:00:00 2001 From: JinmingHu Date: Mon, 28 Mar 2022 11:22:17 +0800 Subject: [PATCH] remove amalgamate form CGManifest (#3467) * remove amalgamate form CGManifest * update NOTICE.txt --- sdk/storage/azure-storage-blobs/NOTICE.txt | 31 ------------------- .../azure-storage-blobs/cgmanifest.json | 10 ------ sdk/storage/azure-storage-common/NOTICE.txt | 31 ------------------- .../azure-storage-common/cgmanifest.json | 10 ------ .../azure-storage-files-datalake/NOTICE.txt | 31 ------------------- .../cgmanifest.json | 10 ------ .../azure-storage-files-shares/NOTICE.txt | 31 ------------------- .../cgmanifest.json | 10 ------ sdk/storage/azure-storage-queues/NOTICE.txt | 31 ------------------- .../azure-storage-queues/cgmanifest.json | 10 ------ 10 files changed, 205 deletions(-) diff --git a/sdk/storage/azure-storage-blobs/NOTICE.txt b/sdk/storage/azure-storage-blobs/NOTICE.txt index 9d4d07586..de6b8d8b7 100644 --- a/sdk/storage/azure-storage-blobs/NOTICE.txt +++ b/sdk/storage/azure-storage-blobs/NOTICE.txt @@ -394,37 +394,6 @@ 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 notice for amalgamate -------------------------------------------------------------------- - -amalgamate.py - Amalgamate C source and header files -Copyright (c) 2012, Erik Edlund - -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 Erik Edlund, 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 notice for cpplint ------------------------------------------------------------------- diff --git a/sdk/storage/azure-storage-blobs/cgmanifest.json b/sdk/storage/azure-storage-blobs/cgmanifest.json index 9cd1bceeb..728e7b708 100644 --- a/sdk/storage/azure-storage-blobs/cgmanifest.json +++ b/sdk/storage/azure-storage-blobs/cgmanifest.json @@ -10,16 +10,6 @@ }, "DevelopmentDependency": true }, - { - "Component": { - "Type": "git", - "git": { - "RepositoryUrl": "https://github.com/edlund/amalgamate", - "CommitHash": "c91f07eea1133aa184f652b8f1398eaf03586208" - } - }, - "DevelopmentDependency": true - }, { "Component": { "Type": "other", diff --git a/sdk/storage/azure-storage-common/NOTICE.txt b/sdk/storage/azure-storage-common/NOTICE.txt index cfbf4460d..b64b1e878 100644 --- a/sdk/storage/azure-storage-common/NOTICE.txt +++ b/sdk/storage/azure-storage-common/NOTICE.txt @@ -394,37 +394,6 @@ 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 notice for amalgamate -------------------------------------------------------------------- - -amalgamate.py - Amalgamate C source and header files -Copyright (c) 2012, Erik Edlund - -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 Erik Edlund, 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 notice for cpplint ------------------------------------------------------------------- diff --git a/sdk/storage/azure-storage-common/cgmanifest.json b/sdk/storage/azure-storage-common/cgmanifest.json index 55ae810b3..568ceec41 100644 --- a/sdk/storage/azure-storage-common/cgmanifest.json +++ b/sdk/storage/azure-storage-common/cgmanifest.json @@ -20,16 +20,6 @@ }, "DevelopmentDependency": true }, - { - "Component": { - "Type": "git", - "git": { - "RepositoryUrl": "https://github.com/edlund/amalgamate", - "CommitHash": "c91f07eea1133aa184f652b8f1398eaf03586208" - } - }, - "DevelopmentDependency": true - }, { "Component": { "Type": "other", diff --git a/sdk/storage/azure-storage-files-datalake/NOTICE.txt b/sdk/storage/azure-storage-files-datalake/NOTICE.txt index 1e85b5ec9..3823c96af 100644 --- a/sdk/storage/azure-storage-files-datalake/NOTICE.txt +++ b/sdk/storage/azure-storage-files-datalake/NOTICE.txt @@ -394,37 +394,6 @@ 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 notice for amalgamate -------------------------------------------------------------------- - -amalgamate.py - Amalgamate C source and header files -Copyright (c) 2012, Erik Edlund - -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 Erik Edlund, 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 notice for cpplint ------------------------------------------------------------------- diff --git a/sdk/storage/azure-storage-files-datalake/cgmanifest.json b/sdk/storage/azure-storage-files-datalake/cgmanifest.json index 9cd1bceeb..728e7b708 100644 --- a/sdk/storage/azure-storage-files-datalake/cgmanifest.json +++ b/sdk/storage/azure-storage-files-datalake/cgmanifest.json @@ -10,16 +10,6 @@ }, "DevelopmentDependency": true }, - { - "Component": { - "Type": "git", - "git": { - "RepositoryUrl": "https://github.com/edlund/amalgamate", - "CommitHash": "c91f07eea1133aa184f652b8f1398eaf03586208" - } - }, - "DevelopmentDependency": true - }, { "Component": { "Type": "other", diff --git a/sdk/storage/azure-storage-files-shares/NOTICE.txt b/sdk/storage/azure-storage-files-shares/NOTICE.txt index cdbf81208..db0f37d7b 100644 --- a/sdk/storage/azure-storage-files-shares/NOTICE.txt +++ b/sdk/storage/azure-storage-files-shares/NOTICE.txt @@ -394,37 +394,6 @@ 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 notice for amalgamate -------------------------------------------------------------------- - -amalgamate.py - Amalgamate C source and header files -Copyright (c) 2012, Erik Edlund - -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 Erik Edlund, 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 notice for cpplint ------------------------------------------------------------------- diff --git a/sdk/storage/azure-storage-files-shares/cgmanifest.json b/sdk/storage/azure-storage-files-shares/cgmanifest.json index 9cd1bceeb..728e7b708 100644 --- a/sdk/storage/azure-storage-files-shares/cgmanifest.json +++ b/sdk/storage/azure-storage-files-shares/cgmanifest.json @@ -10,16 +10,6 @@ }, "DevelopmentDependency": true }, - { - "Component": { - "Type": "git", - "git": { - "RepositoryUrl": "https://github.com/edlund/amalgamate", - "CommitHash": "c91f07eea1133aa184f652b8f1398eaf03586208" - } - }, - "DevelopmentDependency": true - }, { "Component": { "Type": "other", diff --git a/sdk/storage/azure-storage-queues/NOTICE.txt b/sdk/storage/azure-storage-queues/NOTICE.txt index d144a9090..c811165f7 100644 --- a/sdk/storage/azure-storage-queues/NOTICE.txt +++ b/sdk/storage/azure-storage-queues/NOTICE.txt @@ -394,37 +394,6 @@ 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 notice for amalgamate -------------------------------------------------------------------- - -amalgamate.py - Amalgamate C source and header files -Copyright (c) 2012, Erik Edlund - -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 Erik Edlund, 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 notice for cpplint ------------------------------------------------------------------- diff --git a/sdk/storage/azure-storage-queues/cgmanifest.json b/sdk/storage/azure-storage-queues/cgmanifest.json index 9cd1bceeb..728e7b708 100644 --- a/sdk/storage/azure-storage-queues/cgmanifest.json +++ b/sdk/storage/azure-storage-queues/cgmanifest.json @@ -10,16 +10,6 @@ }, "DevelopmentDependency": true }, - { - "Component": { - "Type": "git", - "git": { - "RepositoryUrl": "https://github.com/edlund/amalgamate", - "CommitHash": "c91f07eea1133aa184f652b8f1398eaf03586208" - } - }, - "DevelopmentDependency": true - }, { "Component": { "Type": "other",