From aa441b3cffb3109fcb2a717caec059027042dd76 Mon Sep 17 00:00:00 2001 From: Hank Donnay Date: Tue, 9 May 2023 12:15:06 -0500 Subject: [PATCH] stomp: switch to module release for stomp client This has an identical API, just with module support. Closes: #1739 Signed-off-by: Hank Donnay --- go.mod | 2 +- go.sum | 9 +++++---- notifier/stomp/deliverer.go | 2 +- notifier/stomp/deliverer_integration_test.go | 2 +- notifier/stomp/directdeliverer.go | 2 +- notifier/stomp/directdeliverer_integration_test.go | 2 +- notifier/stomp/failover.go | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 525f383ce5..58b378d3c7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/quay/clair/v4 go 1.20 require ( - github.com/go-stomp/stomp v2.0.8+incompatible + github.com/go-stomp/stomp/v3 v3.0.5 github.com/google/go-cmp v0.5.9 github.com/google/go-containerregistry v0.6.1 github.com/google/uuid v1.3.0 diff --git a/go.sum b/go.sum index 9d7bc735c7..7ad63a80d0 100644 --- a/go.sum +++ b/go.sum @@ -328,8 +328,8 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-stomp/stomp v2.0.8+incompatible h1:ncoHLwjBEWILzQptf4Lncm3/kQIyLvOWUfIRmkUVYfE= -github.com/go-stomp/stomp v2.0.8+incompatible/go.mod h1:VqCtqNZv1226A1/79yh+rMiFUcfY3R109np+7ke4n0c= +github.com/go-stomp/stomp/v3 v3.0.5 h1:yOORvXLqSu0qF4loJjfWrcVE1o0+9cFudclcP0an36Y= +github.com/go-stomp/stomp/v3 v3.0.5/go.mod h1:ztzZej6T2W4Y6FlD+Tb5n7HQP3/O5UNQiuC169pIp10= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -561,6 +561,7 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= @@ -634,7 +635,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -1381,8 +1381,9 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= diff --git a/notifier/stomp/deliverer.go b/notifier/stomp/deliverer.go index 5adfce3afd..6747245434 100644 --- a/notifier/stomp/deliverer.go +++ b/notifier/stomp/deliverer.go @@ -6,7 +6,7 @@ import ( "fmt" "net/url" - gostomp "github.com/go-stomp/stomp" + gostomp "github.com/go-stomp/stomp/v3" "github.com/google/uuid" "github.com/quay/clair/config" diff --git a/notifier/stomp/deliverer_integration_test.go b/notifier/stomp/deliverer_integration_test.go index a614141514..94116ad3bf 100644 --- a/notifier/stomp/deliverer_integration_test.go +++ b/notifier/stomp/deliverer_integration_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/go-stomp/stomp" + "github.com/go-stomp/stomp/v3" "github.com/google/uuid" "github.com/quay/clair/config" "github.com/quay/claircore/test/integration" diff --git a/notifier/stomp/directdeliverer.go b/notifier/stomp/directdeliverer.go index b594eb7bca..993b496993 100644 --- a/notifier/stomp/directdeliverer.go +++ b/notifier/stomp/directdeliverer.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" - gostomp "github.com/go-stomp/stomp" + gostomp "github.com/go-stomp/stomp/v3" "github.com/google/uuid" "github.com/quay/clair/config" diff --git a/notifier/stomp/directdeliverer_integration_test.go b/notifier/stomp/directdeliverer_integration_test.go index 6a22a4944a..318b937123 100644 --- a/notifier/stomp/directdeliverer_integration_test.go +++ b/notifier/stomp/directdeliverer_integration_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/go-stomp/stomp" + "github.com/go-stomp/stomp/v3" "github.com/google/uuid" "github.com/quay/clair/config" "github.com/quay/claircore" diff --git a/notifier/stomp/failover.go b/notifier/stomp/failover.go index 714fafa6d4..67d492e4e7 100644 --- a/notifier/stomp/failover.go +++ b/notifier/stomp/failover.go @@ -7,7 +7,7 @@ import ( "io" "net" - gostomp "github.com/go-stomp/stomp" + gostomp "github.com/go-stomp/stomp/v3" "github.com/quay/clair/config" "github.com/quay/zlog" )