Skip to content

Commit b727b3e

Browse files
authored
Use upstream go plugins helpers (#39066)
* removed module replacement for docker/go-plugins-helpers, and ran go mod tidy * rebased, and ran go mod tidy * ran make notice
1 parent c9b58e2 commit b727b3e

File tree

3 files changed

+214
-342
lines changed

3 files changed

+214
-342
lines changed

Diff for: NOTICE.txt

+208-7
Original file line numberDiff line numberDiff line change
@@ -11701,12 +11701,12 @@ Contents of probable licence file $GOMODCACHE/github.com/docker/go-connections@v
1170111701

1170211702

1170311703
--------------------------------------------------------------------------------
11704-
Dependency : github.com/elastic/go-plugins-helpers
11705-
Version: v0.0.0-20200207104224-bdf17607b79f
11704+
Dependency : github.com/docker/go-plugins-helpers
11705+
Version: v0.0.0-20181025120712-1e6269c305b8
1170611706
Licence type (autodetected): Apache-2.0
1170711707
--------------------------------------------------------------------------------
1170811708

11709-
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]20200207104224-bdf17607b79f/LICENSE:
11709+
Contents of probable licence file $GOMODCACHE/github.com/docker/[email protected]20181025120712-1e6269c305b8/LICENSE:
1171011710

1171111711
Apache License
1171211712
Version 2.0, January 2004
@@ -37060,6 +37060,207 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
3706037060
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3706137061

3706237062

