diff options
author | John Westcott IV <32551173+john-westcott-iv@users.noreply.github.com> | 2022-05-12 15:25:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-12 15:25:36 +0200 |
commit | 78660ad0a22798ace9210b37ba5be9429603e49d (patch) | |
tree | c57ca6c06e9b2dd38e1bfe4fcfefc81fd8e8683b /docs | |
parent | Merge pull request #12220 from kialam/add-popover-detail-job-templates (diff) | |
download | awx-78660ad0a22798ace9210b37ba5be9429603e49d.tar.xz awx-78660ad0a22798ace9210b37ba5be9429603e49d.zip |
Updated dependencies to reduce issues with dependabot and container scanning (#12180)
Modify updater.sh to remove the local path references.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/licenses/dictdiffer.txt | 28 | ||||
-rw-r--r-- | docs/licenses/pyhamcrest.txt | 27 | ||||
-rw-r--r-- | docs/licenses/python-ldap.txt | 60 | ||||
-rw-r--r-- | docs/licenses/ruamel-yaml.txt | 21 | ||||
-rw-r--r-- | docs/licenses/twisted.txt | 5 |
5 files changed, 64 insertions, 77 deletions
diff --git a/docs/licenses/dictdiffer.txt b/docs/licenses/dictdiffer.txt deleted file mode 100644 index f1f1a91a07..0000000000 --- a/docs/licenses/dictdiffer.txt +++ /dev/null @@ -1,28 +0,0 @@ -Dictdiffer is free software; you can redistribute it and/or modify it -under the terms of the MIT License quoted below. - -Copyright (C) 2013 Fatih Erikli. -Copyright (C) 2013, 2014 CERN. - -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. - -In applying this license, CERN does not waive the privileges and -immunities granted to it by virtue of its status as an -Intergovernmental Organization or submit itself to any jurisdiction. diff --git a/docs/licenses/pyhamcrest.txt b/docs/licenses/pyhamcrest.txt deleted file mode 100644 index 0bea089e5c..0000000000 --- a/docs/licenses/pyhamcrest.txt +++ /dev/null @@ -1,27 +0,0 @@ -BSD License - -Copyright 2011 hamcrest.org -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 Hamcrest 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. diff --git a/docs/licenses/python-ldap.txt b/docs/licenses/python-ldap.txt index 0aa20b4ea0..cece5f74cb 100644 --- a/docs/licenses/python-ldap.txt +++ b/docs/licenses/python-ldap.txt @@ -1,3 +1,63 @@ +The MIT License applies to contributions committed after July 1st, 2021, and +to all contributions by the following authors: + +* A. Karl Kornel +* Alex Willmer +* Aymeric Augustin +* Bernhard M. Wiedemann +* Bradley Baetz +* Christian Heimes +* Éloi Rivard +* Eyal Cherevatzki +* Florian Best +* Fred Thomsen +* Ivan A. Melnikov +* johnthagen +* Jonathon Reinhart +* Jon Dufresne +* Martin Basti +* Marti Raudsepp +* Miro Hrončok +* Paul Aurich +* Petr Viktorin +* Pieterjan De Potter +* Raphaël Barrois +* Robert Kuska +* Stanislav Láznička +* Tobias Bräutigam +* Tom van Dijk +* Wentao Han +* William Brown + + +------------------------------------------------------------------------------- + +MIT License + +Copyright (c) 2021 python-ldap contributors + +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. + + + + +Previous license: The python-ldap package is distributed under Python-style license. diff --git a/docs/licenses/ruamel-yaml.txt b/docs/licenses/ruamel-yaml.txt deleted file mode 100644 index 787621c742..0000000000 --- a/docs/licenses/ruamel-yaml.txt +++ /dev/null @@ -1,21 +0,0 @@ - The MIT License (MIT) - - Copyright (c) 2014-2019 Anthon van der Neut, Ruamel bvba - - 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/docs/licenses/twisted.txt b/docs/licenses/twisted.txt index 255b2dae79..0a1dd5572f 100644 --- a/docs/licenses/twisted.txt +++ b/docs/licenses/twisted.txt @@ -1,4 +1,4 @@ -Copyright (c) 2001-2016 +Copyright (c) 2001-2022 Allen Short Amber Hawkie Brown Andrew Bennetts @@ -10,6 +10,7 @@ Benjamin Bruheim Bob Ippolito Canonical Limited Christopher Armstrong +Ciena Corporation David Reid Divmod Inc. Donovan Preston @@ -44,8 +45,10 @@ Sean Riley Software Freedom Conservancy Tavendo GmbH Thijs Triemstra +Thomas Grainger Thomas Herve Timothy Allen +Tom Most Tom Prince Travis B. Hartwell |