Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* magefile: remove DMG-related bits

Removed from libbeat in elastic/beats#30097

* Update to elastic/beats@e675f4e82c7a
  • Loading branch information
axw authored Feb 7, 2022
1 parent f80e957 commit c4cd6c4
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 71 deletions.
90 changes: 45 additions & 45 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20220201091902-fbcece627a17
Version: v7.0.0-alpha2.0.20220202225250-e675f4e82c7a
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20220201091902-fbcece627a17/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20220202225250-e675f4e82c7a/LICENSE.txt:

Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
Expand Down Expand Up @@ -5245,36 +5245,6 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


--------------------------------------------------------------------------------
Dependency : github.com/StackExchange/wmi
Version: v1.2.1
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/!stack!exchange/[email protected]/LICENSE:

The MIT License (MIT)

Copyright (c) 2013 Stack Exchange

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.


--------------------------------------------------------------------------------
Dependency : github.com/apache/thrift
Version: v0.14.2
Expand Down Expand Up @@ -8918,11 +8888,11 @@ Contents of probable licence file $GOMODCACHE/github.com/go-logr/[email protected]/LIC

--------------------------------------------------------------------------------
Dependency : github.com/go-ole/go-ole
Version: v1.2.5
Version: v1.2.6
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/go-ole/[email protected].5/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/go-ole/[email protected].6/LICENSE:

The MIT License (MIT)

Expand Down Expand Up @@ -12969,12 +12939,12 @@ THE SOFTWARE.


--------------------------------------------------------------------------------
Dependency : github.com/shirou/gopsutil
Version: v3.21.7+incompatible
Dependency : github.com/shirou/gopsutil/v3
Version: v3.21.12
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/shirou/[email protected].7+incompatible/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/shirou/gopsutil/v3@v3.21.12/LICENSE:

gopsutil is distributed under BSD license reproduced below.

Expand Down Expand Up @@ -13101,11 +13071,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/tklauser/go-sysconf
Version: v0.3.5
Version: v0.3.9
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/tklauser/[email protected].5/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/tklauser/[email protected].9/LICENSE:

BSD 3-Clause License

Expand Down Expand Up @@ -13140,11 +13110,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/tklauser/numcpus
Version: v0.2.2
Version: v0.3.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.2.2/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.3.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -14142,6 +14112,36 @@ Contents of probable licence file $GOMODCACHE/github.com/xdg/[email protected]/L
of your accepting any such warranty or additional liability.


--------------------------------------------------------------------------------
Dependency : github.com/yusufpapurcu/wmi
Version: v1.2.2
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/yusufpapurcu/[email protected]/LICENSE:

The MIT License (MIT)

Copyright (c) 2013 Stack Exchange

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.


--------------------------------------------------------------------------------
Dependency : go.elastic.co/ecszap
Version: v1.0.0
Expand Down Expand Up @@ -16175,11 +16175,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
Version: v0.0.0-20220128215802-99c3d69c2c27
Version: v0.0.0-20220204135822-1c1b9b1eba6a
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20220128215802-99c3d69c2c27/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20220204135822-1c1b9b1eba6a/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -16286,11 +16286,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : google.golang.org/genproto
Version: v0.0.0-20220126215142-9970aeb2e350
Version: v0.0.0-20220204002441-d6cc3cc0770e
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]20220126215142-9970aeb2e350/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]20220204002441-d6cc3cc0770e/LICENSE:


Apache License
Expand Down
23 changes: 14 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d // indirect
github.com/dustin/go-humanize v1.0.0
github.com/elastic/apm-server/approvaltest v0.0.0-00010101000000-000000000000
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220201091902-fbcece627a17
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20220202225250-e675f4e82c7a
github.com/elastic/ecs v1.12.0
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210922110810-e6f1f402a9ed // indirect
github.com/elastic/gmux v0.2.0
Expand Down Expand Up @@ -60,21 +60,23 @@ require (
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
golang.org/x/tools v0.1.9
google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350 // indirect
google.golang.org/genproto v0.0.0-20220204002441-d6cc3cc0770e // indirect
google.golang.org/grpc v1.44.0
gotest.tools/gotestsum v1.7.0
howett.net/plist v1.0.0 // indirect
)

require gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
require (
github.com/elastic/go-lookslike v0.3.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)

require (
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/Shopify/sarama v1.29.1 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/akavel/rsrc v0.10.2 // indirect
github.com/apache/thrift v0.14.2 // indirect
github.com/armon/go-radix v1.0.0 // indirect
Expand All @@ -101,7 +103,7 @@ require (
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
Expand All @@ -123,6 +125,7 @@ require (
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/knadh/koanf v1.2.1 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/miekg/dns v1.1.42 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand All @@ -135,24 +138,26 @@ require (
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pierrec/lz4 v2.6.0+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rs/cors v1.8.0 // indirect
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
github.com/shirou/gopsutil v3.21.7+incompatible // indirect
github.com/shirou/gopsutil/v3 v3.21.12 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/tidwall/gjson v1.9.3 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tidwall/sjson v1.1.1 // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/tklauser/go-sysconf v0.3.9 // indirect
github.com/tklauser/numcpus v0.3.0 // indirect
github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 // indirect
github.com/urso/sderr v0.0.0-20210525210834-52b04e8f5c71 // indirect
github.com/xdg/scram v1.0.3 // indirect
github.com/xdg/stringprep v1.0.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/contrib v0.22.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0 // indirect
Expand Down
Loading

0 comments on commit c4cd6c4

Please sign in to comment.