37063+
--------------------------------------------------------------------------------
37064+
Dependency : github.com/coreos/go-systemd
37065+
Version: v0.0.0-20180511133405-39ca1b05acc7
37066+
Licence type (autodetected): Apache-2.0
37067+
--------------------------------------------------------------------------------
37068+
37069+
Contents of probable licence file $GOMODCACHE/github.com/coreos/[email protected]/LICENSE:
37070+
37071+
Apache License
37072+
Version 2.0, January 2004
37073+
http://www.apache.org/licenses/
37074+
37075+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
37076+
37077+
1. Definitions.
37078+
37079+
"License" shall mean the terms and conditions for use, reproduction, and
37080+
distribution as defined by Sections 1 through 9 of this document.
37081+
37082+
"Licensor" shall mean the copyright owner or entity authorized by the copyright
37083+
owner that is granting the License.
37084+
37085+
"Legal Entity" shall mean the union of the acting entity and all other entities
37086+
that control, are controlled by, or are under common control with that entity.
37087+
For the purposes of this definition, "control" means (i) the power, direct or
37088+
indirect, to cause the direction or management of such entity, whether by
37089+
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
37090+
outstanding shares, or (iii) beneficial ownership of such entity.
37091+
37092+
"You" (or "Your") shall mean an individual or Legal Entity exercising
37093+
permissions granted by this License.
37094+
37095+
"Source" form shall mean the preferred form for making modifications, including
37096+
but not limited to software source code, documentation source, and configuration
37097+
files.
37098+
37099+
"Object" form shall mean any form resulting from mechanical transformation or
37100+
translation of a Source form, including but not limited to compiled object code,
37101+
generated documentation, and conversions to other media types.
37102+
37103+
"Work" shall mean the work of authorship, whether in Source or Object form, made
37104+
available under the License, as indicated by a copyright notice that is included
37105+
in or attached to the work (an example is provided in the Appendix below).
37106+
37107+
"Derivative Works" shall mean any work, whether in Source or Object form, that
37108+
is based on (or derived from) the Work and for which the editorial revisions,
37109+
annotations, elaborations, or other modifications represent, as a whole, an
37110+
original work of authorship. For the purposes of this License, Derivative Works
37111+
shall not include works that remain separable from, or merely link (or bind by
37112+
name) to the interfaces of, the Work and Derivative Works thereof.
37113+
37114+
"Contribution" shall mean any work of authorship, including the original version
37115+
of the Work and any modifications or additions to that Work or Derivative Works
37116+
thereof, that is intentionally submitted to Licensor for inclusion in the Work
37117+
by the copyright owner or by an individual or Legal Entity authorized to submit
37118+
on behalf of the copyright owner. For the purposes of this definition,
37119+
"submitted" means any form of electronic, verbal, or written communication sent
37120+
to the Licensor or its representatives, including but not limited to
37121+
communication on electronic mailing lists, source code control systems, and
37122+
issue tracking systems that are managed by, or on behalf of, the Licensor for
37123+
the purpose of discussing and improving the Work, but excluding communication
37124+
that is conspicuously marked or otherwise designated in writing by the copyright
37125+
owner as "Not a Contribution."
37126+
37127+
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
37128+
of whom a Contribution has been received by Licensor and subsequently
37129+
incorporated within the Work.
37130+
37131+
2. Grant of Copyright License.
37132+
37133+
Subject to the terms and conditions of this License, each Contributor hereby
37134+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
37135+
irrevocable copyright license to reproduce, prepare Derivative Works of,
37136+
publicly display, publicly perform, sublicense, and distribute the Work and such
37137+
Derivative Works in Source or Object form.
37138+
37139+
3. Grant of Patent License.
37140+
37141+
Subject to the terms and conditions of this License, each Contributor hereby
37142+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
37143+
irrevocable (except as stated in this section) patent license to make, have
37144+
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
37145+
such license applies only to those patent claims licensable by such Contributor
37146+
that are necessarily infringed by their Contribution(s) alone or by combination
37147+
of their Contribution(s) with the Work to which such Contribution(s) was
37148+
submitted. If You institute patent litigation against any entity (including a
37149+
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
37150+
Contribution incorporated within the Work constitutes direct or contributory
37151+
patent infringement, then any patent licenses granted to You under this License
37152+
for that Work shall terminate as of the date such litigation is filed.
37153+
37154+
4. Redistribution.
37155+
37156+
You may reproduce and distribute copies of the Work or Derivative Works thereof
37157+
in any medium, with or without modifications, and in Source or Object form,
37158+
provided that You meet the following conditions:
37159+
37160+
You must give any other recipients of the Work or Derivative Works a copy of
37161+
this License; and
37162+
You must cause any modified files to carry prominent notices stating that You
37163+
changed the files; and
37164+
You must retain, in the Source form of any Derivative Works that You distribute,
37165+
all copyright, patent, trademark, and attribution notices from the Source form
37166+
of the Work, excluding those notices that do not pertain to any part of the
37167+
Derivative Works; and
37168+
If the Work includes a "NOTICE" text file as part of its distribution, then any
37169+
Derivative Works that You distribute must include a readable copy of the
37170+
attribution notices contained within such NOTICE file, excluding those notices
37171+
that do not pertain to any part of the Derivative Works, in at least one of the
37172+
following places: within a NOTICE text file distributed as part of the
37173+
Derivative Works; within the Source form or documentation, if provided along
37174+
with the Derivative Works; or, within a display generated by the Derivative
37175+
Works, if and wherever such third-party notices normally appear. The contents of
37176+
the NOTICE file are for informational purposes only and do not modify the
37177+
License. You may add Your own attribution notices within Derivative Works that
37178+
You distribute, alongside or as an addendum to the NOTICE text from the Work,
37179+
provided that such additional attribution notices cannot be construed as
37180+
modifying the License.
37181+
You may add Your own copyright statement to Your modifications and may provide
37182+
additional or different license terms and conditions for use, reproduction, or
37183+
distribution of Your modifications, or for any such Derivative Works as a whole,
37184+
provided Your use, reproduction, and distribution of the Work otherwise complies
37185+
with the conditions stated in this License.
37186+
37187+
5. Submission of Contributions.
37188+
37189+
Unless You explicitly state otherwise, any Contribution intentionally submitted
37190+
for inclusion in the Work by You to the Licensor shall be under the terms and
37191+
conditions of this License, without any additional terms or conditions.
37192+
Notwithstanding the above, nothing herein shall supersede or modify the terms of
37193+
any separate license agreement you may have executed with Licensor regarding
37194+
such Contributions.
37195+
37196+
6. Trademarks.
37197+
37198+
This License does not grant permission to use the trade names, trademarks,
37199+
service marks, or product names of the Licensor, except as required for
37200+
reasonable and customary use in describing the origin of the Work and
37201+
reproducing the content of the NOTICE file.
37202+
37203+
7. Disclaimer of Warranty.
37204+
37205+
Unless required by applicable law or agreed to in writing, Licensor provides the
37206+
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
37207+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
37208+
including, without limitation, any warranties or conditions of TITLE,
37209+
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
37210+
solely responsible for determining the appropriateness of using or
37211+
redistributing the Work and assume any risks associated with Your exercise of
37212+
permissions under this License.
37213+
37214+
8. Limitation of Liability.
37215+
37216+
In no event and under no legal theory, whether in tort (including negligence),
37217+
contract, or otherwise, unless required by applicable law (such as deliberate
37218+
and grossly negligent acts) or agreed to in writing, shall any Contributor be
37219+
liable to You for damages, including any direct, indirect, special, incidental,
37220+
or consequential damages of any character arising as a result of this License or
37221+
out of the use or inability to use the Work (including but not limited to
37222+
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
37223+
any and all other commercial damages or losses), even if such Contributor has
37224+
been advised of the possibility of such damages.
37225+
37226+
9. Accepting Warranty or Additional Liability.
37227+
37228+
While redistributing the Work or Derivative Works thereof, You may choose to
37229+
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
37230+
other liability obligations and/or rights consistent with this License. However,
37231+
in accepting such obligations, You may act only on Your own behalf and on Your
37232+
sole responsibility, not on behalf of any other Contributor, and only if You
37233+
agree to indemnify, defend, and hold each Contributor harmless for any liability
37234+
incurred by, or claims asserted against, such Contributor by reason of your
37235+
accepting any such warranty or additional liability.
37236+
37237+
END OF TERMS AND CONDITIONS
37238+
37239+
APPENDIX: How to apply the Apache License to your work
37240+
37241+
To apply the Apache License to your work, attach the following boilerplate
37242+
notice, with the fields enclosed by brackets "[]" replaced with your own
37243+
identifying information. (Don't include the brackets!) The text should be
37244+
enclosed in the appropriate comment syntax for the file format. We also
37245+
recommend that a file or class name and description of purpose be included on
37246+
the same "printed page" as the copyright notice for easier identification within
37247+
third-party archives.
37248+
37249+
Copyright [yyyy] [name of copyright owner]
37250+
37251+
Licensed under the Apache License, Version 2.0 (the "License");
37252+
you may not use this file except in compliance with the License.
37253+
You may obtain a copy of the License at
37254+
37255+
http://www.apache.org/licenses/LICENSE-2.0
37256+
37257+
Unless required by applicable law or agreed to in writing, software
37258+
distributed under the License is distributed on an "AS IS" BASIS,
37259+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
37260+
See the License for the specific language governing permissions and
37261+
limitations under the License.
37262+
37263+
3706337264
--------------------------------------------------------------------------------
3706437265
Dependency : github.com/creack/pty
3706537266
Version: v1.1.18
@@ -49320,11 +49521,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4932049521

4932149522
--------------------------------------------------------------------------------
4932249523
Dependency : github.com/onsi/gomega
49323-
Version: v1.10.3
49524+
Version: v1.10.1
4932449525
Licence type (autodetected): MIT
4932549526
--------------------------------------------------------------------------------
4932649527

49327-
Contents of probable licence file $GOMODCACHE/github.com/onsi/[email protected].3/LICENSE:
49528+
Contents of probable licence file $GOMODCACHE/github.com/onsi/[email protected].1/LICENSE:
4932849529

4932949530
Copyright (c) 2013-2014 Onsi Fakhouri
4933049531

@@ -51665,11 +51866,11 @@ Contents of probable licence file $GOMODCACHE/github.com/urso/[email protected]
5166551866

5166651867
--------------------------------------------------------------------------------
5166751868
Dependency : github.com/vishvananda/netlink
51668-
Version: v1.1.1-0.20201029203352-d40f9887b852
51869+
Version: v1.1.0
5166951870
Licence type (autodetected): Apache-2.0
5167051871
--------------------------------------------------------------------------------
5167151872

51672-
Contents of probable licence file $GOMODCACHE/github.com/vishvananda/[email protected].1-0.20201029203352-d40f9887b852/LICENSE:
51873+
Contents of probable licence file $GOMODCACHE/github.com/vishvananda/[email protected].0/LICENSE:
5167351874

5167451875

5167551876
Apache License

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ require (
277277
github.com/beorn7/perks v1.0.1 // indirect
278278
github.com/cespare/xxhash v1.1.0 // indirect
279279
github.com/cilium/ebpf v0.13.2 // indirect
280+
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 // indirect
280281
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
281282
github.com/davecgh/go-spew v1.1.1 // indirect
282283
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
@@ -414,7 +415,6 @@ replace (
414415
github.com/apoydence/eachers => github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 //indirect, see https://github.com/elastic/beats/pull/29780 for details.
415416
github.com/cucumber/godog => github.com/cucumber/godog v0.8.1
416417
github.com/dgraph-io/ristretto => github.com/elastic/ristretto v0.1.1-0.20220602190459-83b0895ca5b3 // Removes glog dependency. See https://github.com/elastic/beats/issues/31810.
417-
github.com/docker/go-plugins-helpers => github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f
418418
github.com/dop251/goja => github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20
419419
github.com/dop251/goja_nodejs => github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6
420420
github.com/fsnotify/fsevents => github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270

0 commit comments

Comments
 (0)