mirror of
https://github.com/anchore/syft.git
synced 2026-10-17 16:47:19 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 William Murphy
|
5d54e6e847 | ||
 Keith Zantow
|
631d50d038 | ||
 anchore-actions-token-generator[bot]
|
269006bf04 | ||
|
William Murphy
|
e2ed89f700 | ||
 dependabot[bot]
|
badb957888 | ||
|
dependabot[bot]
|
a1bba36d51 | ||
 anchore-actions-token-generator[bot]andkzantow
|
c019cd51da | ||
|
dependabot[bot]
|
5406d8a366 | ||
 James Neate
|
098c255a2d | ||
|
dependabot[bot]
|
2c5d64ac9e |
@@ -0,0 +1 @@
|
||||
enforce-v0: true # don't make breaking-change label bump major version before 1.0.
|
||||
@@ -10,7 +10,7 @@ CHRONICLE_CMD = $(TEMP_DIR)/chronicle
|
||||
GLOW_CMD = $(TEMP_DIR)/glow
|
||||
|
||||
# Tool versions #################################
|
||||
GOLANGCILINT_VERSION := v1.53.2
|
||||
GOLANGCILINT_VERSION := v1.53.3
|
||||
GOSIMPORTS_VERSION := v0.3.8
|
||||
BOUNCER_VERSION := v0.4.0
|
||||
CHRONICLE_VERSION := v0.6.0
|
||||
|
||||
@@ -31,7 +31,7 @@ require (
|
||||
github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e
|
||||
github.com/sergi/go-diff v1.3.1
|
||||
github.com/sirupsen/logrus v1.9.3
|
||||
github.com/spdx/tools-golang v0.5.1
|
||||
github.com/spdx/tools-golang v0.5.2
|
||||
github.com/spf13/afero v1.9.5
|
||||
github.com/spf13/cobra v1.7.0
|
||||
github.com/spf13/pflag v1.0.5
|
||||
@@ -42,9 +42,9 @@ require (
|
||||
github.com/wagoodman/go-progress v0.0.0-20230301185719-21920a456ad5
|
||||
github.com/wagoodman/jotframe v0.0.0-20211129225309-56b0d0a4aebb
|
||||
github.com/xeipuuv/gojsonschema v1.2.0
|
||||
golang.org/x/mod v0.10.0
|
||||
golang.org/x/net v0.10.0
|
||||
golang.org/x/term v0.8.0
|
||||
golang.org/x/mod v0.11.0
|
||||
golang.org/x/net v0.11.0
|
||||
golang.org/x/term v0.9.0
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
)
|
||||
|
||||
@@ -53,7 +53,7 @@ require (
|
||||
github.com/Masterminds/semver v1.5.0
|
||||
github.com/Masterminds/sprig/v3 v3.2.3
|
||||
github.com/anchore/go-logger v0.0.0-20220728155337-03b66a5207d8
|
||||
github.com/anchore/stereoscope v0.0.0-20230522170632-e14bc4437b2e
|
||||
github.com/anchore/stereoscope v0.0.0-20230609190519-5b5049bf4d3a
|
||||
github.com/dave/jennifer v1.6.1
|
||||
github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da
|
||||
github.com/docker/docker v24.0.2+incompatible
|
||||
@@ -69,7 +69,7 @@ require (
|
||||
github.com/vbatts/go-mtree v0.5.3
|
||||
golang.org/x/exp v0.0.0-20230202163644-54bba9f4231b
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
modernc.org/sqlite v1.23.0
|
||||
modernc.org/sqlite v1.23.1
|
||||
)
|
||||
|
||||
require (
|
||||
@@ -144,8 +144,8 @@ require (
|
||||
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
|
||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
|
||||
golang.org/x/sync v0.1.0 // indirect
|
||||
golang.org/x/sys v0.8.0 // indirect
|
||||
golang.org/x/text v0.9.0 // indirect
|
||||
golang.org/x/sys v0.9.0 // indirect
|
||||
golang.org/x/text v0.10.0 // indirect
|
||||
golang.org/x/tools v0.8.0 // indirect
|
||||
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
|
||||
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
|
||||
@@ -169,7 +169,7 @@ require (
|
||||
// go: warning: github.com/andybalholm/brotli@v1.0.1: retracted by module author: occasional panics and data corruption
|
||||
github.com/andybalholm/brotli v1.0.4 // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
golang.org/x/crypto v0.9.0 // indirect
|
||||
golang.org/x/crypto v0.10.0 // indirect
|
||||
)
|
||||
|
||||
retract (
|
||||
|
||||
@@ -98,8 +98,8 @@ github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b h1:e1bmaoJfZV
|
||||
github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b/go.mod h1:Bkc+JYWjMCF8OyZ340IMSIi2Ebf3uwByOk6ho4wne1E=
|
||||
github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501 h1:AV7qjwMcM4r8wFhJq3jLRztew3ywIyPTRapl2T1s9o8=
|
||||
github.com/anchore/packageurl-go v0.1.1-0.20230104203445-02e0a6721501/go.mod h1:Blo6OgJNiYF41ufcgHKkbCKF2MDOMlrqhXv/ij6ocR4=
|
||||
github.com/anchore/stereoscope v0.0.0-20230522170632-e14bc4437b2e h1:YPWJxds1hKRedS92u7O6D6ULVOx1F2HGgS4CWqJdBYw=
|
||||
github.com/anchore/stereoscope v0.0.0-20230522170632-e14bc4437b2e/go.mod h1:0LsgHgXO4QFnk2hsYwtqd3fR18PIZXlFLIl2qb9tu3g=
|
||||
github.com/anchore/stereoscope v0.0.0-20230609190519-5b5049bf4d3a h1:+Vu04kYx8/4W5WcLeg+HjTTYNNvVMEsXmW9lydK0Rz4=
|
||||
github.com/anchore/stereoscope v0.0.0-20230609190519-5b5049bf4d3a/go.mod h1:0LsgHgXO4QFnk2hsYwtqd3fR18PIZXlFLIl2qb9tu3g=
|
||||
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
|
||||
github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
|
||||
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
|
||||
@@ -559,8 +559,8 @@ github.com/skeema/knownhosts v1.1.1 h1:MTk78x9FPgDFVFkDLTrsnnfCJl7g1C/nnKvePgrIn
|
||||
github.com/skeema/knownhosts v1.1.1/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
|
||||
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
|
||||
github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb/go.mod h1:uKWaldnbMnjsSAXRurWqqrdyZen1R7kxl8TkmWk2OyM=
|
||||
github.com/spdx/tools-golang v0.5.1 h1:fJg3SVOGG+eIva9ZUBm/hvyA7PIPVFjRxUKe6fdAgwE=
|
||||
github.com/spdx/tools-golang v0.5.1/go.mod h1:/DRDQuBfB37HctM29YtrX1v+bXiVmT2OpQDalRmX9aU=
|
||||
github.com/spdx/tools-golang v0.5.2 h1:dtMNjJreWPe37584ajk7m/rQtfJaLpRMk7pUGgvekOg=
|
||||
github.com/spdx/tools-golang v0.5.2/go.mod h1:/ETOahiAo96Ob0/RAIBmFZw6XN0yTnyr/uFZm2NTMhI=
|
||||
github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
|
||||
github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
|
||||
github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
|
||||
@@ -677,8 +677,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
|
||||
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
||||
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
||||
golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
|
||||
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
|
||||
golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
|
||||
golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
|
||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||
@@ -720,8 +720,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
|
||||
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
|
||||
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
@@ -770,8 +770,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
|
||||
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
|
||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
||||
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
|
||||
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
||||
golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
|
||||
golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
@@ -882,8 +882,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
|
||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
|
||||
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
@@ -891,8 +891,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
|
||||
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
|
||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
||||
golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
|
||||
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
|
||||
golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28=
|
||||
golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
|
||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
@@ -905,8 +905,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
|
||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||
golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
|
||||
golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
@@ -1177,8 +1177,8 @@ modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
|
||||
modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
|
||||
modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
|
||||
modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
|
||||
modernc.org/sqlite v1.23.0 h1:MWTFBI5H1WLnXpNBh/BTruBVqzzoh28DA0iOnlkkRaM=
|
||||
modernc.org/sqlite v1.23.0/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
|
||||
modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
|
||||
modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
|
||||
modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
|
||||
modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
|
||||
modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY=
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
// Code generated by go generate; DO NOT EDIT.
|
||||
// This file was generated by robots at 2023-03-22 18:00:44.589388 -0400 EDT m=+0.160679640
|
||||
// This file was generated by robots at 2023-06-20 11:37:07.979104 -0400 EDT m=+0.478800893
|
||||
// using data from https://spdx.org/licenses/licenses.json
|
||||
package spdxlicense
|
||||
|
||||
const Version = "3.20"
|
||||
const Version = "3.21"
|
||||
|
||||
var licenseIDs = map[string]string{
|
||||
"0bsd": "0BSD",
|
||||
@@ -93,6 +93,11 @@ var licenseIDs = map[string]string{
|
||||
"artistic2": "Artistic-2.0",
|
||||
"artistic2.0": "Artistic-2.0",
|
||||
"artistic2.0.0": "Artistic-2.0",
|
||||
"aswfdigitalassets1": "ASWF-Digital-Assets-1.0",
|
||||
"aswfdigitalassets1.0": "ASWF-Digital-Assets-1.0",
|
||||
"aswfdigitalassets1.0.0": "ASWF-Digital-Assets-1.0",
|
||||
"aswfdigitalassets1.1": "ASWF-Digital-Assets-1.1",
|
||||
"aswfdigitalassets1.1.0": "ASWF-Digital-Assets-1.1",
|
||||
"baekmuk": "Baekmuk",
|
||||
"bahyph": "Bahyph",
|
||||
"barr": "Barr",
|
||||
@@ -108,6 +113,7 @@ var licenseIDs = map[string]string{
|
||||
"blueoak1": "BlueOak-1.0.0",
|
||||
"blueoak1.0": "BlueOak-1.0.0",
|
||||
"blueoak1.0.0": "BlueOak-1.0.0",
|
||||
"boehmgc": "Boehm-GC",
|
||||
"borceux": "Borceux",
|
||||
"briangladman3.0.0clause": "Brian-Gladman-3-Clause",
|
||||
"briangladman3.0clause": "Brian-Gladman-3-Clause",
|
||||
@@ -336,10 +342,13 @@ var licenseIDs = map[string]string{
|
||||
"ccbysa3.0.0": "CC-BY-SA-3.0",
|
||||
"ccbysa3.0.0at": "CC-BY-SA-3.0-AT",
|
||||
"ccbysa3.0.0de": "CC-BY-SA-3.0-DE",
|
||||
"ccbysa3.0.0igo": "CC-BY-SA-3.0-IGO",
|
||||
"ccbysa3.0at": "CC-BY-SA-3.0-AT",
|
||||
"ccbysa3.0de": "CC-BY-SA-3.0-DE",
|
||||
"ccbysa3.0igo": "CC-BY-SA-3.0-IGO",
|
||||
"ccbysa3at": "CC-BY-SA-3.0-AT",
|
||||
"ccbysa3de": "CC-BY-SA-3.0-DE",
|
||||
"ccbysa3igo": "CC-BY-SA-3.0-IGO",
|
||||
"ccbysa4": "CC-BY-SA-4.0",
|
||||
"ccbysa4.0": "CC-BY-SA-4.0",
|
||||
"ccbysa4.0.0": "CC-BY-SA-4.0",
|
||||
@@ -440,6 +449,7 @@ var licenseIDs = map[string]string{
|
||||
"drl1.0": "DRL-1.0",
|
||||
"drl1.0.0": "DRL-1.0",
|
||||
"dsdp": "DSDP",
|
||||
"dtoa": "dtoa",
|
||||
"dvipdfm": "dvipdfm",
|
||||
"ecl1": "ECL-1.0",
|
||||
"ecl1.0": "ECL-1.0",
|
||||
@@ -638,6 +648,9 @@ var licenseIDs = map[string]string{
|
||||
"imlib2.0": "Imlib2",
|
||||
"imlib2.0.0": "Imlib2",
|
||||
"infozip": "Info-ZIP",
|
||||
"innernet2": "Inner-Net-2.0",
|
||||
"innernet2.0": "Inner-Net-2.0",
|
||||
"innernet2.0.0": "Inner-Net-2.0",
|
||||
"intel": "Intel",
|
||||
"intelacpi": "Intel-ACPI",
|
||||
"interbase1": "Interbase-1.0",
|
||||
@@ -663,8 +676,11 @@ var licenseIDs = map[string]string{
|
||||
"lal1.3": "LAL-1.3",
|
||||
"lal1.3.0": "LAL-1.3",
|
||||
"latex2.0.0e": "Latex2e",
|
||||
"latex2.0.0etranslatednotice": "Latex2e-translated-notice",
|
||||
"latex2.0e": "Latex2e",
|
||||
"latex2.0etranslatednotice": "Latex2e-translated-notice",
|
||||
"latex2e": "Latex2e",
|
||||
"latex2etranslatednotice": "Latex2e-translated-notice",
|
||||
"leptonica": "Leptonica",
|
||||
"lgpl2": "LGPL-2.0-only",
|
||||
"lgpl2+": "LGPL-2.0-or-later",
|
||||
@@ -717,7 +733,14 @@ var licenseIDs = map[string]string{
|
||||
"liliqrplus1": "LiLiQ-Rplus-1.1",
|
||||
"liliqrplus1.1": "LiLiQ-Rplus-1.1",
|
||||
"liliqrplus1.1.0": "LiLiQ-Rplus-1.1",
|
||||
"linuxmanpages1.0.0para": "Linux-man-pages-1-para",
|
||||
"linuxmanpages1.0para": "Linux-man-pages-1-para",
|
||||
"linuxmanpages1para": "Linux-man-pages-1-para",
|
||||
"linuxmanpagescopyleft": "Linux-man-pages-copyleft",
|
||||
"linuxmanpagescopyleft2.0.0para": "Linux-man-pages-copyleft-2-para",
|
||||
"linuxmanpagescopyleft2.0para": "Linux-man-pages-copyleft-2-para",
|
||||
"linuxmanpagescopyleft2para": "Linux-man-pages-copyleft-2-para",
|
||||
"linuxmanpagescopyleftvar": "Linux-man-pages-copyleft-var",
|
||||
"linuxopenib": "Linux-OpenIB",
|
||||
"loop": "LOOP",
|
||||
"lpl1": "LPL-1.0",
|
||||
@@ -746,6 +769,7 @@ var licenseIDs = map[string]string{
|
||||
"lzmasdk9to9.20": "LZMA-SDK-9.11-to-9.20",
|
||||
"makeindex": "MakeIndex",
|
||||
"martinbirgmeier": "Martin-Birgmeier",
|
||||
"metamail": "metamail",
|
||||
"minpack": "Minpack",
|
||||
"miros": "MirOS",
|
||||
"mit": "MIT",
|
||||
@@ -754,6 +778,7 @@ var licenseIDs = map[string]string{
|
||||
"mitcmu": "MIT-CMU",
|
||||
"mitenna": "MIT-enna",
|
||||
"mitfeh": "MIT-feh",
|
||||
"mitfestival": "MIT-Festival",
|
||||
"mitmodernvariant": "MIT-Modern-Variant",
|
||||
"mitnfa": "MITNFA",
|
||||
"mitopengroup": "MIT-open-group",
|
||||
@@ -810,6 +835,7 @@ var licenseIDs = map[string]string{
|
||||
"nicta1.0.0": "NICTA-1.0",
|
||||
"nistpd": "NIST-PD",
|
||||
"nistpdfallback": "NIST-PD-fallback",
|
||||
"nistsoftware": "NIST-Software",
|
||||
"nlod1": "NLOD-1.0",
|
||||
"nlod1.0": "NLOD-1.0",
|
||||
"nlod1.0.0": "NLOD-1.0",
|
||||
@@ -908,6 +934,9 @@ var licenseIDs = map[string]string{
|
||||
"oldap2.7.0": "OLDAP-2.7",
|
||||
"oldap2.8": "OLDAP-2.8",
|
||||
"oldap2.8.0": "OLDAP-2.8",
|
||||
"olfl1": "OLFL-1.3",
|
||||
"olfl1.3": "OLFL-1.3",
|
||||
"olfl1.3.0": "OLFL-1.3",
|
||||
"oml": "OML",
|
||||
"openpbs2": "OpenPBS-2.3",
|
||||
"openpbs2.3": "OpenPBS-2.3",
|
||||
@@ -916,6 +945,9 @@ var licenseIDs = map[string]string{
|
||||
"opl1": "OPL-1.0",
|
||||
"opl1.0": "OPL-1.0",
|
||||
"opl1.0.0": "OPL-1.0",
|
||||
"opluk3": "OPL-UK-3.0",
|
||||
"opluk3.0": "OPL-UK-3.0",
|
||||
"opluk3.0.0": "OPL-UK-3.0",
|
||||
"opubl1": "OPUBL-1.0",
|
||||
"opubl1.0": "OPUBL-1.0",
|
||||
"opubl1.0.0": "OPUBL-1.0",
|
||||
@@ -1007,6 +1039,9 @@ var licenseIDs = map[string]string{
|
||||
"sgib2": "SGI-B-2.0",
|
||||
"sgib2.0": "SGI-B-2.0",
|
||||
"sgib2.0.0": "SGI-B-2.0",
|
||||
"sgp4": "SGP4",
|
||||
"sgp4.0": "SGP4",
|
||||
"sgp4.0.0": "SGP4",
|
||||
"shl0.5": "SHL-0.5",
|
||||
"shl0.5.0": "SHL-0.5",
|
||||
"shl0.51": "SHL-0.51",
|
||||
@@ -1052,6 +1087,7 @@ var licenseIDs = map[string]string{
|
||||
"taprohl1.0.0": "TAPR-OHL-1.0",
|
||||
"tcl": "TCL",
|
||||
"tcpwrappers": "TCP-wrappers",
|
||||
"termreadkey": "TermReadKey",
|
||||
"tmate": "TMate",
|
||||
"torque1": "TORQUE-1.1",
|
||||
"torque1.1": "TORQUE-1.1",
|
||||
@@ -1079,6 +1115,7 @@ var licenseIDs = map[string]string{
|
||||
"unicodedfs2016.0": "Unicode-DFS-2016",
|
||||
"unicodedfs2016.0.0": "Unicode-DFS-2016",
|
||||
"unicodetou": "Unicode-TOU",
|
||||
"unixcrypt": "UnixCrypt",
|
||||
"unlicense": "Unlicense",
|
||||
"upl1": "UPL-1.0",
|
||||
"upl1.0": "UPL-1.0",
|
||||
@@ -1103,6 +1140,7 @@ var licenseIDs = map[string]string{
|
||||
"watcom1": "Watcom-1.0",
|
||||
"watcom1.0": "Watcom-1.0",
|
||||
"watcom1.0.0": "Watcom-1.0",
|
||||
"widgetworkshop": "Widget-Workshop",
|
||||
"wsuipa": "Wsuipa",
|
||||
"wtfpl": "WTFPL",
|
||||
"wxwindows": "wxWindows",
|
||||
@@ -1112,7 +1150,11 @@ var licenseIDs = map[string]string{
|
||||
"x11.0.0distributemodificationsvariant": "X11-distribute-modifications-variant",
|
||||
"x11.0distributemodificationsvariant": "X11-distribute-modifications-variant",
|
||||
"x11distributemodificationsvariant": "X11-distribute-modifications-variant",
|
||||
"xdebug1": "Xdebug-1.03",
|
||||
"xdebug1.03": "Xdebug-1.03",
|
||||
"xdebug1.03.0": "Xdebug-1.03",
|
||||
"xerox": "Xerox",
|
||||
"xfig": "Xfig",
|
||||
"xfree861": "XFree86-1.1",
|
||||
"xfree861.1": "XFree86-1.1",
|
||||
"xfree861.1.0": "XFree86-1.1",
|
||||
|
||||
+1
-1
@@ -22,5 +22,5 @@ func IDByHash(obj interface{}) (ID, error) {
|
||||
return "", fmt.Errorf("could not build ID for object=%+v: %w", obj, err)
|
||||
}
|
||||
|
||||
return ID(fmt.Sprintf("%x", f)), nil
|
||||
return ID(fmt.Sprintf("%016x", f)), nil
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "e7c88bd18e11b0b",
|
||||
"id": "0e7c88bd18e11b0b",
|
||||
"location": {
|
||||
"path": "/a/place/a"
|
||||
},
|
||||
|
||||
@@ -68,8 +68,9 @@ func newPomProject(path string, p gopom.Project) *pkg.PomProject {
|
||||
func newPackageFromPom(pom gopom.Project, dep gopom.Dependency, locations ...file.Location) pkg.Package {
|
||||
m := pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: resolveProperty(pom, dep.GroupID),
|
||||
Scope: resolveProperty(pom, dep.Scope),
|
||||
GroupID: resolveProperty(pom, dep.GroupID),
|
||||
ArtifactID: resolveProperty(pom, dep.ArtifactID),
|
||||
Scope: resolveProperty(pom, dep.Scope),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,10 @@ func Test_parserPomXML(t *testing.T) {
|
||||
Type: pkg.JavaPkg,
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{GroupID: "com.joda"},
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "com.joda",
|
||||
ArtifactID: "joda-time",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -40,8 +43,9 @@ func Test_parserPomXML(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "junit",
|
||||
Scope: "test",
|
||||
GroupID: "junit",
|
||||
ArtifactID: "junit",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -75,7 +79,10 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
Type: pkg.JavaPkg,
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{GroupID: "org.apache.commons"},
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "org.apache.commons",
|
||||
ArtifactID: "commons-lang3",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -87,8 +94,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "org.junit.jupiter",
|
||||
Scope: "test",
|
||||
GroupID: "org.junit.jupiter",
|
||||
ArtifactID: "junit-jupiter",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -101,8 +109,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "org.assertj",
|
||||
Scope: "test",
|
||||
GroupID: "org.assertj",
|
||||
ArtifactID: "assertj-core",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -115,8 +124,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "commons-io",
|
||||
Scope: "test",
|
||||
GroupID: "commons-io",
|
||||
ArtifactID: "commons-io",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -129,8 +139,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "org.mockito",
|
||||
Scope: "test",
|
||||
GroupID: "org.mockito",
|
||||
ArtifactID: "mockito-inline",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -143,8 +154,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "org.graalvm.js",
|
||||
Scope: "test",
|
||||
GroupID: "org.graalvm.js",
|
||||
ArtifactID: "js",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -157,8 +169,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "org.graalvm.js",
|
||||
Scope: "test",
|
||||
GroupID: "org.graalvm.js",
|
||||
ArtifactID: "js-scriptengine",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -171,8 +184,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "org.apache.commons",
|
||||
Scope: "test",
|
||||
GroupID: "org.apache.commons",
|
||||
ArtifactID: "commons-rng-simple",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -185,8 +199,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "org.openjdk.jmh",
|
||||
Scope: "test",
|
||||
GroupID: "org.openjdk.jmh",
|
||||
ArtifactID: "jmh-core",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -199,8 +214,9 @@ func Test_parseCommonsTextPomXMLProject(t *testing.T) {
|
||||
MetadataType: pkg.JavaMetadataType,
|
||||
Metadata: pkg.JavaMetadata{
|
||||
PomProperties: &pkg.PomProperties{
|
||||
GroupID: "org.openjdk.jmh",
|
||||
Scope: "test",
|
||||
GroupID: "org.openjdk.jmh",
|
||||
ArtifactID: "jmh-generator-annprocess",
|
||||
Scope: "test",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user