diff --git a/cmd/client/list.go b/cmd/client/list.go index e682e5e..cc3efe6 100644 --- a/cmd/client/list.go +++ b/cmd/client/list.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/google/subcommands" - "github.com/inbucket/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/v3/pkg/rest/client" ) type listCmd struct { diff --git a/cmd/client/match.go b/cmd/client/match.go index cc0aa0a..f648022 100644 --- a/cmd/client/match.go +++ b/cmd/client/match.go @@ -10,7 +10,7 @@ import ( "time" "github.com/google/subcommands" - "github.com/inbucket/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/v3/pkg/rest/client" ) type matchCmd struct { diff --git a/cmd/client/mbox.go b/cmd/client/mbox.go index bee4274..946e6ab 100644 --- a/cmd/client/mbox.go +++ b/cmd/client/mbox.go @@ -7,7 +7,7 @@ import ( "os" "github.com/google/subcommands" - "github.com/inbucket/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/v3/pkg/rest/client" ) type mboxCmd struct { diff --git a/cmd/inbucket/main.go b/cmd/inbucket/main.go index ce6933f..f91c817 100644 --- a/cmd/inbucket/main.go +++ b/cmd/inbucket/main.go @@ -14,11 +14,11 @@ import ( "syscall" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/server" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/storage/file" - "github.com/inbucket/inbucket/pkg/storage/mem" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/server" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/storage/file" + "github.com/inbucket/inbucket/v3/pkg/storage/mem" "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) diff --git a/go.mod b/go.mod index 876194d..8194578 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/inbucket/inbucket +module github.com/inbucket/inbucket/v3 go 1.20 diff --git a/pkg/config/config.go b/pkg/config/config.go index d7c934f..eb9713d 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -8,7 +8,7 @@ import ( "text/tabwriter" "time" - "github.com/inbucket/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/v3/pkg/stringutil" "github.com/kelseyhightower/envconfig" ) diff --git a/pkg/extension/async_broker_test.go b/pkg/extension/async_broker_test.go index 253394d..8eb2187 100644 --- a/pkg/extension/async_broker_test.go +++ b/pkg/extension/async_broker_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/extension/broker_test.go b/pkg/extension/broker_test.go index d558e1b..cc3f1eb 100644 --- a/pkg/extension/broker_test.go +++ b/pkg/extension/broker_test.go @@ -3,7 +3,7 @@ package extension_test import ( "testing" - "github.com/inbucket/inbucket/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension" ) func TestBrokerEmitCallsOneListener(t *testing.T) { diff --git a/pkg/extension/host.go b/pkg/extension/host.go index 47e1b52..eb910eb 100644 --- a/pkg/extension/host.go +++ b/pkg/extension/host.go @@ -1,7 +1,7 @@ package extension import ( - "github.com/inbucket/inbucket/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/extension/event" ) // Host defines extension points for Inbucket. diff --git a/pkg/extension/luahost/bind_message.go b/pkg/extension/luahost/bind_message.go index bd308de..813502c 100644 --- a/pkg/extension/luahost/bind_message.go +++ b/pkg/extension/luahost/bind_message.go @@ -4,7 +4,7 @@ import ( "net/mail" "time" - "github.com/inbucket/inbucket/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/extension/event" lua "github.com/yuin/gopher-lua" ) diff --git a/pkg/extension/luahost/bind_message_test.go b/pkg/extension/luahost/bind_message_test.go index a88f9bb..dd6d584 100644 --- a/pkg/extension/luahost/bind_message_test.go +++ b/pkg/extension/luahost/bind_message_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/extension/event" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" lua "github.com/yuin/gopher-lua" diff --git a/pkg/extension/luahost/lua.go b/pkg/extension/luahost/lua.go index d91ce41..4bfbd4f 100644 --- a/pkg/extension/luahost/lua.go +++ b/pkg/extension/luahost/lua.go @@ -6,9 +6,9 @@ import ( "io" "os" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension/event" "github.com/rs/zerolog" "github.com/rs/zerolog/log" lua "github.com/yuin/gopher-lua" diff --git a/pkg/extension/luahost/lua_test.go b/pkg/extension/luahost/lua_test.go index e372d33..0b7dc0d 100644 --- a/pkg/extension/luahost/lua_test.go +++ b/pkg/extension/luahost/lua_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/extension/luahost" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/extension/luahost" "github.com/stretchr/testify/require" lua "github.com/yuin/gopher-lua" ) diff --git a/pkg/message/manager.go b/pkg/message/manager.go index 1249632..9e5dde1 100644 --- a/pkg/message/manager.go +++ b/pkg/message/manager.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/policy" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/policy" + "github.com/inbucket/inbucket/v3/pkg/storage" "github.com/jhillyerd/enmime" "github.com/rs/zerolog/log" ) diff --git a/pkg/message/manager_test.go b/pkg/message/manager_test.go index 88519af..fd397f1 100644 --- a/pkg/message/manager_test.go +++ b/pkg/message/manager_test.go @@ -3,10 +3,10 @@ package message_test import ( "testing" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/policy" - "github.com/inbucket/inbucket/pkg/test" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/policy" + "github.com/inbucket/inbucket/v3/pkg/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/message/message.go b/pkg/message/message.go index 24bf39c..ea3616d 100644 --- a/pkg/message/message.go +++ b/pkg/message/message.go @@ -7,8 +7,8 @@ import ( "net/textproto" "time" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/storage" "github.com/jhillyerd/enmime" ) diff --git a/pkg/msghub/hub.go b/pkg/msghub/hub.go index 07bbefe..26cc53e 100644 --- a/pkg/msghub/hub.go +++ b/pkg/msghub/hub.go @@ -4,8 +4,8 @@ import ( "container/ring" "context" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension/event" "github.com/rs/zerolog/log" ) diff --git a/pkg/msghub/hub_test.go b/pkg/msghub/hub_test.go index 8304a6d..fee893e 100644 --- a/pkg/msghub/hub_test.go +++ b/pkg/msghub/hub_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension/event" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/policy/address.go b/pkg/policy/address.go index 5988258..f1dc157 100644 --- a/pkg/policy/address.go +++ b/pkg/policy/address.go @@ -7,8 +7,8 @@ import ( "net/mail" "strings" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/stringutil" ) // Addressing handles email address policy. diff --git a/pkg/policy/address_test.go b/pkg/policy/address_test.go index 9421dc0..bbb7ea0 100644 --- a/pkg/policy/address_test.go +++ b/pkg/policy/address_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/policy" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/policy" ) func TestShouldAcceptDomain(t *testing.T) { diff --git a/pkg/rest/apiv1_controller.go b/pkg/rest/apiv1_controller.go index 84ceba6..7664a2e 100644 --- a/pkg/rest/apiv1_controller.go +++ b/pkg/rest/apiv1_controller.go @@ -10,10 +10,10 @@ import ( "encoding/json" "strconv" - "github.com/inbucket/inbucket/pkg/rest/model" - "github.com/inbucket/inbucket/pkg/server/web" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/v3/pkg/rest/model" + "github.com/inbucket/inbucket/v3/pkg/server/web" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/stringutil" ) // MailboxListV1 renders a list of messages in a mailbox diff --git a/pkg/rest/apiv1_controller_test.go b/pkg/rest/apiv1_controller_test.go index fc7c9b8..a3bffdf 100644 --- a/pkg/rest/apiv1_controller_test.go +++ b/pkg/rest/apiv1_controller_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/test" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/test" "github.com/jhillyerd/enmime" ) diff --git a/pkg/rest/client/apiv1_client.go b/pkg/rest/client/apiv1_client.go index a3af5ec..ce8990a 100644 --- a/pkg/rest/client/apiv1_client.go +++ b/pkg/rest/client/apiv1_client.go @@ -8,7 +8,7 @@ import ( "net/url" "time" - "github.com/inbucket/inbucket/pkg/rest/model" + "github.com/inbucket/inbucket/v3/pkg/rest/model" ) // Client accesses the Inbucket REST API v1 diff --git a/pkg/rest/client/apiv1_client_test.go b/pkg/rest/client/apiv1_client_test.go index e7bb4c1..1aa6667 100644 --- a/pkg/rest/client/apiv1_client_test.go +++ b/pkg/rest/client/apiv1_client_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/v3/pkg/rest/client" ) func TestClientV1ListMailbox(t *testing.T) { diff --git a/pkg/rest/client/example_test.go b/pkg/rest/client/example_test.go index 5723dd2..f827162 100644 --- a/pkg/rest/client/example_test.go +++ b/pkg/rest/client/example_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "github.com/gorilla/mux" - "github.com/inbucket/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/v3/pkg/rest/client" ) // Example demonstrates basic usage for the Inbucket REST client. diff --git a/pkg/rest/routes.go b/pkg/rest/routes.go index 3fc5b40..7d05f58 100644 --- a/pkg/rest/routes.go +++ b/pkg/rest/routes.go @@ -1,7 +1,7 @@ package rest import "github.com/gorilla/mux" -import "github.com/inbucket/inbucket/pkg/server/web" +import "github.com/inbucket/inbucket/v3/pkg/server/web" // SetupRoutes populates the routes for the REST interface func SetupRoutes(r *mux.Router) { diff --git a/pkg/rest/socketv1_controller.go b/pkg/rest/socketv1_controller.go index c564ae5..cfc82de 100644 --- a/pkg/rest/socketv1_controller.go +++ b/pkg/rest/socketv1_controller.go @@ -5,11 +5,11 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/msghub" - "github.com/inbucket/inbucket/pkg/rest/model" - "github.com/inbucket/inbucket/pkg/server/web" - "github.com/inbucket/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/msghub" + "github.com/inbucket/inbucket/v3/pkg/rest/model" + "github.com/inbucket/inbucket/v3/pkg/server/web" + "github.com/inbucket/inbucket/v3/pkg/stringutil" "github.com/rs/zerolog/log" ) diff --git a/pkg/rest/socketv2_controller.go b/pkg/rest/socketv2_controller.go index fa70c1c..1f41b98 100644 --- a/pkg/rest/socketv2_controller.go +++ b/pkg/rest/socketv2_controller.go @@ -5,10 +5,10 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/msghub" - "github.com/inbucket/inbucket/pkg/rest/model" - "github.com/inbucket/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/msghub" + "github.com/inbucket/inbucket/v3/pkg/rest/model" + "github.com/inbucket/inbucket/v3/pkg/server/web" "github.com/rs/zerolog/log" ) diff --git a/pkg/rest/testutils_test.go b/pkg/rest/testutils_test.go index a08eb87..68dfb43 100644 --- a/pkg/rest/testutils_test.go +++ b/pkg/rest/testutils_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/msghub" - "github.com/inbucket/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/msghub" + "github.com/inbucket/inbucket/v3/pkg/server/web" ) func testRestGet(url string) (*httptest.ResponseRecorder, error) { diff --git a/pkg/server/lifecycle.go b/pkg/server/lifecycle.go index b754460..8687012 100644 --- a/pkg/server/lifecycle.go +++ b/pkg/server/lifecycle.go @@ -4,19 +4,19 @@ import ( "context" "sync" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/extension/luahost" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/msghub" - "github.com/inbucket/inbucket/pkg/policy" - "github.com/inbucket/inbucket/pkg/rest" - "github.com/inbucket/inbucket/pkg/server/pop3" - "github.com/inbucket/inbucket/pkg/server/smtp" - "github.com/inbucket/inbucket/pkg/server/web" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/stringutil" - "github.com/inbucket/inbucket/pkg/webui" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension/luahost" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/msghub" + "github.com/inbucket/inbucket/v3/pkg/policy" + "github.com/inbucket/inbucket/v3/pkg/rest" + "github.com/inbucket/inbucket/v3/pkg/server/pop3" + "github.com/inbucket/inbucket/v3/pkg/server/smtp" + "github.com/inbucket/inbucket/v3/pkg/server/web" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/stringutil" + "github.com/inbucket/inbucket/v3/pkg/webui" ) // Services holds the configured services. diff --git a/pkg/server/pop3/handler.go b/pkg/server/pop3/handler.go index 0633359..beb1bf2 100644 --- a/pkg/server/pop3/handler.go +++ b/pkg/server/pop3/handler.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/storage" "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) diff --git a/pkg/server/pop3/handler_test.go b/pkg/server/pop3/handler_test.go index db5573d..ca4b663 100644 --- a/pkg/server/pop3/handler_test.go +++ b/pkg/server/pop3/handler_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/test" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/test" ) func TestNoTLS(t *testing.T) { diff --git a/pkg/server/pop3/listener.go b/pkg/server/pop3/listener.go index 32d72ea..5333a6c 100644 --- a/pkg/server/pop3/listener.go +++ b/pkg/server/pop3/listener.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/storage" "github.com/rs/zerolog/log" ) diff --git a/pkg/server/smtp/handler.go b/pkg/server/smtp/handler.go index 6e8fcf2..6b2e625 100644 --- a/pkg/server/smtp/handler.go +++ b/pkg/server/smtp/handler.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/policy" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/policy" "github.com/rs/zerolog" ) diff --git a/pkg/server/smtp/handler_test.go b/pkg/server/smtp/handler_test.go index 126ae83..fd342f6 100644 --- a/pkg/server/smtp/handler_test.go +++ b/pkg/server/smtp/handler_test.go @@ -9,13 +9,13 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/policy" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/test" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/policy" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/test" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" ) diff --git a/pkg/server/smtp/listener.go b/pkg/server/smtp/listener.go index 382f1e4..5ce7a42 100644 --- a/pkg/server/smtp/listener.go +++ b/pkg/server/smtp/listener.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/metric" - "github.com/inbucket/inbucket/pkg/policy" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/metric" + "github.com/inbucket/inbucket/v3/pkg/policy" "github.com/rs/zerolog/log" ) diff --git a/pkg/server/web/context.go b/pkg/server/web/context.go index 5174062..63139ef 100644 --- a/pkg/server/web/context.go +++ b/pkg/server/web/context.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/msghub" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/msghub" ) // Context is passed into every request handler function diff --git a/pkg/server/web/handlers.go b/pkg/server/web/handlers.go index 04341b0..d19d232 100644 --- a/pkg/server/web/handlers.go +++ b/pkg/server/web/handlers.go @@ -5,7 +5,7 @@ import ( "net/http" "os" - "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/config" "github.com/rs/zerolog/log" ) diff --git a/pkg/server/web/server.go b/pkg/server/web/server.go index 9e0e4f4..b05aa88 100644 --- a/pkg/server/web/server.go +++ b/pkg/server/web/server.go @@ -15,10 +15,10 @@ import ( "time" "github.com/gorilla/mux" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/msghub" - "github.com/inbucket/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/msghub" + "github.com/inbucket/inbucket/v3/pkg/stringutil" "github.com/rs/zerolog/log" ) diff --git a/pkg/storage/file/fstore.go b/pkg/storage/file/fstore.go index be805ed..fe934f0 100644 --- a/pkg/storage/file/fstore.go +++ b/pkg/storage/file/fstore.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/stringutil" "github.com/rs/zerolog/log" ) diff --git a/pkg/storage/file/fstore_test.go b/pkg/storage/file/fstore_test.go index d83a874..fccd835 100644 --- a/pkg/storage/file/fstore_test.go +++ b/pkg/storage/file/fstore_test.go @@ -12,12 +12,12 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/test" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/test" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/file/mbox.go b/pkg/storage/file/mbox.go index 035f450..97725a3 100644 --- a/pkg/storage/file/mbox.go +++ b/pkg/storage/file/mbox.go @@ -9,8 +9,8 @@ import ( "path/filepath" "sync" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/storage" "github.com/rs/zerolog/log" ) diff --git a/pkg/storage/lock_test.go b/pkg/storage/lock_test.go index 2aa8da2..d65d064 100644 --- a/pkg/storage/lock_test.go +++ b/pkg/storage/lock_test.go @@ -3,7 +3,7 @@ package storage_test import ( "testing" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/storage" ) func TestHashLock(t *testing.T) { diff --git a/pkg/storage/mem/message.go b/pkg/storage/mem/message.go index 2fee702..7701f36 100644 --- a/pkg/storage/mem/message.go +++ b/pkg/storage/mem/message.go @@ -7,7 +7,7 @@ import ( "net/mail" "time" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/storage" ) // Message is a memory store message. diff --git a/pkg/storage/mem/store.go b/pkg/storage/mem/store.go index c25b30e..6d51152 100644 --- a/pkg/storage/mem/store.go +++ b/pkg/storage/mem/store.go @@ -7,10 +7,10 @@ import ( "strconv" "sync" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/storage" ) // Store implements an in-memory message store. diff --git a/pkg/storage/mem/store_test.go b/pkg/storage/mem/store_test.go index efdf2bf..ece95b9 100644 --- a/pkg/storage/mem/store_test.go +++ b/pkg/storage/mem/store_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/test" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/test" ) // TestSuite runs storage package test suite on file store. diff --git a/pkg/storage/retention.go b/pkg/storage/retention.go index 70ed315..208cbaa 100644 --- a/pkg/storage/retention.go +++ b/pkg/storage/retention.go @@ -6,8 +6,8 @@ import ( "expvar" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/metric" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/metric" "github.com/rs/zerolog/log" ) diff --git a/pkg/storage/retention_test.go b/pkg/storage/retention_test.go index 3f2b55a..0a4f45f 100644 --- a/pkg/storage/retention_test.go +++ b/pkg/storage/retention_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/test" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/test" ) func TestDoRetentionScan(t *testing.T) { diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index a9c00ec..a3a6329 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -8,8 +8,8 @@ import ( "net/mail" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" ) var ( diff --git a/pkg/stringutil/utils_test.go b/pkg/stringutil/utils_test.go index 8163736..f245f92 100644 --- a/pkg/stringutil/utils_test.go +++ b/pkg/stringutil/utils_test.go @@ -5,7 +5,7 @@ import ( "net/mail" "testing" - "github.com/inbucket/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/v3/pkg/stringutil" ) func TestHashMailboxName(t *testing.T) { diff --git a/pkg/test/integration_test.go b/pkg/test/integration_test.go index fc91c5d..c65bddc 100644 --- a/pkg/test/integration_test.go +++ b/pkg/test/integration_test.go @@ -11,18 +11,18 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/msghub" - "github.com/inbucket/inbucket/pkg/policy" - "github.com/inbucket/inbucket/pkg/rest" - "github.com/inbucket/inbucket/pkg/rest/client" - "github.com/inbucket/inbucket/pkg/server/smtp" - "github.com/inbucket/inbucket/pkg/server/web" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/storage/mem" - "github.com/inbucket/inbucket/pkg/webui" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/msghub" + "github.com/inbucket/inbucket/v3/pkg/policy" + "github.com/inbucket/inbucket/v3/pkg/rest" + "github.com/inbucket/inbucket/v3/pkg/rest/client" + "github.com/inbucket/inbucket/v3/pkg/server/smtp" + "github.com/inbucket/inbucket/v3/pkg/server/web" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/storage/mem" + "github.com/inbucket/inbucket/v3/pkg/webui" "github.com/jhillyerd/goldiff" "github.com/rs/zerolog" "github.com/rs/zerolog/log" diff --git a/pkg/test/manager.go b/pkg/test/manager.go index bef8d8e..5a4e2ba 100644 --- a/pkg/test/manager.go +++ b/pkg/test/manager.go @@ -3,11 +3,11 @@ package test import ( "errors" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/policy" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/policy" + "github.com/inbucket/inbucket/v3/pkg/storage" ) // ManagerStub is a test stub for message.Manager diff --git a/pkg/test/storage.go b/pkg/test/storage.go index 9c9571d..4137688 100644 --- a/pkg/test/storage.go +++ b/pkg/test/storage.go @@ -3,7 +3,7 @@ package test import ( "errors" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/storage" ) // StoreStub stubs storage.Store for testing. diff --git a/pkg/test/storage_suite.go b/pkg/test/storage_suite.go index c4b4d9d..3050054 100644 --- a/pkg/test/storage_suite.go +++ b/pkg/test/storage_suite.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/extension" - "github.com/inbucket/inbucket/pkg/extension/event" - "github.com/inbucket/inbucket/pkg/message" - "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/extension" + "github.com/inbucket/inbucket/v3/pkg/extension/event" + "github.com/inbucket/inbucket/v3/pkg/message" + "github.com/inbucket/inbucket/v3/pkg/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/webui/mailbox_controller.go b/pkg/webui/mailbox_controller.go index f002a9c..f9374fe 100644 --- a/pkg/webui/mailbox_controller.go +++ b/pkg/webui/mailbox_controller.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - "github.com/inbucket/inbucket/pkg/server/web" - "github.com/inbucket/inbucket/pkg/storage" - "github.com/inbucket/inbucket/pkg/stringutil" - "github.com/inbucket/inbucket/pkg/webui/sanitize" + "github.com/inbucket/inbucket/v3/pkg/server/web" + "github.com/inbucket/inbucket/v3/pkg/storage" + "github.com/inbucket/inbucket/v3/pkg/stringutil" + "github.com/inbucket/inbucket/v3/pkg/webui/sanitize" "github.com/rs/zerolog/log" ) diff --git a/pkg/webui/root_controller.go b/pkg/webui/root_controller.go index ca71e0e..2282186 100644 --- a/pkg/webui/root_controller.go +++ b/pkg/webui/root_controller.go @@ -5,8 +5,8 @@ import ( "net/http" "os" - "github.com/inbucket/inbucket/pkg/config" - "github.com/inbucket/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/v3/pkg/config" + "github.com/inbucket/inbucket/v3/pkg/server/web" ) // RootGreeting serves the Inbucket greeting. diff --git a/pkg/webui/routes.go b/pkg/webui/routes.go index 3797daf..e603040 100644 --- a/pkg/webui/routes.go +++ b/pkg/webui/routes.go @@ -3,7 +3,7 @@ package webui import ( "github.com/gorilla/mux" - "github.com/inbucket/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/v3/pkg/server/web" ) // SetupRoutes populates routes for the webui into the provided Router. diff --git a/pkg/webui/sanitize/html_test.go b/pkg/webui/sanitize/html_test.go index 678c9d7..1a61409 100644 --- a/pkg/webui/sanitize/html_test.go +++ b/pkg/webui/sanitize/html_test.go @@ -3,7 +3,7 @@ package sanitize_test import ( "testing" - "github.com/inbucket/inbucket/pkg/webui/sanitize" + "github.com/inbucket/inbucket/v3/pkg/webui/sanitize" ) // TestHTMLPlainStrings test plain text passthrough