diff --git a/api4/api.go b/api4/api.go index b024bb92b8..3dd7236c3a 100644 --- a/api4/api.go +++ b/api4/api.go @@ -7,10 +7,10 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/configservice" - "github.com/mattermost/mattermost-server/web" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/configservice" + "github.com/mattermost/mattermost-server/v5/web" _ "github.com/mattermost/go-i18n/i18n" ) diff --git a/api4/apitestlib.go b/api4/apitestlib.go index c2e6cdae98..4dec81bb1d 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -13,14 +13,14 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/web" - "github.com/mattermost/mattermost-server/wsapi" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/web" + "github.com/mattermost/mattermost-server/v5/wsapi" s3 "github.com/minio/minio-go/v6" "github.com/minio/minio-go/v6/pkg/credentials" diff --git a/api4/bot.go b/api4/bot.go index 6d9db44193..f5efad1e8a 100644 --- a/api4/bot.go +++ b/api4/bot.go @@ -10,7 +10,7 @@ import ( "net/http" "strconv" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitBot() { diff --git a/api4/bot_test.go b/api4/bot_test.go index ce080c0284..e19e2ed86c 100644 --- a/api4/bot_test.go +++ b/api4/bot_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/require" ) diff --git a/api4/brand.go b/api4/brand.go index c222e2569d..336cf91dc1 100644 --- a/api4/brand.go +++ b/api4/brand.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitBrand() { diff --git a/api4/brand_test.go b/api4/brand_test.go index a3cd5738b2..3d88337878 100644 --- a/api4/brand_test.go +++ b/api4/brand_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/require" ) diff --git a/api4/channel.go b/api4/channel.go index 5396a83646..ed51de2a82 100644 --- a/api4/channel.go +++ b/api4/channel.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func (api *API) InitChannel() { diff --git a/api4/channel_test.go b/api4/channel_test.go index 66c6cba07f..147fa8e2df 100644 --- a/api4/channel_test.go +++ b/api4/channel_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/cluster.go b/api4/cluster.go index 095e260abb..3fbd3c79f1 100644 --- a/api4/cluster.go +++ b/api4/cluster.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitCluster() { diff --git a/api4/cluster_test.go b/api4/cluster_test.go index 25287671f2..04d231acd3 100644 --- a/api4/cluster_test.go +++ b/api4/cluster_test.go @@ -6,7 +6,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/api4/command.go b/api4/command.go index db798b1bdd..b4eb4601c4 100644 --- a/api4/command.go +++ b/api4/command.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitCommand() { diff --git a/api4/command_help_test.go b/api4/command_help_test.go index 87a223e8dd..73e0e5463e 100644 --- a/api4/command_help_test.go +++ b/api4/command_help_test.go @@ -6,7 +6,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" ) diff --git a/api4/command_test.go b/api4/command_test.go index 7dddd313b1..66747a58c2 100644 --- a/api4/command_test.go +++ b/api4/command_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestCreateCommand(t *testing.T) { diff --git a/api4/commands_test.go b/api4/commands_test.go index 7dce542648..8b4246b9c0 100644 --- a/api4/commands_test.go +++ b/api4/commands_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/api4/compliance.go b/api4/compliance.go index 67987fbc59..8a545871f8 100644 --- a/api4/compliance.go +++ b/api4/compliance.go @@ -8,7 +8,7 @@ import ( "strconv" "github.com/avct/uasurfer" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitCompliance() { diff --git a/api4/config.go b/api4/config.go index 0be330cb94..24986f848d 100644 --- a/api4/config.go +++ b/api4/config.go @@ -7,9 +7,9 @@ import ( "net/http" "reflect" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func (api *API) InitConfig() { diff --git a/api4/config_test.go b/api4/config_test.go index 9aef79563b..922828d83c 100644 --- a/api4/config_test.go +++ b/api4/config_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/cors_test.go b/api4/cors_test.go index 34dd0fd4b6..a3e6c768ef 100644 --- a/api4/cors_test.go +++ b/api4/cors_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/elasticsearch.go b/api4/elasticsearch.go index 1e0a3a9068..8175f78170 100644 --- a/api4/elasticsearch.go +++ b/api4/elasticsearch.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitElasticsearch() { diff --git a/api4/elasticsearch_test.go b/api4/elasticsearch_test.go index db005015b0..bd06b42640 100644 --- a/api4/elasticsearch_test.go +++ b/api4/elasticsearch_test.go @@ -6,7 +6,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestElasticsearchTest(t *testing.T) { diff --git a/api4/emoji.go b/api4/emoji.go index 81c3e0752a..bcfeb3e65d 100644 --- a/api4/emoji.go +++ b/api4/emoji.go @@ -9,9 +9,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/web" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/web" ) const ( diff --git a/api4/emoji_test.go b/api4/emoji_test.go index 68b05bafb8..9681643e7e 100644 --- a/api4/emoji_test.go +++ b/api4/emoji_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func TestCreateEmoji(t *testing.T) { diff --git a/api4/file.go b/api4/file.go index ef3f410d4b..73f7e59eec 100644 --- a/api4/file.go +++ b/api4/file.go @@ -16,9 +16,9 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/api4/file_test.go b/api4/file_test.go index b451155715..7248ad398b 100644 --- a/api4/file_test.go +++ b/api4/file_test.go @@ -19,10 +19,10 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/group.go b/api4/group.go index a0434e0ed8..302d865791 100644 --- a/api4/group.go +++ b/api4/group.go @@ -10,7 +10,7 @@ import ( "io/ioutil" "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitGroup() { diff --git a/api4/group_test.go b/api4/group_test.go index b6cb0361ae..916ae43cf7 100644 --- a/api4/group_test.go +++ b/api4/group_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/handlers.go b/api4/handlers.go index 4bfdaa52ab..3b2b9d89b7 100644 --- a/api4/handlers.go +++ b/api4/handlers.go @@ -7,7 +7,7 @@ import ( "net/http" "github.com/NYTimes/gziphandler" - "github.com/mattermost/mattermost-server/web" + "github.com/mattermost/mattermost-server/v5/web" ) type Context = web.Context diff --git a/api4/handlers_test.go b/api4/handlers_test.go index 6a013f5146..51cd17dce0 100644 --- a/api4/handlers_test.go +++ b/api4/handlers_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func handlerForGzip(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api4/image_test.go b/api4/image_test.go index e06fca8d5f..6e7e6bb431 100644 --- a/api4/image_test.go +++ b/api4/image_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestGetImage(t *testing.T) { diff --git a/api4/integration_action.go b/api4/integration_action.go index 8aee0b8e2f..dec2f43f72 100644 --- a/api4/integration_action.go +++ b/api4/integration_action.go @@ -7,7 +7,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitAction() { diff --git a/api4/integration_action_test.go b/api4/integration_action_test.go index c543d851d2..12e4fe5d12 100644 --- a/api4/integration_action_test.go +++ b/api4/integration_action_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/api4/job.go b/api4/job.go index 3167222647..289664ba95 100644 --- a/api4/job.go +++ b/api4/job.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitJob() { diff --git a/api4/job_test.go b/api4/job_test.go index f24d4abde3..cc3b9734c1 100644 --- a/api4/job_test.go +++ b/api4/job_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/api4/ldap.go b/api4/ldap.go index 573e2b93af..0846886990 100644 --- a/api4/ldap.go +++ b/api4/ldap.go @@ -8,7 +8,7 @@ import ( "encoding/json" "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type mixedUnlinkedGroup struct { diff --git a/api4/ldap_test.go b/api4/ldap_test.go index 9cb9dffc3a..99351df0d1 100644 --- a/api4/ldap_test.go +++ b/api4/ldap_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestTestLdap(t *testing.T) { diff --git a/api4/license.go b/api4/license.go index b21bd9a980..445a51cdff 100644 --- a/api4/license.go +++ b/api4/license.go @@ -8,7 +8,7 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitLicense() { diff --git a/api4/license_test.go b/api4/license_test.go index 97c7c24501..f2ab5ddff5 100644 --- a/api4/license_test.go +++ b/api4/license_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestGetOldClientLicense(t *testing.T) { diff --git a/api4/main_test.go b/api4/main_test.go index f2c7f8f457..f554800069 100644 --- a/api4/main_test.go +++ b/api4/main_test.go @@ -6,7 +6,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/api4/oauth.go b/api4/oauth.go index 2c4bd7123d..e893225921 100644 --- a/api4/oauth.go +++ b/api4/oauth.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitOAuth() { diff --git a/api4/oauth_test.go b/api4/oauth_test.go index 4d4c5e5ced..54da44c534 100644 --- a/api4/oauth_test.go +++ b/api4/oauth_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/openGraph.go b/api4/openGraph.go index e8528497ff..5de4474f8e 100644 --- a/api4/openGraph.go +++ b/api4/openGraph.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) const OPEN_GRAPH_METADATA_CACHE_SIZE = 10000 diff --git a/api4/openGraph_test.go b/api4/openGraph_test.go index c4be33f25b..3faf17e4b7 100644 --- a/api4/openGraph_test.go +++ b/api4/openGraph_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestGetOpenGraphMetadata(t *testing.T) { diff --git a/api4/plugin.go b/api4/plugin.go index 67d29b4c11..8b708e25cf 100644 --- a/api4/plugin.go +++ b/api4/plugin.go @@ -14,8 +14,8 @@ import ( "net/url" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/api4/plugin_test.go b/api4/plugin_test.go index 87db556d88..504b1da87c 100644 --- a/api4/plugin_test.go +++ b/api4/plugin_test.go @@ -17,9 +17,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/testlib" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/testlib" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/post.go b/api4/post.go index e21ec66305..d297fc9d7f 100644 --- a/api4/post.go +++ b/api4/post.go @@ -9,8 +9,8 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitPost() { diff --git a/api4/post_test.go b/api4/post_test.go index a5cf617296..cd43ae20aa 100644 --- a/api4/post_test.go +++ b/api4/post_test.go @@ -19,10 +19,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/testutils" ) func TestCreatePost(t *testing.T) { diff --git a/api4/preference.go b/api4/preference.go index c10ca44312..e5880efaf9 100644 --- a/api4/preference.go +++ b/api4/preference.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitPreference() { diff --git a/api4/preference_test.go b/api4/preference_test.go index 114c73ff4e..86786ee88e 100644 --- a/api4/preference_test.go +++ b/api4/preference_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestGetPreferences(t *testing.T) { diff --git a/api4/reaction.go b/api4/reaction.go index 882cb46a8c..bb81bb11ce 100644 --- a/api4/reaction.go +++ b/api4/reaction.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitReaction() { diff --git a/api4/reaction_test.go b/api4/reaction_test.go index b3cc8a28ee..2f063bd219 100644 --- a/api4/reaction_test.go +++ b/api4/reaction_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/role.go b/api4/role.go index cdb0800b15..001036e33e 100644 --- a/api4/role.go +++ b/api4/role.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitRole() { diff --git a/api4/role_test.go b/api4/role_test.go index c722ac4a78..07edbdae08 100644 --- a/api4/role_test.go +++ b/api4/role_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestGetRole(t *testing.T) { diff --git a/api4/saml.go b/api4/saml.go index ed1cd68110..6b403a732e 100644 --- a/api4/saml.go +++ b/api4/saml.go @@ -7,7 +7,7 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitSaml() { diff --git a/api4/scheme.go b/api4/scheme.go index c1438ab555..9cd9618b4d 100644 --- a/api4/scheme.go +++ b/api4/scheme.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitScheme() { diff --git a/api4/scheme_test.go b/api4/scheme_test.go index c2fd510701..1a4f63de30 100644 --- a/api4/scheme_test.go +++ b/api4/scheme_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestCreateScheme(t *testing.T) { diff --git a/api4/status.go b/api4/status.go index f602825d96..c01bfda205 100644 --- a/api4/status.go +++ b/api4/status.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitStatus() { diff --git a/api4/status_test.go b/api4/status_test.go index 5d47a9ead3..ac2c43ed5b 100644 --- a/api4/status_test.go +++ b/api4/status_test.go @@ -3,7 +3,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" ) diff --git a/api4/system.go b/api4/system.go index c985efd96c..3601aa95e3 100644 --- a/api4/system.go +++ b/api4/system.go @@ -11,10 +11,10 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/filesstore" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/filesstore" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/api4/system_test.go b/api4/system_test.go index 05da0a4266..3a3dcbc269 100644 --- a/api4/system_test.go +++ b/api4/system_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/team.go b/api4/team.go index 9b26abb189..4afcf45127 100644 --- a/api4/team.go +++ b/api4/team.go @@ -15,7 +15,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/api4/team_test.go b/api4/team_test.go index bb923004d3..71621a4291 100644 --- a/api4/team_test.go +++ b/api4/team_test.go @@ -13,11 +13,11 @@ import ( "encoding/base64" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/mailservice" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/mailservice" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/terms_of_service.go b/api4/terms_of_service.go index e1cc5d66b4..560c0f1f7e 100644 --- a/api4/terms_of_service.go +++ b/api4/terms_of_service.go @@ -6,8 +6,8 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitTermsOfService() { diff --git a/api4/terms_of_service_test.go b/api4/terms_of_service_test.go index 3e04f82434..00a9b6721f 100644 --- a/api4/terms_of_service_test.go +++ b/api4/terms_of_service_test.go @@ -3,7 +3,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/user.go b/api4/user.go index 036c7a0811..ad1aa00010 100644 --- a/api4/user.go +++ b/api4/user.go @@ -12,11 +12,11 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) func (api *API) InitUser() { diff --git a/api4/user_test.go b/api4/user_test.go index 5f31f43992..397de123ba 100644 --- a/api4/user_test.go +++ b/api4/user_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/dgryski/dgoogauth" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/mailservice" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/mailservice" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/api4/user_viewmembers_test.go b/api4/user_viewmembers_test.go index dbcf163950..7306647945 100644 --- a/api4/user_viewmembers_test.go +++ b/api4/user_viewmembers_test.go @@ -3,7 +3,7 @@ package api4 import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/api4/webhook.go b/api4/webhook.go index 18077d3a62..5cef95b93e 100644 --- a/api4/webhook.go +++ b/api4/webhook.go @@ -6,7 +6,7 @@ package api4 import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitWebhook() { diff --git a/api4/webhook_test.go b/api4/webhook_test.go index 0ffaf44776..d2afa7ca88 100644 --- a/api4/webhook_test.go +++ b/api4/webhook_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestCreateIncomingWebhook(t *testing.T) { diff --git a/api4/websocket.go b/api4/websocket.go index 85eaf87d39..4d458bfda7 100644 --- a/api4/websocket.go +++ b/api4/websocket.go @@ -7,8 +7,8 @@ import ( "net/http" "github.com/gorilla/websocket" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitWebSocket() { diff --git a/api4/websocket_test.go b/api4/websocket_test.go index 8450684f7a..a90ff8df28 100644 --- a/api4/websocket_test.go +++ b/api4/websocket_test.go @@ -13,7 +13,7 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestWebSocket(t *testing.T) { diff --git a/app/admin.go b/app/admin.go index 91898efe92..6169dc5e62 100644 --- a/app/admin.go +++ b/app/admin.go @@ -13,10 +13,10 @@ import ( "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/mailservice" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/mailservice" + "github.com/mattermost/mattermost-server/v5/utils" ) func (a *App) GetLogs(page, perPage int) ([]string, *model.AppError) { diff --git a/app/analytics.go b/app/analytics.go index e7a8600f2a..4a01743949 100644 --- a/app/analytics.go +++ b/app/analytics.go @@ -4,9 +4,9 @@ package app import ( - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) const ( diff --git a/app/app.go b/app/app.go index 8862da17e0..fd94a20322 100644 --- a/app/app.go +++ b/app/app.go @@ -9,14 +9,14 @@ import ( "strconv" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/jobs" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/httpservice" - "github.com/mattermost/mattermost-server/services/imageproxy" - "github.com/mattermost/mattermost-server/services/timezones" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/jobs" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/httpservice" + "github.com/mattermost/mattermost-server/v5/services/imageproxy" + "github.com/mattermost/mattermost-server/v5/services/timezones" + "github.com/mattermost/mattermost-server/v5/utils" ) type App struct { diff --git a/app/app_test.go b/app/app_test.go index 2701829a34..a294a916d1 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) /* Temporarily comment out until MM-11108 diff --git a/app/audit.go b/app/audit.go index 9382372ccf..8e8847c745 100644 --- a/app/audit.go +++ b/app/audit.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) GetAudits(userId string, limit int) (model.Audits, *model.AppError) { diff --git a/app/authentication.go b/app/authentication.go index c5c4ebf907..fbd232d593 100644 --- a/app/authentication.go +++ b/app/authentication.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/mfa" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/mfa" + "github.com/mattermost/mattermost-server/v5/utils" ) type TokenLocation int diff --git a/app/authentication_test.go b/app/authentication_test.go index f3014b1b8c..4daa77b962 100644 --- a/app/authentication_test.go +++ b/app/authentication_test.go @@ -9,7 +9,7 @@ import ( "strconv" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/app/authorization.go b/app/authorization.go index de1fc96e74..8b655e77f5 100644 --- a/app/authorization.go +++ b/app/authorization.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) MakePermissionError(permission *model.Permission) *model.AppError { diff --git a/app/authorization_test.go b/app/authorization_test.go index e8a32ebde6..bf4f8a8ab3 100644 --- a/app/authorization_test.go +++ b/app/authorization_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestCheckIfRolesGrantPermission(t *testing.T) { diff --git a/app/auto_channels.go b/app/auto_channels.go index 72561d2b94..74f1c82da7 100644 --- a/app/auto_channels.go +++ b/app/auto_channels.go @@ -4,8 +4,8 @@ package app import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type AutoChannelCreator struct { diff --git a/app/auto_constants.go b/app/auto_constants.go index 520d4e3630..0f86d3e081 100644 --- a/app/auto_constants.go +++ b/app/auto_constants.go @@ -4,8 +4,8 @@ package app import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/app/auto_environment.go b/app/auto_environment.go index 6889403373..7d6781c96e 100644 --- a/app/auto_environment.go +++ b/app/auto_environment.go @@ -7,8 +7,8 @@ import ( "math/rand" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type TestEnvironment struct { diff --git a/app/auto_posts.go b/app/auto_posts.go index bded3f202e..2707a77d05 100644 --- a/app/auto_posts.go +++ b/app/auto_posts.go @@ -9,9 +9,9 @@ import ( "os" "path/filepath" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) type AutoPostCreator struct { diff --git a/app/auto_responder.go b/app/auto_responder.go index 1104536113..c4c4deb45c 100644 --- a/app/auto_responder.go +++ b/app/auto_responder.go @@ -4,8 +4,8 @@ package app import ( - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) SendAutoResponseIfNecessary(channel *model.Channel, sender *model.User) (bool, *model.AppError) { diff --git a/app/auto_responder_test.go b/app/auto_responder_test.go index 20548d1e03..cec5bf8386 100644 --- a/app/auto_responder_test.go +++ b/app/auto_responder_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/auto_teams.go b/app/auto_teams.go index e322e8c66a..1ace888a99 100644 --- a/app/auto_teams.go +++ b/app/auto_teams.go @@ -4,8 +4,8 @@ package app import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type TeamEnvironment struct { diff --git a/app/auto_users.go b/app/auto_users.go index 7528377af9..56253d1c5a 100644 --- a/app/auto_users.go +++ b/app/auto_users.go @@ -4,9 +4,9 @@ package app import ( - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type AutoUserCreator struct { diff --git a/app/bot.go b/app/bot.go index 1e9561488f..964b2d450c 100644 --- a/app/bot.go +++ b/app/bot.go @@ -9,10 +9,10 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) // CreateBot creates the given bot and corresponding user. diff --git a/app/bot_test.go b/app/bot_test.go index 11c91b0a00..b6fa64c2fb 100644 --- a/app/bot_test.go +++ b/app/bot_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) func TestCreateBot(t *testing.T) { diff --git a/app/brand.go b/app/brand.go index b643842d1c..95e05a6bac 100644 --- a/app/brand.go +++ b/app/brand.go @@ -13,7 +13,7 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/app/channel.go b/app/channel.go index 5bfee5ca45..cba7e9ef5f 100644 --- a/app/channel.go +++ b/app/channel.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) // CreateDefaultChannels creates channels in the given team for each channel returned by (*App).DefaultChannelNames. diff --git a/app/channel_test.go b/app/channel_test.go index 10c27226da..133e0ad699 100644 --- a/app/channel_test.go +++ b/app/channel_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestPermanentDeleteChannel(t *testing.T) { diff --git a/app/cluster.go b/app/cluster.go index 54556f3c77..8dc9269bb2 100644 --- a/app/cluster.go +++ b/app/cluster.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // Registers a given function to be called when the cluster leader may have changed. Returns a unique ID for the diff --git a/app/cluster_discovery.go b/app/cluster_discovery.go index cbda90f9d0..133ea3aac0 100644 --- a/app/cluster_discovery.go +++ b/app/cluster_discovery.go @@ -6,8 +6,8 @@ package app import ( "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/app/cluster_discovery_test.go b/app/cluster_discovery_test.go index 8d1f380528..b75cb895f4 100644 --- a/app/cluster_discovery_test.go +++ b/app/cluster_discovery_test.go @@ -8,7 +8,7 @@ import ( "time" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestClusterDiscoveryService(t *testing.T) { diff --git a/app/cluster_handlers.go b/app/cluster_handlers.go index cdca7b2a71..5787b084b0 100644 --- a/app/cluster_handlers.go +++ b/app/cluster_handlers.go @@ -6,7 +6,7 @@ package app import ( "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) RegisterAllClusterMessageHandlers() { diff --git a/app/command.go b/app/command.go index 678031dbbb..599ee88cc8 100644 --- a/app/command.go +++ b/app/command.go @@ -12,10 +12,10 @@ import ( "strings" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) type CommandProvider interface { diff --git a/app/command_away.go b/app/command_away.go index 4fd25cb9e3..ae4e6cc382 100644 --- a/app/command_away.go +++ b/app/command_away.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type AwayProvider struct { diff --git a/app/command_channel_header.go b/app/command_channel_header.go index a6fc84013d..fbacd7dd7e 100644 --- a/app/command_channel_header.go +++ b/app/command_channel_header.go @@ -6,7 +6,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type HeaderProvider struct { diff --git a/app/command_channel_header_test.go b/app/command_channel_header_test.go index fb042dee7c..05cfb12679 100644 --- a/app/command_channel_header_test.go +++ b/app/command_channel_header_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestHeaderProviderDoCommand(t *testing.T) { diff --git a/app/command_channel_purpose.go b/app/command_channel_purpose.go index c66e9318c2..f143fa24f2 100644 --- a/app/command_channel_purpose.go +++ b/app/command_channel_purpose.go @@ -6,7 +6,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type PurposeProvider struct { diff --git a/app/command_channel_purpose_test.go b/app/command_channel_purpose_test.go index 432ab566ef..93079725e9 100644 --- a/app/command_channel_purpose_test.go +++ b/app/command_channel_purpose_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestPurposeProviderDoCommand(t *testing.T) { diff --git a/app/command_channel_rename.go b/app/command_channel_rename.go index 581ee1096d..a96a4ffb8d 100644 --- a/app/command_channel_rename.go +++ b/app/command_channel_rename.go @@ -6,7 +6,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type RenameProvider struct { diff --git a/app/command_channel_rename_test.go b/app/command_channel_rename_test.go index c775b09b7c..9a8f81fdb3 100644 --- a/app/command_channel_rename_test.go +++ b/app/command_channel_rename_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestRenameProviderDoCommand(t *testing.T) { diff --git a/app/command_code.go b/app/command_code.go index a181bb8a42..73c2e6a347 100644 --- a/app/command_code.go +++ b/app/command_code.go @@ -7,7 +7,7 @@ import ( "strings" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type CodeProvider struct { diff --git a/app/command_code_test.go b/app/command_code_test.go index 89699ab3f8..890fa9122f 100644 --- a/app/command_code_test.go +++ b/app/command_code_test.go @@ -3,7 +3,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestCodeProviderDoCommand(t *testing.T) { diff --git a/app/command_dnd.go b/app/command_dnd.go index 30d0ce6798..f45959a654 100644 --- a/app/command_dnd.go +++ b/app/command_dnd.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type DndProvider struct { diff --git a/app/command_echo.go b/app/command_echo.go index 9b489bda23..31978bba4e 100644 --- a/app/command_echo.go +++ b/app/command_echo.go @@ -9,8 +9,8 @@ import ( "time" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) var echoSem chan bool diff --git a/app/command_expand_collapse.go b/app/command_expand_collapse.go index 80013a9184..b09037dead 100644 --- a/app/command_expand_collapse.go +++ b/app/command_expand_collapse.go @@ -7,7 +7,7 @@ import ( "strconv" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type ExpandProvider struct { diff --git a/app/command_groupmsg.go b/app/command_groupmsg.go index 71f40d4664..218e3a1eba 100644 --- a/app/command_groupmsg.go +++ b/app/command_groupmsg.go @@ -8,8 +8,8 @@ import ( "strings" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type groupmsgProvider struct { diff --git a/app/command_groupmsg_test.go b/app/command_groupmsg_test.go index 6f0b702204..08fa547124 100644 --- a/app/command_groupmsg_test.go +++ b/app/command_groupmsg_test.go @@ -6,7 +6,7 @@ import ( "github.com/mattermost/go-i18n/i18n" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestGroupMsgUsernames(t *testing.T) { diff --git a/app/command_help.go b/app/command_help.go index 7ff106cf56..a783187ca4 100644 --- a/app/command_help.go +++ b/app/command_help.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type HelpProvider struct { diff --git a/app/command_invite.go b/app/command_invite.go index 7aa6bf91d8..eca6dab516 100644 --- a/app/command_invite.go +++ b/app/command_invite.go @@ -8,8 +8,8 @@ import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type InviteProvider struct { diff --git a/app/command_invite_people.go b/app/command_invite_people.go index 4aa5bef30b..e4d6530634 100644 --- a/app/command_invite_people.go +++ b/app/command_invite_people.go @@ -7,8 +7,8 @@ import ( "strings" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type InvitePeopleProvider struct { diff --git a/app/command_invite_people_test.go b/app/command_invite_people_test.go index 8c5a94667f..140477ad14 100644 --- a/app/command_invite_people_test.go +++ b/app/command_invite_people_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestInvitePeopleProvider(t *testing.T) { diff --git a/app/command_invite_test.go b/app/command_invite_test.go index f79117b5f5..75c47b33c5 100644 --- a/app/command_invite_test.go +++ b/app/command_invite_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestInviteProvider(t *testing.T) { diff --git a/app/command_join.go b/app/command_join.go index 3006551967..87643127d6 100644 --- a/app/command_join.go +++ b/app/command_join.go @@ -8,7 +8,7 @@ import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type JoinProvider struct { diff --git a/app/command_join_test.go b/app/command_join_test.go index b071a14346..676c45f9b3 100644 --- a/app/command_join_test.go +++ b/app/command_join_test.go @@ -9,7 +9,7 @@ import ( "github.com/mattermost/go-i18n/i18n" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestJoinCommandNoChannel(t *testing.T) { diff --git a/app/command_leave.go b/app/command_leave.go index 3811cbbd9a..8d70efae8a 100644 --- a/app/command_leave.go +++ b/app/command_leave.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type LeaveProvider struct { diff --git a/app/command_leave_test.go b/app/command_leave_test.go index 82ac179a19..47ac23bed9 100644 --- a/app/command_leave_test.go +++ b/app/command_leave_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestLeaveProviderDoCommand(t *testing.T) { diff --git a/app/command_loadtest.go b/app/command_loadtest.go index 01f5a1b27c..7d48263a6b 100644 --- a/app/command_loadtest.go +++ b/app/command_loadtest.go @@ -12,9 +12,9 @@ import ( "strings" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) var usage = `Mattermost testing commands to help configure the system diff --git a/app/command_logout.go b/app/command_logout.go index 81b1951752..ad44565173 100644 --- a/app/command_logout.go +++ b/app/command_logout.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type LogoutProvider struct { diff --git a/app/command_me.go b/app/command_me.go index 140ef8961b..912b9e5f5b 100644 --- a/app/command_me.go +++ b/app/command_me.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type MeProvider struct { diff --git a/app/command_me_test.go b/app/command_me_test.go index a555f89fdb..7fbedb6cfd 100644 --- a/app/command_me_test.go +++ b/app/command_me_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestMeProviderDoCommand(t *testing.T) { diff --git a/app/command_msg.go b/app/command_msg.go index 492ed8c727..b71f15cf25 100644 --- a/app/command_msg.go +++ b/app/command_msg.go @@ -7,8 +7,8 @@ import ( "strings" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type msgProvider struct { diff --git a/app/command_msg_test.go b/app/command_msg_test.go index c7054f4f94..92ddecf603 100644 --- a/app/command_msg_test.go +++ b/app/command_msg_test.go @@ -9,7 +9,7 @@ import ( "github.com/mattermost/go-i18n/i18n" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestMsgProvider(t *testing.T) { diff --git a/app/command_mute.go b/app/command_mute.go index 58279a422e..aea15269dc 100644 --- a/app/command_mute.go +++ b/app/command_mute.go @@ -7,7 +7,7 @@ import ( "strings" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type MuteProvider struct { diff --git a/app/command_mute_test.go b/app/command_mute_test.go index 5c7d95d47d..fd35888f0f 100644 --- a/app/command_mute_test.go +++ b/app/command_mute_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" ) diff --git a/app/command_offline.go b/app/command_offline.go index 43211173b7..efc91c55c2 100644 --- a/app/command_offline.go +++ b/app/command_offline.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type OfflineProvider struct { diff --git a/app/command_online.go b/app/command_online.go index 32f1f54d5d..3aa9be72cb 100644 --- a/app/command_online.go +++ b/app/command_online.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type OnlineProvider struct { diff --git a/app/command_open.go b/app/command_open.go index 0465346ee1..bceceff244 100644 --- a/app/command_open.go +++ b/app/command_open.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type OpenProvider struct { diff --git a/app/command_remove.go b/app/command_remove.go index 0018663cd6..80fcf82f8d 100644 --- a/app/command_remove.go +++ b/app/command_remove.go @@ -8,8 +8,8 @@ import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type RemoveProvider struct { diff --git a/app/command_remove_test.go b/app/command_remove_test.go index 6663359a5d..938d339c60 100644 --- a/app/command_remove_test.go +++ b/app/command_remove_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestRemoveProviderDoCommand(t *testing.T) { diff --git a/app/command_search.go b/app/command_search.go index 1ec19ed552..49c760ca5b 100644 --- a/app/command_search.go +++ b/app/command_search.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type SearchProvider struct { diff --git a/app/command_settings.go b/app/command_settings.go index 3d1e44e136..b9005b61d4 100644 --- a/app/command_settings.go +++ b/app/command_settings.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type SettingsProvider struct { diff --git a/app/command_shortcuts.go b/app/command_shortcuts.go index 2ed8792cde..0d6e6f58ff 100644 --- a/app/command_shortcuts.go +++ b/app/command_shortcuts.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type ShortcutsProvider struct { diff --git a/app/command_shrug.go b/app/command_shrug.go index df830c8ac3..b8488ec2a9 100644 --- a/app/command_shrug.go +++ b/app/command_shrug.go @@ -5,7 +5,7 @@ package app import ( goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type ShrugProvider struct { diff --git a/app/command_test.go b/app/command_test.go index e43133b974..47291d5374 100644 --- a/app/command_test.go +++ b/app/command_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/httpservice" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/httpservice" ) func TestMoveCommand(t *testing.T) { diff --git a/app/compliance.go b/app/compliance.go index 11107c4b93..e102881502 100644 --- a/app/compliance.go +++ b/app/compliance.go @@ -8,7 +8,7 @@ import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model.AppError) { diff --git a/app/config.go b/app/config.go index b2f33a8128..43b1463253 100644 --- a/app/config.go +++ b/app/config.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/app/config_test.go b/app/config_test.go index b749399acc..73f8ed4cf2 100644 --- a/app/config_test.go +++ b/app/config_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/sqlstore" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v5/utils" ) func TestConfigListener(t *testing.T) { diff --git a/app/data_retention.go b/app/data_retention.go index b931ca8b19..e7b8b3aa71 100644 --- a/app/data_retention.go +++ b/app/data_retention.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) GetDataRetentionPolicy() (*model.DataRetentionPolicy, *model.AppError) { diff --git a/app/diagnostics.go b/app/diagnostics.go index 235dad0bb3..a1655454aa 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -10,9 +10,9 @@ import ( "github.com/segmentio/analytics-go" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) const ( diff --git a/app/diagnostics_test.go b/app/diagnostics_test.go index 50d8b85a18..b56e166ba6 100644 --- a/app/diagnostics_test.go +++ b/app/diagnostics_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestPluginSetting(t *testing.T) { diff --git a/app/elasticsearch.go b/app/elasticsearch.go index 2e731f5d74..7c2bcafc53 100644 --- a/app/elasticsearch.go +++ b/app/elasticsearch.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) TestElasticsearch(cfg *model.Config) *model.AppError { diff --git a/app/email.go b/app/email.go index d0166072d8..65c4fc5cfc 100644 --- a/app/email.go +++ b/app/email.go @@ -18,10 +18,10 @@ import ( "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/mailservice" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/mailservice" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/app/email_batching.go b/app/email_batching.go index 01f82f31e4..f9f8021fb5 100644 --- a/app/email_batching.go +++ b/app/email_batching.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "net/http" diff --git a/app/email_batching_test.go b/app/email_batching_test.go index aed286f0d9..5bda1a75e8 100644 --- a/app/email_batching_test.go +++ b/app/email_batching_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/app/emoji.go b/app/emoji.go index 42222f1b1d..af167b2549 100644 --- a/app/emoji.go +++ b/app/emoji.go @@ -18,9 +18,9 @@ import ( "image/color/palette" "github.com/disintegration/imaging" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/app/enterprise.go b/app/enterprise.go index 957174f075..77132bb061 100644 --- a/app/enterprise.go +++ b/app/enterprise.go @@ -4,11 +4,11 @@ package app import ( - "github.com/mattermost/mattermost-server/einterfaces" - ejobs "github.com/mattermost/mattermost-server/einterfaces/jobs" - tjobs "github.com/mattermost/mattermost-server/jobs/interfaces" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/einterfaces" + ejobs "github.com/mattermost/mattermost-server/v5/einterfaces/jobs" + tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) var accountMigrationInterface func(*Server) einterfaces.AccountMigrationInterface diff --git a/app/export.go b/app/export.go index 4836547002..cb7fa27f67 100644 --- a/app/export.go +++ b/app/export.go @@ -11,10 +11,10 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/store" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" ) diff --git a/app/export_converters.go b/app/export_converters.go index 452e2a5613..df1ae29f87 100644 --- a/app/export_converters.go +++ b/app/export_converters.go @@ -6,7 +6,7 @@ package app import ( "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func ImportLineFromTeam(team *model.TeamForExport) *LineImportData { diff --git a/app/export_test.go b/app/export_test.go index 2e41d40da4..29733780ff 100644 --- a/app/export_test.go +++ b/app/export_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestReactionsOfPost(t *testing.T) { diff --git a/app/file.go b/app/file.go index 85a248f866..6a063f2596 100644 --- a/app/file.go +++ b/app/file.go @@ -27,11 +27,11 @@ import ( "github.com/rwcarlsen/goexif/exif" _ "golang.org/x/image/bmp" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/services/filesstore" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/services/filesstore" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/app/file_bench_test.go b/app/file_bench_test.go index 57fc96a9a5..f6f40edfd7 100644 --- a/app/file_bench_test.go +++ b/app/file_bench_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) var randomJPEG []byte diff --git a/app/file_test.go b/app/file_test.go index 898551f833..a4735f66c4 100644 --- a/app/file_test.go +++ b/app/file_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) func TestGeneratePublicLinkHash(t *testing.T) { diff --git a/app/group.go b/app/group.go index 690e5bf582..4e23a0b361 100644 --- a/app/group.go +++ b/app/group.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) GetGroup(id string) (*model.Group, *model.AppError) { diff --git a/app/group_test.go b/app/group_test.go index e716963f51..cd5512b4f3 100644 --- a/app/group_test.go +++ b/app/group_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/app/helper_test.go b/app/helper_test.go index 55a41c7730..1538773d4a 100644 --- a/app/helper_test.go +++ b/app/helper_test.go @@ -12,10 +12,10 @@ import ( "testing" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/require" ) diff --git a/app/import.go b/app/import.go index f82c6da2b9..59f162facc 100644 --- a/app/import.go +++ b/app/import.go @@ -11,9 +11,9 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func stopOnError(err LineImportWorkerError) bool { diff --git a/app/import_functions.go b/app/import_functions.go index add7e37212..cdf67e7091 100644 --- a/app/import_functions.go +++ b/app/import_functions.go @@ -12,10 +12,10 @@ import ( "path" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) // diff --git a/app/import_functions_test.go b/app/import_functions_test.go index 153581c25a..5a3bf3b253 100644 --- a/app/import_functions_test.go +++ b/app/import_functions_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) func TestImportImportScheme(t *testing.T) { diff --git a/app/import_test.go b/app/import_test.go index c06aeb4e84..d5ab2e0e3c 100644 --- a/app/import_test.go +++ b/app/import_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) func ptrStr(s string) *string { diff --git a/app/import_types.go b/app/import_types.go index 2df205847e..61e083ebeb 100644 --- a/app/import_types.go +++ b/app/import_types.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/model" +import "github.com/mattermost/mattermost-server/v5/model" // Import Data Models diff --git a/app/import_validators.go b/app/import_validators.go index ec966f33da..2791361b1c 100644 --- a/app/import_validators.go +++ b/app/import_validators.go @@ -10,7 +10,7 @@ import ( "strings" "unicode/utf8" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func validateSchemeImportData(data *SchemeImportData) *model.AppError { diff --git a/app/import_validators_test.go b/app/import_validators_test.go index 59d8188cc5..6ddc5c1262 100644 --- a/app/import_validators_test.go +++ b/app/import_validators_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/stretchr/testify/assert" ) diff --git a/app/integration_action.go b/app/integration_action.go index 628daba851..bffc1653ca 100644 --- a/app/integration_action.go +++ b/app/integration_action.go @@ -28,9 +28,9 @@ import ( "path" "strings" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) func (a *App) DoPostAction(postId, actionId, userId, selectedOption string) (string, *model.AppError) { diff --git a/app/integration_action_test.go b/app/integration_action_test.go index 420cca36ae..9773694126 100644 --- a/app/integration_action_test.go +++ b/app/integration_action_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // Test for MM-13598 where an invalid integration URL was causing a crash @@ -449,8 +449,8 @@ func TestSubmitInteractiveDialog(t *testing.T) { import ( "net/http" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -727,8 +727,8 @@ func TestPostActionRelativePluginURL(t *testing.T) { import ( "net/http" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { diff --git a/app/job.go b/app/job.go index da61119e9e..7ee060aaa9 100644 --- a/app/job.go +++ b/app/job.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) GetJob(id string) (*model.Job, *model.AppError) { diff --git a/app/job_test.go b/app/job_test.go index d45a45a6e8..4dc70ff20f 100644 --- a/app/job_test.go +++ b/app/job_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/app/ldap.go b/app/ldap.go index 22a8568a68..65b6087a49 100644 --- a/app/ldap.go +++ b/app/ldap.go @@ -7,9 +7,9 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func (a *App) SyncLdap() { diff --git a/app/license.go b/app/license.go index fa595c6855..285b57fc2b 100644 --- a/app/license.go +++ b/app/license.go @@ -9,9 +9,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func (a *App) LoadLicense() { diff --git a/app/license_test.go b/app/license_test.go index 83bfc158de..0d0ede59d7 100644 --- a/app/license_test.go +++ b/app/license_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/login.go b/app/login.go index 80584e6b51..a273d56692 100644 --- a/app/login.go +++ b/app/login.go @@ -10,10 +10,10 @@ import ( "time" "github.com/avct/uasurfer" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) func (a *App) CheckForClientSideCert(r *http.Request) (string, string, string) { diff --git a/app/main_test.go b/app/main_test.go index d394597315..2d13879d0c 100644 --- a/app/main_test.go +++ b/app/main_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/app/migrations.go b/app/migrations.go index 8c4b5fe0c5..4515dce45a 100644 --- a/app/migrations.go +++ b/app/migrations.go @@ -7,9 +7,9 @@ import ( "fmt" "reflect" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) const ADVANCED_PERMISSIONS_MIGRATION_KEY = "AdvancedPermissionsMigrationComplete" diff --git a/app/notification.go b/app/notification.go index dce6dd6253..e18ca2b9b1 100644 --- a/app/notification.go +++ b/app/notification.go @@ -9,11 +9,11 @@ import ( "unicode" "unicode/utf8" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/markdown" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/markdown" ) func (a *App) SendNotifications(post *model.Post, team *model.Team, channel *model.Channel, sender *model.User, parentPostList *model.PostList) ([]string, error) { diff --git a/app/notification_email.go b/app/notification_email.go index 5344cc917a..a3a4f40b85 100644 --- a/app/notification_email.go +++ b/app/notification_email.go @@ -13,9 +13,9 @@ import ( "time" "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func (a *App) sendNotificationEmail(notification *PostNotification, user *model.User, team *model.Team) *model.AppError { diff --git a/app/notification_email_test.go b/app/notification_email_test.go index 0429934dc6..eeb76048d7 100644 --- a/app/notification_email_test.go +++ b/app/notification_email_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/timezones" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/timezones" + "github.com/mattermost/mattermost-server/v5/utils" ) func TestGetDirectMessageNotificationEmailSubject(t *testing.T) { diff --git a/app/notification_push.go b/app/notification_push.go index 4038e81c86..321e01acd4 100644 --- a/app/notification_push.go +++ b/app/notification_push.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type NotificationType string diff --git a/app/notification_push_test.go b/app/notification_push_test.go index ee68b036ac..7609ad0a65 100644 --- a/app/notification_push_test.go +++ b/app/notification_push_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/notification_test.go b/app/notification_test.go index b04d79523a..db5b849552 100644 --- a/app/notification_test.go +++ b/app/notification_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func TestSendNotifications(t *testing.T) { diff --git a/app/oauth.go b/app/oauth.go index 1b4a73ce34..0601caa4fa 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -15,11 +15,11 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/app/oauth_test.go b/app/oauth_test.go index 5392390899..0dd5837717 100644 --- a/app/oauth_test.go +++ b/app/oauth_test.go @@ -11,7 +11,7 @@ import ( "net/http/httptest" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/opengraph.go b/app/opengraph.go index 29f036da54..151349490a 100644 --- a/app/opengraph.go +++ b/app/opengraph.go @@ -11,7 +11,7 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" "golang.org/x/net/html/charset" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) const MaxOpenGraphResponseSize = 1024 * 1024 * 50 diff --git a/app/options.go b/app/options.go index 55f420ce57..7cbfa9f83f 100644 --- a/app/options.go +++ b/app/options.go @@ -4,11 +4,11 @@ package app import ( - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/store" ) type Option func(s *Server) error diff --git a/app/permissions.go b/app/permissions.go index 6b13af67de..b2ce484538 100644 --- a/app/permissions.go +++ b/app/permissions.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" ) diff --git a/app/permissions_migrations.go b/app/permissions_migrations.go index d4fe8019fe..d656c39028 100644 --- a/app/permissions_migrations.go +++ b/app/permissions_migrations.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type permissionTransformation struct { diff --git a/app/permissions_test.go b/app/permissions_test.go index 943c42a0dc..78882695f2 100644 --- a/app/permissions_test.go +++ b/app/permissions_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type testWriter struct { diff --git a/app/plugin.go b/app/plugin.go index 90fad124c7..efe403b186 100644 --- a/app/plugin.go +++ b/app/plugin.go @@ -10,12 +10,12 @@ import ( "sort" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/services/filesstore" - "github.com/mattermost/mattermost-server/services/marketplace" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/services/filesstore" + "github.com/mattermost/mattermost-server/v5/services/marketplace" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/pkg/errors" ) diff --git a/app/plugin_api.go b/app/plugin_api.go index 69d1385bfa..49e4e0c593 100644 --- a/app/plugin_api.go +++ b/app/plugin_api.go @@ -14,8 +14,8 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type PluginAPI struct { diff --git a/app/plugin_api_test.go b/app/plugin_api_test.go index e6c4b2b94e..beae2aa37e 100644 --- a/app/plugin_api_test.go +++ b/app/plugin_api_test.go @@ -17,11 +17,11 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/services/mailservice" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/services/mailservice" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -71,7 +71,7 @@ func TestPublicFilesPathConfiguration(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" ) type MyPlugin struct { @@ -420,8 +420,8 @@ func TestPluginAPILoadPluginConfiguration(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" "fmt" ) @@ -491,8 +491,8 @@ func TestPluginAPILoadPluginConfigurationDefaults(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" "fmt" ) @@ -558,8 +558,8 @@ func TestPluginAPIGetBundlePath(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -645,7 +645,7 @@ func TestPluginAPIGetPlugins(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" ) type MyPlugin struct { @@ -1008,8 +1008,8 @@ func TestPluginBots(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -1481,7 +1481,7 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" "bytes" "net/http" ) @@ -1509,8 +1509,8 @@ func TestInterpluginPluginHTTP(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" "bytes" "net/http" "io/ioutil" diff --git a/app/plugin_api_test/plugin_using_log_api.go b/app/plugin_api_test/plugin_using_log_api.go index 159ec7f3b3..08900b2a10 100644 --- a/app/plugin_api_test/plugin_using_log_api.go +++ b/app/plugin_api_test/plugin_using_log_api.go @@ -4,7 +4,7 @@ package main import ( - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" "github.com/pkg/errors" ) diff --git a/app/plugin_commands.go b/app/plugin_commands.go index 8e1df5fa42..3dbc77924a 100644 --- a/app/plugin_commands.go +++ b/app/plugin_commands.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type PluginCommand struct { diff --git a/app/plugin_commands_test.go b/app/plugin_commands_test.go index 06af46d1cd..c4597e96f0 100644 --- a/app/plugin_commands_test.go +++ b/app/plugin_commands_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/require" ) @@ -38,8 +38,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type configuration struct { @@ -122,8 +122,8 @@ func TestPluginCommand(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type configuration struct { diff --git a/app/plugin_context.go b/app/plugin_context.go index 2df1ae8b19..7901f57fcc 100644 --- a/app/plugin_context.go +++ b/app/plugin_context.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/plugin" +import "github.com/mattermost/mattermost-server/v5/plugin" func (a *App) PluginContext() *plugin.Context { context := &plugin.Context{ diff --git a/app/plugin_deadlock_test.go b/app/plugin_deadlock_test.go index 0eb28c5e16..c98ede3fc2 100644 --- a/app/plugin_deadlock_test.go +++ b/app/plugin_deadlock_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestPluginDeadlock(t *testing.T) { @@ -24,8 +24,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -112,8 +112,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -147,8 +147,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -218,8 +218,8 @@ func TestPluginDeadlock(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { diff --git a/app/plugin_event.go b/app/plugin_event.go index d9785b8921..24fdc44ee8 100644 --- a/app/plugin_event.go +++ b/app/plugin_event.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // notifyClusterPluginEvent publishes `event` to other clusters. diff --git a/app/plugin_hooks_test.go b/app/plugin_hooks_test.go index d591a8d136..baf3b6df72 100644 --- a/app/plugin_hooks_test.go +++ b/app/plugin_hooks_test.go @@ -16,11 +16,11 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/plugin/plugintest" - "github.com/mattermost/mattermost-server/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/plugin/plugintest" + "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -70,8 +70,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -110,8 +110,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -151,8 +151,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -194,8 +194,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -238,8 +238,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -260,8 +260,8 @@ func TestHookMessageWillBePosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -306,8 +306,8 @@ func TestHookMessageHasBeenPosted(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -344,8 +344,8 @@ func TestHookMessageWillBeUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -392,8 +392,8 @@ func TestHookMessageHasBeenUpdated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -440,8 +440,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -488,8 +488,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "fmt" "io" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -540,8 +540,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { import ( "io" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -601,8 +601,8 @@ func TestHookFileWillBeUploaded(t *testing.T) { "io" "fmt" "bytes" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -674,8 +674,8 @@ func TestUserWillLogIn_Blocked(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -713,8 +713,8 @@ func TestUserWillLogInIn_Passed(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -753,8 +753,8 @@ func TestUserHasLoggedIn(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -795,8 +795,8 @@ func TestUserHasBeenCreated(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -844,7 +844,7 @@ func TestErrorString(t *testing.T) { import ( "errors" - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" ) type MyPlugin struct { @@ -873,8 +873,8 @@ func TestErrorString(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -928,8 +928,8 @@ func TestHookContext(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { diff --git a/app/plugin_install.go b/app/plugin_install.go index c8303bee12..d7f8cd216d 100644 --- a/app/plugin_install.go +++ b/app/plugin_install.go @@ -45,11 +45,11 @@ import ( "path/filepath" "github.com/blang/semver" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/services/filesstore" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/services/filesstore" + "github.com/mattermost/mattermost-server/v5/utils" ) // managedPluginFileName is the file name of the flag file that marks diff --git a/app/plugin_install_test.go b/app/plugin_install_test.go index 1a3e41aae0..94348c6783 100644 --- a/app/plugin_install_test.go +++ b/app/plugin_install_test.go @@ -8,7 +8,7 @@ import ( "sort" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/plugin_key_value_store.go b/app/plugin_key_value_store.go index 8599f7e679..77cdcbbd00 100644 --- a/app/plugin_key_value_store.go +++ b/app/plugin_key_value_store.go @@ -8,8 +8,8 @@ import ( "encoding/base64" "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) func getKeyHash(key string) string { diff --git a/app/plugin_requests.go b/app/plugin_requests.go index b36d6e4319..9507922de1 100644 --- a/app/plugin_requests.go +++ b/app/plugin_requests.go @@ -14,10 +14,10 @@ import ( "io/ioutil" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/utils" ) func (a *App) ServePluginRequest(w http.ResponseWriter, r *http.Request) { diff --git a/app/plugin_shutdown_test.go b/app/plugin_shutdown_test.go index 2f99ca8231..92a2912232 100644 --- a/app/plugin_shutdown_test.go +++ b/app/plugin_shutdown_test.go @@ -19,7 +19,7 @@ func TestPluginShutdownTest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" ) type MyPlugin struct { @@ -34,7 +34,7 @@ func TestPluginShutdownTest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" ) type MyPlugin struct { diff --git a/app/plugin_signature.go b/app/plugin_signature.go index e05e93b341..a72598c339 100644 --- a/app/plugin_signature.go +++ b/app/plugin_signature.go @@ -10,9 +10,9 @@ import ( "net/http" "path/filepath" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/pkg/errors" "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/armor" diff --git a/app/plugin_signature_test.go b/app/plugin_signature_test.go index c1ae5a8ca9..b6f8346163 100644 --- a/app/plugin_signature_test.go +++ b/app/plugin_signature_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/app/plugin_statuses.go b/app/plugin_statuses.go index 9733ac48db..4efb413e2e 100644 --- a/app/plugin_statuses.go +++ b/app/plugin_statuses.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // GetPluginStatus returns the status for a plugin installed on this server. diff --git a/app/plugin_test.go b/app/plugin_test.go index 53df7bfd5c..42d3a571da 100644 --- a/app/plugin_test.go +++ b/app/plugin_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) func getHashedKey(key string) string { diff --git a/app/post.go b/app/post.go index 19a06fe417..4f8b4dafe9 100644 --- a/app/post.go +++ b/app/post.go @@ -11,11 +11,11 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/app/post_metadata.go b/app/post_metadata.go index b67f6f1ca4..8a4b171a85 100644 --- a/app/post_metadata.go +++ b/app/post_metadata.go @@ -13,11 +13,11 @@ import ( "time" "github.com/dyatlov/go-opengraph/opengraph" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/imgutils" - "github.com/mattermost/mattermost-server/utils/markdown" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/imgutils" + "github.com/mattermost/mattermost-server/v5/utils/markdown" ) const LINK_CACHE_SIZE = 10000 diff --git a/app/post_metadata_test.go b/app/post_metadata_test.go index fa3840dd73..27c704576d 100644 --- a/app/post_metadata_test.go +++ b/app/post_metadata_test.go @@ -18,10 +18,10 @@ import ( "time" "github.com/dyatlov/go-opengraph/opengraph" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/httpservice" - "github.com/mattermost/mattermost-server/services/imageproxy" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/httpservice" + "github.com/mattermost/mattermost-server/v5/services/imageproxy" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/post_test.go b/app/post_test.go index 458a6fa161..1568facea7 100644 --- a/app/post_test.go +++ b/app/post_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/einterfaces/mocks" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestCreatePostDeduplicate(t *testing.T) { @@ -51,8 +51,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" ) type MyPlugin struct { @@ -100,8 +100,8 @@ func TestCreatePostDeduplicate(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/model" "time" ) diff --git a/app/preference.go b/app/preference.go index d964efc17f..61307b36fe 100644 --- a/app/preference.go +++ b/app/preference.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) GetPreferencesForUser(userId string) (model.Preferences, *model.AppError) { diff --git a/app/ratelimit.go b/app/ratelimit.go index 8c560cbaaf..f7c77bca0a 100644 --- a/app/ratelimit.go +++ b/app/ratelimit.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/pkg/errors" "github.com/throttled/throttled" "github.com/throttled/throttled/store/memstore" diff --git a/app/ratelimit_test.go b/app/ratelimit_test.go index 042c12de70..d0e3969484 100644 --- a/app/ratelimit_test.go +++ b/app/ratelimit_test.go @@ -9,7 +9,7 @@ import ( "strconv" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/app/reaction.go b/app/reaction.go index 6aca0165a2..1f235bde0b 100644 --- a/app/reaction.go +++ b/app/reaction.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) SaveReactionForPost(reaction *model.Reaction) (*model.Reaction, *model.AppError) { diff --git a/app/role.go b/app/role.go index 17b683e767..08e86330ea 100644 --- a/app/role.go +++ b/app/role.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) GetRole(id string) (*model.Role, *model.AppError) { diff --git a/app/saml.go b/app/saml.go index 089e4a9637..93d2c65d5f 100644 --- a/app/saml.go +++ b/app/saml.go @@ -8,7 +8,7 @@ import ( "mime/multipart" "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/app/scheme.go b/app/scheme.go index bde7af7cf7..893fbd08d7 100644 --- a/app/scheme.go +++ b/app/scheme.go @@ -6,7 +6,7 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) GetScheme(id string) (*model.Scheme, *model.AppError) { diff --git a/app/security_update_check.go b/app/security_update_check.go index 3d4ecca4d7..a10febe2f3 100644 --- a/app/security_update_check.go +++ b/app/security_update_check.go @@ -10,10 +10,10 @@ import ( "runtime" "strconv" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/mailservice" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/mailservice" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/app/server.go b/app/server.go index 1184a576ed..d2647178a3 100644 --- a/app/server.go +++ b/app/server.go @@ -24,17 +24,17 @@ import ( "github.com/throttled/throttled" "golang.org/x/crypto/acme/autocert" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/jobs" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/services/httpservice" - "github.com/mattermost/mattermost-server/services/imageproxy" - "github.com/mattermost/mattermost-server/services/timezones" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/jobs" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/services/httpservice" + "github.com/mattermost/mattermost-server/v5/services/imageproxy" + "github.com/mattermost/mattermost-server/v5/services/timezones" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) var MaxNotificationsPerChannelDefault int64 = 1000000 diff --git a/app/server_app_adapters.go b/app/server_app_adapters.go index d4812b29ff..048c88be2f 100644 --- a/app/server_app_adapters.go +++ b/app/server_app_adapters.go @@ -8,13 +8,13 @@ import ( "net/url" "path" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/mailservice" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/store/localcachelayer" - "github.com/mattermost/mattermost-server/store/sqlstore" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/mailservice" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/localcachelayer" + "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/pkg/errors" ) diff --git a/app/server_license.go b/app/server_license.go index 5b14ab865f..a8e3dd2df4 100644 --- a/app/server_license.go +++ b/app/server_license.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/model" +import "github.com/mattermost/mattermost-server/v5/model" func (s *Server) License() *model.License { license, _ := s.licenseValue.Load().(*model.License) diff --git a/app/server_test.go b/app/server_test.go index 0036e14496..aeb0e84036 100644 --- a/app/server_test.go +++ b/app/server_test.go @@ -6,7 +6,7 @@ package app import ( "bufio" "crypto/tls" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" "io/ioutil" "net" "net/http" @@ -16,9 +16,9 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/stretchr/testify/require" ) diff --git a/app/session.go b/app/session.go index fa51e255d9..8f9e78bed6 100644 --- a/app/session.go +++ b/app/session.go @@ -6,8 +6,8 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) CreateSession(session *model.Session) (*model.Session, *model.AppError) { diff --git a/app/session_test.go b/app/session_test.go index a268c1bb9f..291e7a43a2 100644 --- a/app/session_test.go +++ b/app/session_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestCache(t *testing.T) { diff --git a/app/slack.go b/app/slack.go index 4e25a0c679..9fed721fae 100644 --- a/app/slack.go +++ b/app/slack.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func (a *App) ProcessSlackText(text string) string { diff --git a/app/slack_test.go b/app/slack_test.go index c6c80140be..5f0ad31116 100644 --- a/app/slack_test.go +++ b/app/slack_test.go @@ -3,7 +3,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestProcessSlackText(t *testing.T) { diff --git a/app/slackimport.go b/app/slackimport.go index 62730c3d08..e409b92749 100644 --- a/app/slackimport.go +++ b/app/slackimport.go @@ -18,9 +18,9 @@ import ( "time" "unicode/utf8" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type SlackChannel struct { diff --git a/app/slackimport_test.go b/app/slackimport_test.go index 02096ab6b2..992e639f25 100644 --- a/app/slackimport_test.go +++ b/app/slackimport_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestSlackConvertTimeStamp(t *testing.T) { diff --git a/app/status.go b/app/status.go index 77df7ea690..b17321c741 100644 --- a/app/status.go +++ b/app/status.go @@ -4,9 +4,9 @@ package app import ( - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) var statusCache *utils.Cache = utils.NewLru(model.STATUS_CACHE_SIZE) diff --git a/app/status_test.go b/app/status_test.go index e805d548fb..e8d0b42664 100644 --- a/app/status_test.go +++ b/app/status_test.go @@ -6,7 +6,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/app/syncables.go b/app/syncables.go index 1b4e48a9ff..be44b47eed 100644 --- a/app/syncables.go +++ b/app/syncables.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) // CreateDefaultMemberships adds users to teams and channels based on their group memberships and how those groups are diff --git a/app/syncables_test.go b/app/syncables_test.go index b6d820fd8f..7530296a77 100644 --- a/app/syncables_test.go +++ b/app/syncables_test.go @@ -3,7 +3,7 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/app/team.go b/app/team.go index 37219395c4..0b371062a8 100644 --- a/app/team.go +++ b/app/team.go @@ -15,11 +15,11 @@ import ( "strings" "github.com/disintegration/imaging" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) func (a *App) CreateTeam(team *model.Team) (*model.Team, *model.AppError) { diff --git a/app/team_test.go b/app/team_test.go index 6755c2bb32..8313aa914c 100644 --- a/app/team_test.go +++ b/app/team_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/terms_of_service.go b/app/terms_of_service.go index 59ddc6710d..b1c71ff9b0 100644 --- a/app/terms_of_service.go +++ b/app/terms_of_service.go @@ -4,7 +4,7 @@ package app import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (a *App) CreateTermsOfService(text, userId string) (*model.TermsOfService, *model.AppError) { diff --git a/app/user.go b/app/user.go index 9f109d82ee..772a44c209 100644 --- a/app/user.go +++ b/app/user.go @@ -26,14 +26,14 @@ import ( "github.com/disintegration/imaging" "github.com/golang/freetype" "github.com/golang/freetype/truetype" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/services/mfa" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/services/mfa" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) const ( diff --git a/app/user_terms_of_service.go b/app/user_terms_of_service.go index 7f41d92693..5ba01bc3c8 100644 --- a/app/user_terms_of_service.go +++ b/app/user_terms_of_service.go @@ -3,7 +3,7 @@ package app -import "github.com/mattermost/mattermost-server/model" +import "github.com/mattermost/mattermost-server/v5/model" func (a *App) GetUserTermsOfService(userId string) (*model.UserTermsOfService, *model.AppError) { return a.Srv.Store.UserTermsOfService().GetByUser(userId) diff --git a/app/user_test.go b/app/user_test.go index ee455c1cfd..8563c381fe 100644 --- a/app/user_test.go +++ b/app/user_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - oauthgitlab "github.com/mattermost/mattermost-server/model/gitlab" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + oauthgitlab "github.com/mattermost/mattermost-server/v5/model/gitlab" ) func TestIsUsernameTaken(t *testing.T) { diff --git a/app/user_viewmembers_test.go b/app/user_viewmembers_test.go index 2668bc14ac..641dae48fa 100644 --- a/app/user_viewmembers_test.go +++ b/app/user_viewmembers_test.go @@ -3,8 +3,8 @@ package app import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/web_conn.go b/app/web_conn.go index bb12e7074b..05214d0edd 100644 --- a/app/web_conn.go +++ b/app/web_conn.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/websocket" goi18n "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/app/web_conn_test.go b/app/web_conn_test.go index 27c6c203d6..c8d6a0f8af 100644 --- a/app/web_conn_test.go +++ b/app/web_conn_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func TestWebConnShouldSendEvent(t *testing.T) { diff --git a/app/web_hub.go b/app/web_hub.go index bdf7903023..eb76b8d200 100644 --- a/app/web_hub.go +++ b/app/web_hub.go @@ -13,8 +13,8 @@ import ( "sync/atomic" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) const ( @@ -31,7 +31,7 @@ type WebConnActivityMessage struct { type Hub struct { // connectionCount should be kept first. - // See https://github.com/mattermost/mattermost-server/pull/7281 + // See https://github.com/mattermost/mattermost-server/v5/pull/7281 connectionCount int64 app *App connectionIndex int diff --git a/app/web_hub_test.go b/app/web_hub_test.go index 780c10b6e7..1002eb050a 100644 --- a/app/web_hub_test.go +++ b/app/web_hub_test.go @@ -11,7 +11,7 @@ import ( goi18n "github.com/mattermost/go-i18n/i18n" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func dummyWebsocketHandler(t *testing.T) http.HandlerFunc { diff --git a/app/webhook.go b/app/webhook.go index 5e0131c3a1..31c675598f 100644 --- a/app/webhook.go +++ b/app/webhook.go @@ -10,10 +10,10 @@ import ( "strings" "unicode/utf8" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/app/webhook_test.go b/app/webhook_test.go index 3822d16c79..9a9f534ed1 100644 --- a/app/webhook_test.go +++ b/app/webhook_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/httpservice" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/httpservice" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/websocket_router.go b/app/websocket_router.go index e629bbdf4a..3e30b0633a 100644 --- a/app/websocket_router.go +++ b/app/websocket_router.go @@ -6,9 +6,9 @@ package app import ( "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type webSocketHandler interface { diff --git a/cmd/mattermost/commands/channel.go b/cmd/mattermost/commands/channel.go index bb0f5b6886..85efefd35e 100644 --- a/cmd/mattermost/commands/channel.go +++ b/cmd/mattermost/commands/channel.go @@ -6,8 +6,8 @@ package commands import ( "fmt" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/channel_test.go b/cmd/mattermost/commands/channel_test.go index d6003adc3b..bd7d18dffe 100644 --- a/cmd/mattermost/commands/channel_test.go +++ b/cmd/mattermost/commands/channel_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cmd/mattermost/commands/channelargs.go b/cmd/mattermost/commands/channelargs.go index dc22c26ee3..e26b30c13f 100644 --- a/cmd/mattermost/commands/channelargs.go +++ b/cmd/mattermost/commands/channelargs.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" ) const CHANNEL_ARG_SEPARATOR = ":" diff --git a/cmd/mattermost/commands/cmdtestlib.go b/cmd/mattermost/commands/cmdtestlib.go index 1727520994..27ea7534b3 100644 --- a/cmd/mattermost/commands/cmdtestlib.go +++ b/cmd/mattermost/commands/cmdtestlib.go @@ -17,9 +17,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/api4" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/api4" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/testlib" ) var coverprofileCounters map[string]int = make(map[string]int) diff --git a/cmd/mattermost/commands/command.go b/cmd/mattermost/commands/command.go index a7637f3ba1..ab7a99050b 100644 --- a/cmd/mattermost/commands/command.go +++ b/cmd/mattermost/commands/command.go @@ -9,8 +9,8 @@ import ( "fmt" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/command_test.go b/cmd/mattermost/commands/command_test.go index 3d599e0136..e5e130c2b8 100644 --- a/cmd/mattermost/commands/command_test.go +++ b/cmd/mattermost/commands/command_test.go @@ -6,7 +6,7 @@ package commands import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cmd/mattermost/commands/commandargs.go b/cmd/mattermost/commands/commandargs.go index 2bc0d91ca2..48e5134d93 100644 --- a/cmd/mattermost/commands/commandargs.go +++ b/cmd/mattermost/commands/commandargs.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" ) const COMMAND_ARGS_SEPARATOR = ":" diff --git a/cmd/mattermost/commands/config.go b/cmd/mattermost/commands/config.go index 2ca3ac7331..d30e83abb8 100644 --- a/cmd/mattermost/commands/config.go +++ b/cmd/mattermost/commands/config.go @@ -15,10 +15,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) const noSettingsNamed = "unable to find a setting named: %s" diff --git a/cmd/mattermost/commands/config_flag_test.go b/cmd/mattermost/commands/config_flag_test.go index 28ccd4c785..48c2aeeb48 100644 --- a/cmd/mattermost/commands/config_flag_test.go +++ b/cmd/mattermost/commands/config_flag_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) func TestConfigFlag(t *testing.T) { diff --git a/cmd/mattermost/commands/config_test.go b/cmd/mattermost/commands/config_test.go index d830a3b1dc..509fe96066 100644 --- a/cmd/mattermost/commands/config_test.go +++ b/cmd/mattermost/commands/config_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/model" ) type TestConfig struct { diff --git a/cmd/mattermost/commands/export.go b/cmd/mattermost/commands/export.go index 75202c937a..869b6794be 100644 --- a/cmd/mattermost/commands/export.go +++ b/cmd/mattermost/commands/export.go @@ -8,7 +8,7 @@ import ( "os" "time" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/export_test.go b/cmd/mattermost/commands/export_test.go index a4a1ab1fde..23e5641068 100644 --- a/cmd/mattermost/commands/export_test.go +++ b/cmd/mattermost/commands/export_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // There are no tests that actually run the Message Export job, because it can take a long time to complete depending diff --git a/cmd/mattermost/commands/group.go b/cmd/mattermost/commands/group.go index df44dea7c9..4c6f2f3b0e 100644 --- a/cmd/mattermost/commands/group.go +++ b/cmd/mattermost/commands/group.go @@ -6,7 +6,7 @@ package commands import ( "fmt" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/mattermost/commands/group_test.go b/cmd/mattermost/commands/group_test.go index 2f2bee18de..604df24378 100644 --- a/cmd/mattermost/commands/group_test.go +++ b/cmd/mattermost/commands/group_test.go @@ -6,7 +6,7 @@ package commands import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/cmd/mattermost/commands/init.go b/cmd/mattermost/commands/init.go index 812e3337a1..7f205511a6 100644 --- a/cmd/mattermost/commands/init.go +++ b/cmd/mattermost/commands/init.go @@ -4,9 +4,9 @@ package commands import ( - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/mattermost/viper" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/integrity.go b/cmd/mattermost/commands/integrity.go index 5f61aa4476..050a08c823 100644 --- a/cmd/mattermost/commands/integrity.go +++ b/cmd/mattermost/commands/integrity.go @@ -8,7 +8,7 @@ import ( "os" "strings" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/store" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/jobserver.go b/cmd/mattermost/commands/jobserver.go index 7ff22b5d81..f45952dd23 100644 --- a/cmd/mattermost/commands/jobserver.go +++ b/cmd/mattermost/commands/jobserver.go @@ -8,7 +8,7 @@ import ( "os/signal" "syscall" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/viper" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/ldap.go b/cmd/mattermost/commands/ldap.go index 7283df0f2d..83b1630a22 100644 --- a/cmd/mattermost/commands/ldap.go +++ b/cmd/mattermost/commands/ldap.go @@ -4,7 +4,7 @@ package commands import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/logs.go b/cmd/mattermost/commands/logs.go index dde3afb366..bf69958dcc 100644 --- a/cmd/mattermost/commands/logs.go +++ b/cmd/mattermost/commands/logs.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/mattermost/mattermost-server/mlog/human" + "github.com/mattermost/mattermost-server/v5/mlog/human" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/main_test.go b/cmd/mattermost/commands/main_test.go index 6292315f0f..62522f5c58 100644 --- a/cmd/mattermost/commands/main_test.go +++ b/cmd/mattermost/commands/main_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/api4" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/api4" + "github.com/mattermost/mattermost-server/v5/testlib" ) func TestMain(m *testing.M) { diff --git a/cmd/mattermost/commands/permissions.go b/cmd/mattermost/commands/permissions.go index 01d933a98d..d6c6275e44 100644 --- a/cmd/mattermost/commands/permissions.go +++ b/cmd/mattermost/commands/permissions.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/utils" ) var PermissionsCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/permissions_test.go b/cmd/mattermost/commands/permissions_test.go index 3c7ddc49ba..f7f55415fc 100644 --- a/cmd/mattermost/commands/permissions_test.go +++ b/cmd/mattermost/commands/permissions_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/utils" ) func TestPermissionsExport_rejectsUnlicensed(t *testing.T) { diff --git a/cmd/mattermost/commands/plugin.go b/cmd/mattermost/commands/plugin.go index c86601fb60..6658f2a28d 100644 --- a/cmd/mattermost/commands/plugin.go +++ b/cmd/mattermost/commands/plugin.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/plugin_test.go b/cmd/mattermost/commands/plugin_test.go index 4f0dd7f13b..843ca72191 100644 --- a/cmd/mattermost/commands/plugin_test.go +++ b/cmd/mattermost/commands/plugin_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cmd/mattermost/commands/roles.go b/cmd/mattermost/commands/roles.go index f1c9d34c8f..9d4482913a 100644 --- a/cmd/mattermost/commands/roles.go +++ b/cmd/mattermost/commands/roles.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) var RolesCmd = &cobra.Command{ diff --git a/cmd/mattermost/commands/sampledata.go b/cmd/mattermost/commands/sampledata.go index f6eb6cd99d..0a96c0add1 100644 --- a/cmd/mattermost/commands/sampledata.go +++ b/cmd/mattermost/commands/sampledata.go @@ -16,8 +16,8 @@ import ( "time" "github.com/icrowley/fake" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index 9813f387c7..30846b92d4 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -9,14 +9,14 @@ import ( "os/signal" "syscall" - "github.com/mattermost/mattermost-server/api4" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/manualtesting" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/web" - "github.com/mattermost/mattermost-server/wsapi" + "github.com/mattermost/mattermost-server/v5/api4" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/manualtesting" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/web" + "github.com/mattermost/mattermost-server/v5/wsapi" "github.com/mattermost/viper" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/mattermost/commands/server_test.go b/cmd/mattermost/commands/server_test.go index dfcf78caf1..5702d156ae 100644 --- a/cmd/mattermost/commands/server_test.go +++ b/cmd/mattermost/commands/server_test.go @@ -10,8 +10,8 @@ import ( "syscall" "testing" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/jobs" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/jobs" "github.com/stretchr/testify/require" ) diff --git a/cmd/mattermost/commands/team.go b/cmd/mattermost/commands/team.go index 685c813701..95a2373b70 100644 --- a/cmd/mattermost/commands/team.go +++ b/cmd/mattermost/commands/team.go @@ -8,8 +8,8 @@ import ( "fmt" "sort" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/team_test.go b/cmd/mattermost/commands/team_test.go index 17659f9c0e..7af595691e 100644 --- a/cmd/mattermost/commands/team_test.go +++ b/cmd/mattermost/commands/team_test.go @@ -6,7 +6,7 @@ package commands import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cmd/mattermost/commands/teamargs.go b/cmd/mattermost/commands/teamargs.go index 41950f96e8..45cedb7750 100644 --- a/cmd/mattermost/commands/teamargs.go +++ b/cmd/mattermost/commands/teamargs.go @@ -4,8 +4,8 @@ package commands import ( - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" ) func getTeamsFromTeamArgs(a *app.App, teamArgs []string) []*model.Team { diff --git a/cmd/mattermost/commands/test.go b/cmd/mattermost/commands/test.go index 323c8e5254..8fcf867bb1 100644 --- a/cmd/mattermost/commands/test.go +++ b/cmd/mattermost/commands/test.go @@ -12,10 +12,10 @@ import ( "os/signal" "syscall" - "github.com/mattermost/mattermost-server/api4" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/wsapi" + "github.com/mattermost/mattermost-server/v5/api4" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/wsapi" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/user.go b/cmd/mattermost/commands/user.go index 61f1e81178..84916db5d1 100644 --- a/cmd/mattermost/commands/user.go +++ b/cmd/mattermost/commands/user.go @@ -9,8 +9,8 @@ import ( "fmt" "io/ioutil" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/user_test.go b/cmd/mattermost/commands/user_test.go index 3067e8084e..482e702424 100644 --- a/cmd/mattermost/commands/user_test.go +++ b/cmd/mattermost/commands/user_test.go @@ -6,7 +6,7 @@ package commands import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/cmd/mattermost/commands/userargs.go b/cmd/mattermost/commands/userargs.go index 084785206d..6f6c66b2a3 100644 --- a/cmd/mattermost/commands/userargs.go +++ b/cmd/mattermost/commands/userargs.go @@ -4,8 +4,8 @@ package commands import ( - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" ) func getUsersFromUserArgs(a *app.App, userArgs []string) []*model.User { diff --git a/cmd/mattermost/commands/utils.go b/cmd/mattermost/commands/utils.go index 8267f813e7..768bc18411 100644 --- a/cmd/mattermost/commands/utils.go +++ b/cmd/mattermost/commands/utils.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) // prettyPrintStruct will return a prettyPrint version of a given struct diff --git a/cmd/mattermost/commands/version.go b/cmd/mattermost/commands/version.go index 5cb3a8f1be..b7a39720fb 100644 --- a/cmd/mattermost/commands/version.go +++ b/cmd/mattermost/commands/version.go @@ -4,8 +4,8 @@ package commands import ( - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/webhook.go b/cmd/mattermost/commands/webhook.go index e89868f2ce..5a2b28ae93 100644 --- a/cmd/mattermost/commands/webhook.go +++ b/cmd/mattermost/commands/webhook.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/mattermost/commands/webhook_test.go b/cmd/mattermost/commands/webhook_test.go index 238bdbc5b8..28a4b075ad 100644 --- a/cmd/mattermost/commands/webhook_test.go +++ b/cmd/mattermost/commands/webhook_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/api4" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/api4" + "github.com/mattermost/mattermost-server/v5/model" ) func TestListWebhooks(t *testing.T) { diff --git a/cmd/mattermost/main.go b/cmd/mattermost/main.go index 1f326c93c4..e1b11daf20 100644 --- a/cmd/mattermost/main.go +++ b/cmd/mattermost/main.go @@ -6,13 +6,13 @@ package main import ( "os" - "github.com/mattermost/mattermost-server/cmd/mattermost/commands" + "github.com/mattermost/mattermost-server/v5/cmd/mattermost/commands" // Plugins - _ "github.com/mattermost/mattermost-server/model/gitlab" + _ "github.com/mattermost/mattermost-server/v5/model/gitlab" // Enterprise Imports - _ "github.com/mattermost/mattermost-server/imports" + _ "github.com/mattermost/mattermost-server/v5/imports" // Enterprise Deps _ "github.com/gorilla/handlers" diff --git a/cmd/platform/main.go b/cmd/platform/main.go index 13605a34f6..ce7ba328b2 100644 --- a/cmd/platform/main.go +++ b/cmd/platform/main.go @@ -8,7 +8,7 @@ import ( "os" "syscall" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) func main() { diff --git a/config/client.go b/config/client.go index 22ba97c61a..d831ead154 100644 --- a/config/client.go +++ b/config/client.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // GenerateClientConfig renders the given configuration for a client. diff --git a/config/client_test.go b/config/client_test.go index 42fbe4827c..ae5e5696da 100644 --- a/config/client_test.go +++ b/config/client_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/model" ) func TestGetClientConfig(t *testing.T) { diff --git a/config/common.go b/config/common.go index 19ced5dc77..e5bfade391 100644 --- a/config/common.go +++ b/config/common.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" ) diff --git a/config/common_test.go b/config/common_test.go index 6401feeff7..28d5462740 100644 --- a/config/common_test.go +++ b/config/common_test.go @@ -4,11 +4,11 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/config" + "github.com/mattermost/mattermost-server/v5/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) var emptyConfig, readOnlyConfig, minimalConfig, invalidConfig, fixesRequiredConfig, ldapConfig, testConfig *model.Config diff --git a/config/config_generator/generator/generator.go b/config/config_generator/generator/generator.go index 70698742e2..ab7d922abf 100644 --- a/config/config_generator/generator/generator.go +++ b/config/config_generator/generator/generator.go @@ -7,7 +7,7 @@ import ( "encoding/json" "os" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func GenerateDefaultConfig(outputFile *os.File) error { diff --git a/config/config_generator/main.go b/config/config_generator/main.go index fce68404e8..9a5a37745d 100644 --- a/config/config_generator/main.go +++ b/config/config_generator/main.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/mattermost/mattermost-server/config/config_generator/generator" + "github.com/mattermost/mattermost-server/v5/config/config_generator/generator" ) func main() { diff --git a/config/database.go b/config/database.go index c80cf8ef55..cc66205a16 100644 --- a/config/database.go +++ b/config/database.go @@ -12,8 +12,8 @@ import ( "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" // Load the MySQL driver _ "github.com/go-sql-driver/mysql" diff --git a/config/database_test.go b/config/database_test.go index 87a44d75da..6472cf9c4a 100644 --- a/config/database_test.go +++ b/config/database_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/model" ) func setupConfigDatabase(t *testing.T, cfg *model.Config, files map[string][]byte) (string, func()) { diff --git a/config/default_test.go b/config/default_test.go index af824df6b6..f4c87b063d 100644 --- a/config/default_test.go +++ b/config/default_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" - "github.com/mattermost/mattermost-server/config/config_generator/generator" + "github.com/mattermost/mattermost-server/v5/config/config_generator/generator" "github.com/stretchr/testify/require" ) diff --git a/config/emitter.go b/config/emitter.go index 540fc79a56..b12bef466b 100644 --- a/config/emitter.go +++ b/config/emitter.go @@ -6,7 +6,7 @@ package config import ( "sync" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // emitter enables threadsafe registration and broadcasting to configuration listeners diff --git a/config/emitter_test.go b/config/emitter_test.go index 90460b36cf..b084a58765 100644 --- a/config/emitter_test.go +++ b/config/emitter_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestEmitter(t *testing.T) { diff --git a/config/environment.go b/config/environment.go index b567ab3cc3..2efc49ab67 100644 --- a/config/environment.go +++ b/config/environment.go @@ -6,7 +6,7 @@ package config import ( "reflect" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // removeEnvOverrides returns a new config without the given environment overrides. diff --git a/config/export_test.go b/config/export_test.go index e818975c94..5cd9dd366d 100644 --- a/config/export_test.go +++ b/config/export_test.go @@ -4,7 +4,7 @@ import ( "io" "github.com/jmoiron/sqlx" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // MarshalConfig exposes the internal marshalConfig to tests only. diff --git a/config/file.go b/config/file.go index 40ef6a0791..2db191f0a4 100644 --- a/config/file.go +++ b/config/file.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) var ( diff --git a/config/file_test.go b/config/file_test.go index 42b095592b..5ca2a5d51d 100644 --- a/config/file_test.go +++ b/config/file_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func setupConfigFile(t *testing.T, cfg *model.Config) (string, func()) { diff --git a/config/main_test.go b/config/main_test.go index 65e932268f..6e30024c07 100644 --- a/config/main_test.go +++ b/config/main_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/go-sql-driver/mysql" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/testlib" "github.com/stretchr/testify/require" ) diff --git a/config/memory.go b/config/memory.go index 353d13bbaa..3e3fa5e826 100644 --- a/config/memory.go +++ b/config/memory.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // memoryStore implements the Store interface. It is meant primarily for testing. diff --git a/config/memory_test.go b/config/memory_test.go index 531daabc98..2200e26ba5 100644 --- a/config/memory_test.go +++ b/config/memory_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/model" ) func setupConfigMemory(t *testing.T) { diff --git a/config/migrate_test.go b/config/migrate_test.go index 0560a7d01b..932fd67d49 100644 --- a/config/migrate_test.go +++ b/config/migrate_test.go @@ -2,7 +2,7 @@ package config import ( "fmt" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/config/store.go b/config/store.go index e01e36265f..231ee50549 100644 --- a/config/store.go +++ b/config/store.go @@ -6,7 +6,7 @@ package config import ( "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // Listener is a callback function invoked when the configuration changes. diff --git a/config/store_test.go b/config/store_test.go index 97886885bf..5f0536e6c0 100644 --- a/config/store_test.go +++ b/config/store_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/config" + "github.com/mattermost/mattermost-server/v5/config" "github.com/stretchr/testify/require" ) diff --git a/config/unmarshal.go b/config/unmarshal.go index 51bf41c266..3bfa02226b 100644 --- a/config/unmarshal.go +++ b/config/unmarshal.go @@ -14,9 +14,9 @@ import ( "github.com/mattermost/viper" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/jsonutils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/jsonutils" ) // newViper creates an instance of viper.Viper configured for parsing a configuration. diff --git a/config/unmarshal_test.go b/config/unmarshal_test.go index 6880d8d5a7..a303134abb 100644 --- a/config/unmarshal_test.go +++ b/config/unmarshal_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func TestGetDefaultsFromStruct(t *testing.T) { diff --git a/config/utils.go b/config/utils.go index 3e934d439b..0a30b822b1 100644 --- a/config/utils.go +++ b/config/utils.go @@ -6,9 +6,9 @@ package config import ( "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) // desanitize replaces fake settings with their actual values. diff --git a/config/utils_test.go b/config/utils_test.go index 131c843e7c..cafbc09242 100644 --- a/config/utils_test.go +++ b/config/utils_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func TestDesanitize(t *testing.T) { diff --git a/config/watcher.go b/config/watcher.go index 87bc78d0a8..b6eb6159ee 100644 --- a/config/watcher.go +++ b/config/watcher.go @@ -9,7 +9,7 @@ import ( "github.com/fsnotify/fsnotify" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) // watcher monitors a file for changes diff --git a/einterfaces/account_migration.go b/einterfaces/account_migration.go index ab61544ff2..b22510ad25 100644 --- a/einterfaces/account_migration.go +++ b/einterfaces/account_migration.go @@ -3,7 +3,7 @@ package einterfaces -import "github.com/mattermost/mattermost-server/model" +import "github.com/mattermost/mattermost-server/v5/model" type AccountMigrationInterface interface { MigrateToLdap(fromAuthService string, forignUserFieldNameToMatch string, force bool, dryRun bool) *model.AppError diff --git a/einterfaces/cluster.go b/einterfaces/cluster.go index dd9c57f112..653dd06d6d 100644 --- a/einterfaces/cluster.go +++ b/einterfaces/cluster.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type ClusterMessageHandler func(msg *model.ClusterMessage) diff --git a/einterfaces/compliance.go b/einterfaces/compliance.go index 14927bee47..d50fadc674 100644 --- a/einterfaces/compliance.go +++ b/einterfaces/compliance.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type ComplianceInterface interface { diff --git a/einterfaces/data_retention.go b/einterfaces/data_retention.go index 07f7d387d6..0671424fbe 100644 --- a/einterfaces/data_retention.go +++ b/einterfaces/data_retention.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type DataRetentionInterface interface { diff --git a/einterfaces/elasticsearch.go b/einterfaces/elasticsearch.go index 772cf50c56..423d14ddde 100644 --- a/einterfaces/elasticsearch.go +++ b/einterfaces/elasticsearch.go @@ -6,7 +6,7 @@ package einterfaces import ( "time" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type ElasticsearchInterface interface { diff --git a/einterfaces/jobs/data_retention.go b/einterfaces/jobs/data_retention.go index 73f78e4fe9..95264dc355 100644 --- a/einterfaces/jobs/data_retention.go +++ b/einterfaces/jobs/data_retention.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type DataRetentionJobInterface interface { diff --git a/einterfaces/jobs/elasticsearch.go b/einterfaces/jobs/elasticsearch.go index 16e0d76976..a524288862 100644 --- a/einterfaces/jobs/elasticsearch.go +++ b/einterfaces/jobs/elasticsearch.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type ElasticsearchIndexerInterface interface { diff --git a/einterfaces/jobs/ldap_sync.go b/einterfaces/jobs/ldap_sync.go index 5565afe415..8af1ffa20b 100644 --- a/einterfaces/jobs/ldap_sync.go +++ b/einterfaces/jobs/ldap_sync.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type LdapSyncInterface interface { diff --git a/einterfaces/jobs/message_export.go b/einterfaces/jobs/message_export.go index 74b0df751a..611fb46764 100644 --- a/einterfaces/jobs/message_export.go +++ b/einterfaces/jobs/message_export.go @@ -4,7 +4,7 @@ package jobs import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type MessageExportJobInterface interface { diff --git a/einterfaces/ldap.go b/einterfaces/ldap.go index 36c075f31d..794730b3c7 100644 --- a/einterfaces/ldap.go +++ b/einterfaces/ldap.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type LdapInterface interface { diff --git a/einterfaces/message_export.go b/einterfaces/message_export.go index 8fde650708..8105089467 100644 --- a/einterfaces/message_export.go +++ b/einterfaces/message_export.go @@ -6,7 +6,7 @@ package einterfaces import ( "context" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type MessageExportInterface interface { diff --git a/einterfaces/mfa.go b/einterfaces/mfa.go index 3afe961e39..2c69f020b9 100644 --- a/einterfaces/mfa.go +++ b/einterfaces/mfa.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type MfaInterface interface { diff --git a/einterfaces/mocks/AccountMigrationInterface.go b/einterfaces/mocks/AccountMigrationInterface.go index 3b4104f795..e01fdc848b 100644 --- a/einterfaces/mocks/AccountMigrationInterface.go +++ b/einterfaces/mocks/AccountMigrationInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // AccountMigrationInterface is an autogenerated mock type for the AccountMigrationInterface type type AccountMigrationInterface struct { diff --git a/einterfaces/mocks/ClusterInterface.go b/einterfaces/mocks/ClusterInterface.go index 708ca665c0..51fecb649d 100644 --- a/einterfaces/mocks/ClusterInterface.go +++ b/einterfaces/mocks/ClusterInterface.go @@ -4,9 +4,9 @@ package mocks -import einterfaces "github.com/mattermost/mattermost-server/einterfaces" +import einterfaces "github.com/mattermost/mattermost-server/v5/einterfaces" import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // ClusterInterface is an autogenerated mock type for the ClusterInterface type type ClusterInterface struct { diff --git a/einterfaces/mocks/ComplianceInterface.go b/einterfaces/mocks/ComplianceInterface.go index b2ec0d5f42..108547f2d2 100644 --- a/einterfaces/mocks/ComplianceInterface.go +++ b/einterfaces/mocks/ComplianceInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // ComplianceInterface is an autogenerated mock type for the ComplianceInterface type type ComplianceInterface struct { diff --git a/einterfaces/mocks/DataRetentionInterface.go b/einterfaces/mocks/DataRetentionInterface.go index ce5bd80dbc..54656ee5b6 100644 --- a/einterfaces/mocks/DataRetentionInterface.go +++ b/einterfaces/mocks/DataRetentionInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // DataRetentionInterface is an autogenerated mock type for the DataRetentionInterface type type DataRetentionInterface struct { diff --git a/einterfaces/mocks/DataRetentionJobInterface.go b/einterfaces/mocks/DataRetentionJobInterface.go index ffc2d4feda..5594956519 100644 --- a/einterfaces/mocks/DataRetentionJobInterface.go +++ b/einterfaces/mocks/DataRetentionJobInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // DataRetentionJobInterface is an autogenerated mock type for the DataRetentionJobInterface type type DataRetentionJobInterface struct { diff --git a/einterfaces/mocks/ElasticsearchAggregatorInterface.go b/einterfaces/mocks/ElasticsearchAggregatorInterface.go index 123856163e..95e0a16c97 100644 --- a/einterfaces/mocks/ElasticsearchAggregatorInterface.go +++ b/einterfaces/mocks/ElasticsearchAggregatorInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // ElasticsearchAggregatorInterface is an autogenerated mock type for the ElasticsearchAggregatorInterface type type ElasticsearchAggregatorInterface struct { diff --git a/einterfaces/mocks/ElasticsearchIndexerInterface.go b/einterfaces/mocks/ElasticsearchIndexerInterface.go index fd7817597a..e3342aa00d 100644 --- a/einterfaces/mocks/ElasticsearchIndexerInterface.go +++ b/einterfaces/mocks/ElasticsearchIndexerInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // ElasticsearchIndexerInterface is an autogenerated mock type for the ElasticsearchIndexerInterface type type ElasticsearchIndexerInterface struct { diff --git a/einterfaces/mocks/ElasticsearchInterface.go b/einterfaces/mocks/ElasticsearchInterface.go index c6a535ce78..59b699d077 100644 --- a/einterfaces/mocks/ElasticsearchInterface.go +++ b/einterfaces/mocks/ElasticsearchInterface.go @@ -7,7 +7,7 @@ package mocks import ( time "time" - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/einterfaces/mocks/LdapInterface.go b/einterfaces/mocks/LdapInterface.go index 2bc7be7368..f9b3eb64da 100644 --- a/einterfaces/mocks/LdapInterface.go +++ b/einterfaces/mocks/LdapInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // LdapInterface is an autogenerated mock type for the LdapInterface type type LdapInterface struct { diff --git a/einterfaces/mocks/LdapSyncInterface.go b/einterfaces/mocks/LdapSyncInterface.go index 151b240e01..c1c19d10ca 100644 --- a/einterfaces/mocks/LdapSyncInterface.go +++ b/einterfaces/mocks/LdapSyncInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // LdapSyncInterface is an autogenerated mock type for the LdapSyncInterface type type LdapSyncInterface struct { diff --git a/einterfaces/mocks/MessageExportInterface.go b/einterfaces/mocks/MessageExportInterface.go index 5a8e9bbcb7..543bda3137 100644 --- a/einterfaces/mocks/MessageExportInterface.go +++ b/einterfaces/mocks/MessageExportInterface.go @@ -7,7 +7,7 @@ package mocks import context "context" import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // MessageExportInterface is an autogenerated mock type for the MessageExportInterface type type MessageExportInterface struct { diff --git a/einterfaces/mocks/MessageExportJobInterface.go b/einterfaces/mocks/MessageExportJobInterface.go index e073cf6d5b..46a4800bac 100644 --- a/einterfaces/mocks/MessageExportJobInterface.go +++ b/einterfaces/mocks/MessageExportJobInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // MessageExportJobInterface is an autogenerated mock type for the MessageExportJobInterface type type MessageExportJobInterface struct { diff --git a/einterfaces/mocks/MfaInterface.go b/einterfaces/mocks/MfaInterface.go index 92978f8ffc..3014bb130b 100644 --- a/einterfaces/mocks/MfaInterface.go +++ b/einterfaces/mocks/MfaInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // MfaInterface is an autogenerated mock type for the MfaInterface type type MfaInterface struct { diff --git a/einterfaces/mocks/OauthProvider.go b/einterfaces/mocks/OauthProvider.go index 1db869dec8..73436a8b61 100644 --- a/einterfaces/mocks/OauthProvider.go +++ b/einterfaces/mocks/OauthProvider.go @@ -6,7 +6,7 @@ package mocks import io "io" import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // OauthProvider is an autogenerated mock type for the OauthProvider type type OauthProvider struct { diff --git a/einterfaces/mocks/SamlInterface.go b/einterfaces/mocks/SamlInterface.go index f0b40a7322..383826755f 100644 --- a/einterfaces/mocks/SamlInterface.go +++ b/einterfaces/mocks/SamlInterface.go @@ -5,7 +5,7 @@ package mocks import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // SamlInterface is an autogenerated mock type for the SamlInterface type type SamlInterface struct { diff --git a/einterfaces/notification.go b/einterfaces/notification.go index ed4ecd4b6c..e9f8a89218 100644 --- a/einterfaces/notification.go +++ b/einterfaces/notification.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type NotificationInterface interface { diff --git a/einterfaces/oauthproviders.go b/einterfaces/oauthproviders.go index 178c17c116..3ac78dd518 100644 --- a/einterfaces/oauthproviders.go +++ b/einterfaces/oauthproviders.go @@ -6,7 +6,7 @@ package einterfaces import ( "io" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type OauthProvider interface { diff --git a/einterfaces/saml.go b/einterfaces/saml.go index b94726a617..8e45a519c5 100644 --- a/einterfaces/saml.go +++ b/einterfaces/saml.go @@ -4,7 +4,7 @@ package einterfaces import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type SamlInterface interface { diff --git a/go.mod b/go.mod index 1095c73f82..a74c37b964 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mattermost/mattermost-server +module github.com/mattermost/mattermost-server/v5 go 1.12 diff --git a/imports/placeholder.go b/imports/placeholder.go index 2f00409d1d..c416897ac1 100644 --- a/imports/placeholder.go +++ b/imports/placeholder.go @@ -6,6 +6,6 @@ package imports // This is a placeholder so this package can be imported in Team Edition when it will be otherwise empty import ( - _ "github.com/mattermost/mattermost-server/migrations" - _ "github.com/mattermost/mattermost-server/plugin/scheduler" + _ "github.com/mattermost/mattermost-server/v5/migrations" + _ "github.com/mattermost/mattermost-server/v5/plugin/scheduler" ) diff --git a/jobs/interfaces/migrations_interface.go b/jobs/interfaces/migrations_interface.go index 48dc9f5798..d72f254118 100644 --- a/jobs/interfaces/migrations_interface.go +++ b/jobs/interfaces/migrations_interface.go @@ -3,7 +3,7 @@ package interfaces -import "github.com/mattermost/mattermost-server/model" +import "github.com/mattermost/mattermost-server/v5/model" type MigrationsJobInterface interface { MakeWorker() model.Worker diff --git a/jobs/interfaces/plugins_interface.go b/jobs/interfaces/plugins_interface.go index 4d67129af3..a2dd10d56d 100644 --- a/jobs/interfaces/plugins_interface.go +++ b/jobs/interfaces/plugins_interface.go @@ -3,7 +3,7 @@ package interfaces -import "github.com/mattermost/mattermost-server/model" +import "github.com/mattermost/mattermost-server/v5/model" type PluginsJobInterface interface { MakeWorker() model.Worker diff --git a/jobs/jobs.go b/jobs/jobs.go index d596bd044e..1aae32f1c3 100644 --- a/jobs/jobs.go +++ b/jobs/jobs.go @@ -9,8 +9,8 @@ import ( "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/jobs/jobs_watcher.go b/jobs/jobs_watcher.go index c9b4136758..015425f8da 100644 --- a/jobs/jobs_watcher.go +++ b/jobs/jobs_watcher.go @@ -7,8 +7,8 @@ import ( "math/rand" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) // Default polling interval for jobs termination. diff --git a/jobs/schedulers.go b/jobs/schedulers.go index 704fbb5759..4ef547f6da 100644 --- a/jobs/schedulers.go +++ b/jobs/schedulers.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type Schedulers struct { diff --git a/jobs/schedulers_test.go b/jobs/schedulers_test.go index 35dd4fc5f8..fdc9455b4c 100644 --- a/jobs/schedulers_test.go +++ b/jobs/schedulers_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/einterfaces/mocks" - "github.com/mattermost/mattermost-server/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v5/einterfaces/mocks" + "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/utils/testutils" ) type MockScheduler struct { diff --git a/jobs/server.go b/jobs/server.go index 06897e43ab..40ce5c0c08 100644 --- a/jobs/server.go +++ b/jobs/server.go @@ -4,11 +4,11 @@ package jobs import ( - ejobs "github.com/mattermost/mattermost-server/einterfaces/jobs" - tjobs "github.com/mattermost/mattermost-server/jobs/interfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/configservice" - "github.com/mattermost/mattermost-server/store" + ejobs "github.com/mattermost/mattermost-server/v5/einterfaces/jobs" + tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/configservice" + "github.com/mattermost/mattermost-server/v5/store" ) type JobServer struct { diff --git a/jobs/workers.go b/jobs/workers.go index 66904d949f..29b98950ec 100644 --- a/jobs/workers.go +++ b/jobs/workers.go @@ -6,9 +6,9 @@ package jobs import ( "sync" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/configservice" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/configservice" ) type Workers struct { diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go index 7dbd7aac91..0cfabef3f0 100644 --- a/manualtesting/manual_testing.go +++ b/manualtesting/manual_testing.go @@ -11,12 +11,12 @@ import ( "strconv" "time" - "github.com/mattermost/mattermost-server/api4" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/web" + "github.com/mattermost/mattermost-server/v5/api4" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/web" ) type TestEnvironment struct { diff --git a/manualtesting/test_autolink.go b/manualtesting/test_autolink.go index 05fd45551b..823a4c46b8 100644 --- a/manualtesting/test_autolink.go +++ b/manualtesting/test_autolink.go @@ -6,8 +6,8 @@ package manualtesting import ( "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) const LINK_POST_TEXT = ` diff --git a/migrations/advanced_permissions_phase_2.go b/migrations/advanced_permissions_phase_2.go index 6cd32015b2..b65f4116ad 100644 --- a/migrations/advanced_permissions_phase_2.go +++ b/migrations/advanced_permissions_phase_2.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type AdvancedPermissionsPhase2Progress struct { diff --git a/migrations/helper_test.go b/migrations/helper_test.go index cae7b01a5e..055d6e7642 100644 --- a/migrations/helper_test.go +++ b/migrations/helper_test.go @@ -7,11 +7,11 @@ import ( "os" "time" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type TestHelper struct { diff --git a/migrations/main_test.go b/migrations/main_test.go index 0a633023a2..d4b36ff4da 100644 --- a/migrations/main_test.go +++ b/migrations/main_test.go @@ -6,7 +6,7 @@ package migrations import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/migrations/migrations.go b/migrations/migrations.go index 39bcd8c591..a0200be0e0 100644 --- a/migrations/migrations.go +++ b/migrations/migrations.go @@ -4,10 +4,10 @@ package migrations import ( - "github.com/mattermost/mattermost-server/app" - tjobs "github.com/mattermost/mattermost-server/jobs/interfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/app" + tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) const ( diff --git a/migrations/migrations_test.go b/migrations/migrations_test.go index a21c222d49..4a138c4e5f 100644 --- a/migrations/migrations_test.go +++ b/migrations/migrations_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestGetMigrationState(t *testing.T) { diff --git a/migrations/scheduler.go b/migrations/scheduler.go index 9baa56e30a..798fc650cf 100644 --- a/migrations/scheduler.go +++ b/migrations/scheduler.go @@ -6,10 +6,10 @@ package migrations import ( "time" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) const ( diff --git a/migrations/worker.go b/migrations/worker.go index d55e3b66f3..c887b04be3 100644 --- a/migrations/worker.go +++ b/migrations/worker.go @@ -8,10 +8,10 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/jobs" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/jobs" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/mlog/global_test.go b/mlog/global_test.go index 0068e2eb38..8bf24a33e9 100644 --- a/mlog/global_test.go +++ b/mlog/global_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) func TestLoggingBeforeInitialized(t *testing.T) { diff --git a/mlog/human/entry.go b/mlog/human/entry.go index f6a3a3333e..8790e00253 100644 --- a/mlog/human/entry.go +++ b/mlog/human/entry.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) type LogEntry struct { diff --git a/mlog/human/parser.go b/mlog/human/parser.go index 1aa738aeaa..17dd23bb1f 100644 --- a/mlog/human/parser.go +++ b/mlog/human/parser.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) func ParseLogMessage(msg string) LogEntry { diff --git a/mlog/main_test.go b/mlog/main_test.go index f8175de560..e5426e3105 100644 --- a/mlog/main_test.go +++ b/mlog/main_test.go @@ -6,7 +6,7 @@ package mlog_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/model/bundle_info.go b/model/bundle_info.go index 7cb06701ad..f0e5be06a5 100644 --- a/model/bundle_info.go +++ b/model/bundle_info.go @@ -3,7 +3,7 @@ package model -import "github.com/mattermost/mattermost-server/mlog" +import "github.com/mattermost/mattermost-server/v5/mlog" type BundleInfo struct { Path string diff --git a/model/client4_test.go b/model/client4_test.go index 87f2c285da..c129b3e615 100644 --- a/model/client4_test.go +++ b/model/client4_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" ) -// https://github.com/mattermost/mattermost-server/issues/8205 +// https://github.com/mattermost/mattermost-server/v5/issues/8205 func TestClient4CreatePost(t *testing.T) { post := &Post{ Props: map[string]interface{}{ diff --git a/model/command_response.go b/model/command_response.go index 6335cef0d1..4099f62093 100644 --- a/model/command_response.go +++ b/model/command_response.go @@ -9,7 +9,7 @@ import ( "io/ioutil" "strings" - "github.com/mattermost/mattermost-server/utils/jsonutils" + "github.com/mattermost/mattermost-server/v5/utils/jsonutils" ) const ( diff --git a/model/gitlab/gitlab.go b/model/gitlab/gitlab.go index f0a388b6a9..852735d51f 100644 --- a/model/gitlab/gitlab.go +++ b/model/gitlab/gitlab.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" ) type GitLabProvider struct { diff --git a/model/main_test.go b/model/main_test.go index d42ebf9cc6..8533f72ed2 100644 --- a/model/main_test.go +++ b/model/main_test.go @@ -6,7 +6,7 @@ package model_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/model/post.go b/model/post.go index 93241af09e..2ae2c2d537 100644 --- a/model/post.go +++ b/model/post.go @@ -11,7 +11,7 @@ import ( "strings" "unicode/utf8" - "github.com/mattermost/mattermost-server/utils/markdown" + "github.com/mattermost/mattermost-server/v5/utils/markdown" ) const ( diff --git a/model/user.go b/model/user.go index e13aa34167..a66069cfb9 100644 --- a/model/user.go +++ b/model/user.go @@ -17,7 +17,7 @@ import ( "time" "unicode/utf8" - "github.com/mattermost/mattermost-server/services/timezones" + "github.com/mattermost/mattermost-server/v5/services/timezones" "golang.org/x/crypto/bcrypt" "golang.org/x/text/language" ) diff --git a/plugin/api.go b/plugin/api.go index 4205a162f2..3cdc1df629 100644 --- a/plugin/api.go +++ b/plugin/api.go @@ -8,7 +8,7 @@ import ( "net/http" plugin "github.com/hashicorp/go-plugin" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // The API can be used to retrieve data or perform actions on behalf of the plugin. Most methods diff --git a/plugin/checker/check_api.go b/plugin/checker/check_api.go index e5b9ec716f..81db539031 100644 --- a/plugin/checker/check_api.go +++ b/plugin/checker/check_api.go @@ -8,8 +8,8 @@ import ( "go/ast" "go/token" - "github.com/mattermost/mattermost-server/plugin/checker/internal/asthelpers" - "github.com/mattermost/mattermost-server/plugin/checker/internal/version" + "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/asthelpers" + "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/version" ) func checkAPIVersionComments(pkgPath string) (result, error) { diff --git a/plugin/checker/check_api_test.go b/plugin/checker/check_api_test.go index 529da48947..0c8ee9c6d6 100644 --- a/plugin/checker/check_api_test.go +++ b/plugin/checker/check_api_test.go @@ -17,24 +17,24 @@ func TestCheckAPIVersionComments(t *testing.T) { }{ { name: "valid comments", - pkgPath: "github.com/mattermost/mattermost-server/plugin/checker/internal/test/valid", + pkgPath: "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/test/valid", err: "", }, { name: "invalid comments", - pkgPath: "github.com/mattermost/mattermost-server/plugin/checker/internal/test/invalid", + pkgPath: "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/test/invalid", expected: result{ Errors: []string{"internal/test/invalid/invalid.go:15:2: missing a minimum server version comment on method InvalidMethod"}, }, }, { name: "missing API interface", - pkgPath: "github.com/mattermost/mattermost-server/plugin/checker/internal/test/missing", + pkgPath: "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/test/missing", err: "could not find API interface", }, { name: "non-existent package path", - pkgPath: "github.com/mattermost/mattermost-server/plugin/checker/internal/test/does_not_exist", + pkgPath: "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/test/does_not_exist", err: "could not find API interface", }, } diff --git a/plugin/checker/check_helpers.go b/plugin/checker/check_helpers.go index 8c2de7f5d1..f94738ba75 100644 --- a/plugin/checker/check_helpers.go +++ b/plugin/checker/check_helpers.go @@ -9,8 +9,8 @@ import ( "go/token" "go/types" - "github.com/mattermost/mattermost-server/plugin/checker/internal/asthelpers" - "github.com/mattermost/mattermost-server/plugin/checker/internal/version" + "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/asthelpers" + "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/version" "github.com/pkg/errors" ) diff --git a/plugin/checker/check_helpers_test.go b/plugin/checker/check_helpers_test.go index d87d976d41..69f245fce2 100644 --- a/plugin/checker/check_helpers_test.go +++ b/plugin/checker/check_helpers_test.go @@ -17,12 +17,12 @@ func TestCheckHelpersVersionComments(t *testing.T) { }{ { name: "valid versions", - pkgPath: "github.com/mattermost/mattermost-server/plugin/checker/internal/test/valid", + pkgPath: "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/test/valid", expected: result{}, }, { name: "invalid versions", - pkgPath: "github.com/mattermost/mattermost-server/plugin/checker/internal/test/invalid", + pkgPath: "github.com/mattermost/mattermost-server/v5/plugin/checker/internal/test/invalid", expected: result{ Errors: []string{"internal/test/invalid/invalid.go:20:2: documented minimum server version too low on method LowerVersionMethod"}, Warnings: []string{"internal/test/invalid/invalid.go:23:2: documented minimum server version too high on method HigherVersionMethod"}, diff --git a/plugin/checker/main.go b/plugin/checker/main.go index d7e956426e..0269cee0e5 100644 --- a/plugin/checker/main.go +++ b/plugin/checker/main.go @@ -10,7 +10,7 @@ import ( "strings" ) -const pluginPackagePath = "github.com/mattermost/mattermost-server/plugin" +const pluginPackagePath = "github.com/mattermost/mattermost-server/v5/plugin" type result struct { Warnings []string diff --git a/plugin/client_rpc.go b/plugin/client_rpc.go index 1eb8ce08da..d04f138caa 100644 --- a/plugin/client_rpc.go +++ b/plugin/client_rpc.go @@ -20,8 +20,8 @@ import ( "github.com/dyatlov/go-opengraph/opengraph" "github.com/hashicorp/go-plugin" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) var hookNameToId map[string]int = make(map[string]int) diff --git a/plugin/client_rpc_generated.go b/plugin/client_rpc_generated.go index 67543f50cc..afbf0fbdbf 100644 --- a/plugin/client_rpc_generated.go +++ b/plugin/client_rpc_generated.go @@ -11,8 +11,8 @@ import ( "io" "log" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) func init() { diff --git a/plugin/environment.go b/plugin/environment.go index 3a9cdf7ab0..78e4f8f19d 100644 --- a/plugin/environment.go +++ b/plugin/environment.go @@ -12,9 +12,9 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/pkg/errors" ) diff --git a/plugin/example_hello_world_test.go b/plugin/example_hello_world_test.go index 26f25c91ab..ef7ae83a05 100644 --- a/plugin/example_hello_world_test.go +++ b/plugin/example_hello_world_test.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" ) type HelloWorldPlugin struct { diff --git a/plugin/example_help_test.go b/plugin/example_help_test.go index e4aa9dec33..afd8114ab2 100644 --- a/plugin/example_help_test.go +++ b/plugin/example_help_test.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" ) // configuration represents the configuration for this plugin as exposed via the Mattermost diff --git a/plugin/hclog_adapter.go b/plugin/hclog_adapter.go index b67b83996b..8323210fe4 100644 --- a/plugin/hclog_adapter.go +++ b/plugin/hclog_adapter.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/hashicorp/go-hclog" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) type hclogAdapter struct { diff --git a/plugin/health_check.go b/plugin/health_check.go index 3cab84b9da..2a6545f4cf 100644 --- a/plugin/health_check.go +++ b/plugin/health_check.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/plugin/health_check_test.go b/plugin/health_check_test.go index 5e01fc2fba..0b3b79b763 100644 --- a/plugin/health_check_test.go +++ b/plugin/health_check_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/require" ) @@ -35,7 +35,7 @@ func testPluginHealthCheck_Success(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" ) type MyPlugin struct { @@ -76,8 +76,8 @@ func testPluginHealthCheck_Panic(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" ) type MyPlugin struct { diff --git a/plugin/helpers.go b/plugin/helpers.go index 31cc728d1c..a871cf4584 100644 --- a/plugin/helpers.go +++ b/plugin/helpers.go @@ -5,7 +5,7 @@ package plugin import ( "github.com/blang/semver" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" ) diff --git a/plugin/helpers_bots.go b/plugin/helpers_bots.go index 142ccc49b3..0450105d26 100644 --- a/plugin/helpers_bots.go +++ b/plugin/helpers_bots.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type ensureBotOptions struct { diff --git a/plugin/helpers_bots_test.go b/plugin/helpers_bots_test.go index 8960e61efe..693f96d515 100644 --- a/plugin/helpers_bots_test.go +++ b/plugin/helpers_bots_test.go @@ -8,11 +8,11 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/plugin/plugintest" - "github.com/mattermost/mattermost-server/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/plugin/plugintest" + "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" "github.com/stretchr/testify/assert" ) diff --git a/plugin/helpers_kv_test.go b/plugin/helpers_kv_test.go index 2f29b587ce..b1089e9574 100644 --- a/plugin/helpers_kv_test.go +++ b/plugin/helpers_kv_test.go @@ -3,9 +3,9 @@ package plugin_test import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/plugin/plugintest" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/plugin/plugintest" "github.com/stretchr/testify/assert" ) diff --git a/plugin/hooks.go b/plugin/hooks.go index 2b2d912011..dec0adc6ce 100644 --- a/plugin/hooks.go +++ b/plugin/hooks.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // These assignments are part of the wire protocol used to trigger hook events in plugins. diff --git a/plugin/http.go b/plugin/http.go index e39e36001f..d7b9956f7d 100644 --- a/plugin/http.go +++ b/plugin/http.go @@ -10,7 +10,7 @@ import ( "net/http" "net/rpc" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) type httpResponseWriterRPCServer struct { diff --git a/plugin/interface_generator/main.go b/plugin/interface_generator/main.go index 4a80edaa23..4e139e693a 100644 --- a/plugin/interface_generator/main.go +++ b/plugin/interface_generator/main.go @@ -379,7 +379,7 @@ func generateGlue(info *PluginInterfaceInfo) { } func getPluginPackageDir() string { - dirs, err := goList("github.com/mattermost/mattermost-server/plugin") + dirs, err := goList("github.com/mattermost/mattermost-server/v5/plugin") if err != nil { panic(err) } else if len(dirs) != 1 { diff --git a/plugin/main_test.go b/plugin/main_test.go index a2eeb92c2b..db3a7358d2 100644 --- a/plugin/main_test.go +++ b/plugin/main_test.go @@ -6,7 +6,7 @@ package plugin_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/plugin/plugintest/api.go b/plugin/plugintest/api.go index d7e3525e71..b0059ea3cc 100644 --- a/plugin/plugintest/api.go +++ b/plugin/plugintest/api.go @@ -10,7 +10,7 @@ import ( mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" ) // API is an autogenerated mock type for the API type diff --git a/plugin/plugintest/doc.go b/plugin/plugintest/doc.go index 69a51bd397..383711395e 100644 --- a/plugin/plugintest/doc.go +++ b/plugin/plugintest/doc.go @@ -7,5 +7,5 @@ // https://godoc.org/github.com/stretchr/testify/mock // // If you need to import the mock package, you can import it with -// "github.com/mattermost/mattermost-server/plugin/plugintest/mock". +// "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock". package plugintest diff --git a/plugin/plugintest/example_hello_user_test.go b/plugin/plugintest/example_hello_user_test.go index 145f3fadac..24d053589d 100644 --- a/plugin/plugintest/example_hello_user_test.go +++ b/plugin/plugintest/example_hello_user_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/plugin/plugintest" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/plugin/plugintest" ) type HelloUserPlugin struct { diff --git a/plugin/plugintest/helpers.go b/plugin/plugintest/helpers.go index e8839b8185..e79ad4a379 100644 --- a/plugin/plugintest/helpers.go +++ b/plugin/plugintest/helpers.go @@ -5,8 +5,8 @@ package plugintest import ( - model "github.com/mattermost/mattermost-server/model" - plugin "github.com/mattermost/mattermost-server/plugin" + model "github.com/mattermost/mattermost-server/v5/model" + plugin "github.com/mattermost/mattermost-server/v5/plugin" mock "github.com/stretchr/testify/mock" ) diff --git a/plugin/plugintest/hooks.go b/plugin/plugintest/hooks.go index ef317bf4e2..51648c5517 100644 --- a/plugin/plugintest/hooks.go +++ b/plugin/plugintest/hooks.go @@ -10,9 +10,9 @@ import ( mock "github.com/stretchr/testify/mock" - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" - plugin "github.com/mattermost/mattermost-server/plugin" + plugin "github.com/mattermost/mattermost-server/v5/plugin" ) // Hooks is an autogenerated mock type for the Hooks type diff --git a/plugin/scheduler/plugin.go b/plugin/scheduler/plugin.go index a0d63473a8..50b0863980 100644 --- a/plugin/scheduler/plugin.go +++ b/plugin/scheduler/plugin.go @@ -4,8 +4,8 @@ package scheduler import ( - "github.com/mattermost/mattermost-server/app" - tjobs "github.com/mattermost/mattermost-server/jobs/interfaces" + "github.com/mattermost/mattermost-server/v5/app" + tjobs "github.com/mattermost/mattermost-server/v5/jobs/interfaces" ) type PluginsJobInterfaceImpl struct { diff --git a/plugin/scheduler/scheduler.go b/plugin/scheduler/scheduler.go index 685b073106..a14641470b 100644 --- a/plugin/scheduler/scheduler.go +++ b/plugin/scheduler/scheduler.go @@ -6,9 +6,9 @@ package scheduler import ( "time" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) const pluginsJobInterval = 24 * 60 * 60 * time.Second diff --git a/plugin/scheduler/worker.go b/plugin/scheduler/worker.go index ec293defea..1dc746a851 100644 --- a/plugin/scheduler/worker.go +++ b/plugin/scheduler/worker.go @@ -4,10 +4,10 @@ package scheduler import ( - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/jobs" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/jobs" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type Worker struct { diff --git a/plugin/supervisor.go b/plugin/supervisor.go index 820b6bee8b..3b5ecba8d6 100644 --- a/plugin/supervisor.go +++ b/plugin/supervisor.go @@ -12,8 +12,8 @@ import ( "time" plugin "github.com/hashicorp/go-plugin" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type supervisor struct { diff --git a/plugin/supervisor_test.go b/plugin/supervisor_test.go index 8f9647d64f..2515e39f35 100644 --- a/plugin/supervisor_test.go +++ b/plugin/supervisor_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/plugin/valid_test.go b/plugin/valid_test.go index d166fd49f2..7fa10003e9 100644 --- a/plugin/valid_test.go +++ b/plugin/valid_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" ) func TestIsValid(t *testing.T) { diff --git a/services/configservice/configservice.go b/services/configservice/configservice.go index e5b5ef032b..66a16a35c8 100644 --- a/services/configservice/configservice.go +++ b/services/configservice/configservice.go @@ -6,7 +6,7 @@ package configservice import ( "crypto/ecdsa" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) // An interface representing something that contains a Config, such as the app.App struct diff --git a/services/filesstore/filesstore.go b/services/filesstore/filesstore.go index 27f5bc9618..6bc6316bd0 100644 --- a/services/filesstore/filesstore.go +++ b/services/filesstore/filesstore.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type ReadCloseSeeker interface { diff --git a/services/filesstore/filesstore_test.go b/services/filesstore/filesstore_test.go index 6de790fd55..09f12488c2 100644 --- a/services/filesstore/filesstore_test.go +++ b/services/filesstore/filesstore_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type FileBackendTestSuite struct { diff --git a/services/filesstore/localstore.go b/services/filesstore/localstore.go index b52494190f..cdadab4160 100644 --- a/services/filesstore/localstore.go +++ b/services/filesstore/localstore.go @@ -11,9 +11,9 @@ import ( "os" "path/filepath" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/services/filesstore/main_test.go b/services/filesstore/main_test.go index fc01b7513f..cf342d5ca9 100644 --- a/services/filesstore/main_test.go +++ b/services/filesstore/main_test.go @@ -6,7 +6,7 @@ package filesstore_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/services/filesstore/mocks/FileBackend.go b/services/filesstore/mocks/FileBackend.go index 5d75ae5d1c..3521fca4f9 100644 --- a/services/filesstore/mocks/FileBackend.go +++ b/services/filesstore/mocks/FileBackend.go @@ -6,7 +6,7 @@ package mocks import io "io" import mock "github.com/stretchr/testify/mock" -import model "github.com/mattermost/mattermost-server/model" +import model "github.com/mattermost/mattermost-server/v5/model" // FileBackend is an autogenerated mock type for the FileBackend type type FileBackend struct { diff --git a/services/filesstore/s3store.go b/services/filesstore/s3store.go index 2e80aab8b2..f7d65a9be0 100644 --- a/services/filesstore/s3store.go +++ b/services/filesstore/s3store.go @@ -16,8 +16,8 @@ import ( "github.com/minio/minio-go/v6/pkg/credentials" "github.com/minio/minio-go/v6/pkg/encrypt" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) type S3FileBackend struct { diff --git a/services/filesstore/s3store_test.go b/services/filesstore/s3store_test.go index b6e423a427..2ccbf2dabf 100644 --- a/services/filesstore/s3store_test.go +++ b/services/filesstore/s3store_test.go @@ -6,7 +6,7 @@ package filesstore import ( "testing" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/require" ) diff --git a/services/httpservice/client.go b/services/httpservice/client.go index bac32c1ce5..d3031a130a 100644 --- a/services/httpservice/client.go +++ b/services/httpservice/client.go @@ -11,7 +11,7 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/services/httpservice/httpservice.go b/services/httpservice/httpservice.go index bbdc19e88f..33ec661a82 100644 --- a/services/httpservice/httpservice.go +++ b/services/httpservice/httpservice.go @@ -10,7 +10,7 @@ import ( "time" "unicode" - "github.com/mattermost/mattermost-server/services/configservice" + "github.com/mattermost/mattermost-server/v5/services/configservice" ) // HTTPService wraps the functionality for making http requests to provide some improvements to the default client diff --git a/services/httpservice/main_test.go b/services/httpservice/main_test.go index 13dbf83a40..797f5c8000 100644 --- a/services/httpservice/main_test.go +++ b/services/httpservice/main_test.go @@ -6,7 +6,7 @@ package httpservice_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/services/imageproxy/atmos_camo_test.go b/services/imageproxy/atmos_camo_test.go index eee2470ccf..2d86175676 100644 --- a/services/imageproxy/atmos_camo_test.go +++ b/services/imageproxy/atmos_camo_test.go @@ -9,9 +9,9 @@ import ( "net/http/httptest" "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/httpservice" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/httpservice" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/imageproxy/imageproxy.go b/services/imageproxy/imageproxy.go index bee78d4c2f..63f042f2d2 100644 --- a/services/imageproxy/imageproxy.go +++ b/services/imageproxy/imageproxy.go @@ -11,10 +11,10 @@ import ( "strings" "sync" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/configservice" - "github.com/mattermost/mattermost-server/services/httpservice" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/configservice" + "github.com/mattermost/mattermost-server/v5/services/httpservice" ) var ErrNotEnabled = Error{errors.New("imageproxy.ImageProxy: image proxy not enabled")} diff --git a/services/imageproxy/local.go b/services/imageproxy/local.go index ad282502a9..e312f49075 100644 --- a/services/imageproxy/local.go +++ b/services/imageproxy/local.go @@ -11,8 +11,8 @@ import ( "net/http/httptest" "net/url" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/services/httpservice" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/services/httpservice" "willnorris.com/go/imageproxy" ) diff --git a/services/imageproxy/local_test.go b/services/imageproxy/local_test.go index 6d1b46293a..4e37fbe586 100644 --- a/services/imageproxy/local_test.go +++ b/services/imageproxy/local_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/httpservice" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/httpservice" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/imageproxy/main_test.go b/services/imageproxy/main_test.go index 343f9026c2..73250e02a6 100644 --- a/services/imageproxy/main_test.go +++ b/services/imageproxy/main_test.go @@ -6,7 +6,7 @@ package imageproxy_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/services/mailservice/mail.go b/services/mailservice/mail.go index bd18576d72..fa6c9ca7b1 100644 --- a/services/mailservice/mail.go +++ b/services/mailservice/mail.go @@ -18,10 +18,10 @@ import ( "net/http" "github.com/jaytaylor/html2text" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/filesstore" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/filesstore" + "github.com/mattermost/mattermost-server/v5/utils" ) type mailData struct { diff --git a/services/mailservice/mail_test.go b/services/mailservice/mail_test.go index 9686f8d92e..127d7b3354 100644 --- a/services/mailservice/mail_test.go +++ b/services/mailservice/mail_test.go @@ -15,10 +15,10 @@ import ( "net/mail" "net/smtp" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/filesstore" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/filesstore" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/mailservice/main_test.go b/services/mailservice/main_test.go index 900e97dce8..b831e32a72 100644 --- a/services/mailservice/main_test.go +++ b/services/mailservice/main_test.go @@ -6,7 +6,7 @@ package mailservice_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/services/marketplace/client.go b/services/marketplace/client.go index b6860125cb..274a6215dd 100644 --- a/services/marketplace/client.go +++ b/services/marketplace/client.go @@ -9,8 +9,8 @@ import ( "net/http" "net/url" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/httpservice" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/httpservice" "github.com/pkg/errors" ) diff --git a/services/mfa/main_test.go b/services/mfa/main_test.go index 40e2c9e542..d7c7617cc6 100644 --- a/services/mfa/main_test.go +++ b/services/mfa/main_test.go @@ -6,7 +6,7 @@ package mfa_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/services/mfa/mfa.go b/services/mfa/mfa.go index 59567b0678..5947a2b80f 100644 --- a/services/mfa/mfa.go +++ b/services/mfa/mfa.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/dgryski/dgoogauth" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/configservice" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/configservice" + "github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/rsc/qr" ) diff --git a/services/mfa/mfa_test.go b/services/mfa/mfa_test.go index 6f826cdbda..46e2998b7d 100644 --- a/services/mfa/mfa_test.go +++ b/services/mfa/mfa_test.go @@ -11,10 +11,10 @@ import ( "time" "github.com/dgryski/dgoogauth" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin/plugintest/mock" - "github.com/mattermost/mattermost-server/store/storetest/mocks" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin/plugintest/mock" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/store/layer_generators/main.go b/store/layer_generators/main.go index 8ffee95b4e..5adfda8914 100644 --- a/store/layer_generators/main.go +++ b/store/layer_generators/main.go @@ -213,8 +213,8 @@ package store import ( timemodule "time" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" ) type {{.Name}} struct { diff --git a/store/localcachelayer/channel_layer.go b/store/localcachelayer/channel_layer.go index b7cbb3d94a..b9af5c3dfe 100644 --- a/store/localcachelayer/channel_layer.go +++ b/store/localcachelayer/channel_layer.go @@ -4,8 +4,8 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type LocalCacheChannelStore struct { diff --git a/store/localcachelayer/channel_layer_test.go b/store/localcachelayer/channel_layer_test.go index ece3e8f8c7..1564546ec7 100644 --- a/store/localcachelayer/channel_layer_test.go +++ b/store/localcachelayer/channel_layer_test.go @@ -3,10 +3,11 @@ package localcachelayer import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/store/storetest/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" ) func TestChannelStore(t *testing.T) { diff --git a/store/localcachelayer/emoji_layer.go b/store/localcachelayer/emoji_layer.go index be6afb65c7..117befe22a 100644 --- a/store/localcachelayer/emoji_layer.go +++ b/store/localcachelayer/emoji_layer.go @@ -4,8 +4,8 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type LocalCacheEmojiStore struct { diff --git a/store/localcachelayer/emoji_layer_test.go b/store/localcachelayer/emoji_layer_test.go index 3aec28ae29..d010954f02 100644 --- a/store/localcachelayer/emoji_layer_test.go +++ b/store/localcachelayer/emoji_layer_test.go @@ -6,9 +6,9 @@ package localcachelayer import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/localcachelayer/layer.go b/store/localcachelayer/layer.go index 062b2dce81..7d80a3f415 100644 --- a/store/localcachelayer/layer.go +++ b/store/localcachelayer/layer.go @@ -4,10 +4,10 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/store/localcachelayer/layer_test.go b/store/localcachelayer/layer_test.go index fbee356b7f..01d7ccd5fd 100644 --- a/store/localcachelayer/layer_test.go +++ b/store/localcachelayer/layer_test.go @@ -7,10 +7,10 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/store/sqlstore" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) type storeType struct { diff --git a/store/localcachelayer/main_test.go b/store/localcachelayer/main_test.go index 6ea72854ce..4ed6984264 100644 --- a/store/localcachelayer/main_test.go +++ b/store/localcachelayer/main_test.go @@ -6,11 +6,10 @@ package localcachelayer import ( "testing" - "github.com/mattermost/mattermost-server/store" - - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest/mocks" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/store/localcachelayer/post_layer.go b/store/localcachelayer/post_layer.go index 9c804cd89b..4fff3ce1dd 100644 --- a/store/localcachelayer/post_layer.go +++ b/store/localcachelayer/post_layer.go @@ -5,8 +5,8 @@ package localcachelayer import ( "fmt" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type LocalCachePostStore struct { diff --git a/store/localcachelayer/post_layer_test.go b/store/localcachelayer/post_layer_test.go index 6d8e57c2e7..1c1e22c6aa 100644 --- a/store/localcachelayer/post_layer_test.go +++ b/store/localcachelayer/post_layer_test.go @@ -6,9 +6,9 @@ package localcachelayer import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/localcachelayer/reaction_layer.go b/store/localcachelayer/reaction_layer.go index 19920ec02a..918efce88d 100644 --- a/store/localcachelayer/reaction_layer.go +++ b/store/localcachelayer/reaction_layer.go @@ -4,8 +4,8 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type LocalCacheReactionStore struct { diff --git a/store/localcachelayer/reaction_layer_test.go b/store/localcachelayer/reaction_layer_test.go index 4f1437c717..41e27c92f5 100644 --- a/store/localcachelayer/reaction_layer_test.go +++ b/store/localcachelayer/reaction_layer_test.go @@ -6,9 +6,9 @@ package localcachelayer import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/localcachelayer/role_layer.go b/store/localcachelayer/role_layer.go index 33aaa2a7c6..2303e070ab 100644 --- a/store/localcachelayer/role_layer.go +++ b/store/localcachelayer/role_layer.go @@ -4,8 +4,8 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type LocalCacheRoleStore struct { diff --git a/store/localcachelayer/role_layer_test.go b/store/localcachelayer/role_layer_test.go index c2e69a9223..fb841fbebb 100644 --- a/store/localcachelayer/role_layer_test.go +++ b/store/localcachelayer/role_layer_test.go @@ -6,9 +6,9 @@ package localcachelayer import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/localcachelayer/scheme_layer.go b/store/localcachelayer/scheme_layer.go index cf274e8ad5..c33b824081 100644 --- a/store/localcachelayer/scheme_layer.go +++ b/store/localcachelayer/scheme_layer.go @@ -4,8 +4,8 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type LocalCacheSchemeStore struct { diff --git a/store/localcachelayer/scheme_layer_test.go b/store/localcachelayer/scheme_layer_test.go index e592358a8d..206a2f38a1 100644 --- a/store/localcachelayer/scheme_layer_test.go +++ b/store/localcachelayer/scheme_layer_test.go @@ -6,9 +6,9 @@ package localcachelayer import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/localcachelayer/user_layer.go b/store/localcachelayer/user_layer.go index c9e3e7c374..a93fbe9332 100644 --- a/store/localcachelayer/user_layer.go +++ b/store/localcachelayer/user_layer.go @@ -6,8 +6,8 @@ package localcachelayer import ( "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type LocalCacheUserStore struct { diff --git a/store/localcachelayer/user_layer_test.go b/store/localcachelayer/user_layer_test.go index e7c5b2f54e..9fb05e7c81 100644 --- a/store/localcachelayer/user_layer_test.go +++ b/store/localcachelayer/user_layer_test.go @@ -6,12 +6,13 @@ package localcachelayer import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/store/storetest/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" ) func TestUserStore(t *testing.T) { diff --git a/store/localcachelayer/webhook_layer.go b/store/localcachelayer/webhook_layer.go index 04e2350170..e1cfa3dc74 100644 --- a/store/localcachelayer/webhook_layer.go +++ b/store/localcachelayer/webhook_layer.go @@ -4,8 +4,8 @@ package localcachelayer import ( - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type LocalCacheWebhookStore struct { diff --git a/store/localcachelayer/webhook_layer_test.go b/store/localcachelayer/webhook_layer_test.go index 4fd747b066..0be05ff2dd 100644 --- a/store/localcachelayer/webhook_layer_test.go +++ b/store/localcachelayer/webhook_layer_test.go @@ -6,11 +6,12 @@ package localcachelayer import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/store/storetest/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" ) func TestWebhookStore(t *testing.T) { diff --git a/store/sqlstore/audit_store.go b/store/sqlstore/audit_store.go index 65d8bee87a..97d2402669 100644 --- a/store/sqlstore/audit_store.go +++ b/store/sqlstore/audit_store.go @@ -6,8 +6,8 @@ package sqlstore import ( "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlAuditStore struct { diff --git a/store/sqlstore/audit_store_test.go b/store/sqlstore/audit_store_test.go index e840ad58e0..76c938090c 100644 --- a/store/sqlstore/audit_store_test.go +++ b/store/sqlstore/audit_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestAuditStore(t *testing.T) { diff --git a/store/sqlstore/bot_store.go b/store/sqlstore/bot_store.go index d2a257a487..43e2d83a07 100644 --- a/store/sqlstore/bot_store.go +++ b/store/sqlstore/bot_store.go @@ -8,9 +8,9 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) // bot is a subset of the model.Bot type, omitting the model.User fields. diff --git a/store/sqlstore/bot_store_test.go b/store/sqlstore/bot_store_test.go index ab0010b43a..59098bfc1b 100644 --- a/store/sqlstore/bot_store_test.go +++ b/store/sqlstore/bot_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestBotStore(t *testing.T) { diff --git a/store/sqlstore/channel_member_history_store.go b/store/sqlstore/channel_member_history_store.go index ae2c319553..64e5125866 100644 --- a/store/sqlstore/channel_member_history_store.go +++ b/store/sqlstore/channel_member_history_store.go @@ -7,9 +7,9 @@ import ( "database/sql" "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlChannelMemberHistoryStore struct { diff --git a/store/sqlstore/channel_member_history_store_test.go b/store/sqlstore/channel_member_history_store_test.go index c1119d227a..c60ffd5c37 100644 --- a/store/sqlstore/channel_member_history_store_test.go +++ b/store/sqlstore/channel_member_history_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestChannelMemberHistoryStore(t *testing.T) { diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index fe569410db..d894e50941 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/store/sqlstore/channel_store_test.go b/store/sqlstore/channel_store_test.go index 0ba334643e..5eb44e6533 100644 --- a/store/sqlstore/channel_store_test.go +++ b/store/sqlstore/channel_store_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestChannelStore(t *testing.T) { diff --git a/store/sqlstore/cluster_discovery_store.go b/store/sqlstore/cluster_discovery_store.go index db706f555c..c39ae0fb2c 100644 --- a/store/sqlstore/cluster_discovery_store.go +++ b/store/sqlstore/cluster_discovery_store.go @@ -6,8 +6,8 @@ package sqlstore import ( "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type sqlClusterDiscoveryStore struct { diff --git a/store/sqlstore/cluster_discovery_store_test.go b/store/sqlstore/cluster_discovery_store_test.go index b6503ccb8a..e7115c9b92 100644 --- a/store/sqlstore/cluster_discovery_store_test.go +++ b/store/sqlstore/cluster_discovery_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestClusterDiscoveryStore(t *testing.T) { diff --git a/store/sqlstore/command_store.go b/store/sqlstore/command_store.go index 6fab95400b..2e9899f129 100644 --- a/store/sqlstore/command_store.go +++ b/store/sqlstore/command_store.go @@ -6,8 +6,8 @@ package sqlstore import ( "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlCommandStore struct { diff --git a/store/sqlstore/command_store_test.go b/store/sqlstore/command_store_test.go index ee8c000820..49b789dde9 100644 --- a/store/sqlstore/command_store_test.go +++ b/store/sqlstore/command_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestCommandStore(t *testing.T) { diff --git a/store/sqlstore/command_webhook_store.go b/store/sqlstore/command_webhook_store.go index 82d4c86105..853f2df7b3 100644 --- a/store/sqlstore/command_webhook_store.go +++ b/store/sqlstore/command_webhook_store.go @@ -7,9 +7,9 @@ import ( "database/sql" "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlCommandWebhookStore struct { diff --git a/store/sqlstore/command_webhook_store_test.go b/store/sqlstore/command_webhook_store_test.go index 5460e2f59c..0182d95490 100644 --- a/store/sqlstore/command_webhook_store_test.go +++ b/store/sqlstore/command_webhook_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestCommandWebhookStore(t *testing.T) { diff --git a/store/sqlstore/compliance_store.go b/store/sqlstore/compliance_store.go index 63495e05f3..5bc8226017 100644 --- a/store/sqlstore/compliance_store.go +++ b/store/sqlstore/compliance_store.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlComplianceStore struct { diff --git a/store/sqlstore/compliance_store_test.go b/store/sqlstore/compliance_store_test.go index c4e0b480c3..ec385c9c70 100644 --- a/store/sqlstore/compliance_store_test.go +++ b/store/sqlstore/compliance_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestComplianceStore(t *testing.T) { diff --git a/store/sqlstore/emoji_store.go b/store/sqlstore/emoji_store.go index 981388761b..62be1bd236 100644 --- a/store/sqlstore/emoji_store.go +++ b/store/sqlstore/emoji_store.go @@ -8,9 +8,9 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlEmojiStore struct { diff --git a/store/sqlstore/emoji_store_test.go b/store/sqlstore/emoji_store_test.go index 6f5f1cc529..bf08e7c533 100644 --- a/store/sqlstore/emoji_store_test.go +++ b/store/sqlstore/emoji_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestEmojiStore(t *testing.T) { diff --git a/store/sqlstore/file_info_store.go b/store/sqlstore/file_info_store.go index 99b67438d7..8a01965357 100644 --- a/store/sqlstore/file_info_store.go +++ b/store/sqlstore/file_info_store.go @@ -9,10 +9,10 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) type SqlFileInfoStore struct { diff --git a/store/sqlstore/file_info_store_test.go b/store/sqlstore/file_info_store_test.go index c1295ee54a..2415a64137 100644 --- a/store/sqlstore/file_info_store_test.go +++ b/store/sqlstore/file_info_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestFileInfoStore(t *testing.T) { diff --git a/store/sqlstore/group_store.go b/store/sqlstore/group_store.go index 796b38e414..09c401d56d 100644 --- a/store/sqlstore/group_store.go +++ b/store/sqlstore/group_store.go @@ -11,8 +11,8 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type selectType int diff --git a/store/sqlstore/group_store_test.go b/store/sqlstore/group_store_test.go index 117f4c5bad..97ff9c00e5 100644 --- a/store/sqlstore/group_store_test.go +++ b/store/sqlstore/group_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestGroupStore(t *testing.T) { diff --git a/store/sqlstore/integrity.go b/store/sqlstore/integrity.go index a09d2ec1c3..340ceb339f 100644 --- a/store/sqlstore/integrity.go +++ b/store/sqlstore/integrity.go @@ -4,8 +4,8 @@ package sqlstore import ( - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/store" sq "github.com/Masterminds/squirrel" ) diff --git a/store/sqlstore/integrity_test.go b/store/sqlstore/integrity_test.go index a9c0143776..f58fdbd9e9 100644 --- a/store/sqlstore/integrity_test.go +++ b/store/sqlstore/integrity_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func createAudit(ss store.Store, userId, sessionId string) *model.Audit { diff --git a/store/sqlstore/job_store.go b/store/sqlstore/job_store.go index d157d38934..fa74f958f7 100644 --- a/store/sqlstore/job_store.go +++ b/store/sqlstore/job_store.go @@ -8,8 +8,8 @@ import ( "net/http" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlJobStore struct { diff --git a/store/sqlstore/job_store_test.go b/store/sqlstore/job_store_test.go index f917c8647a..cc3cea3ed2 100644 --- a/store/sqlstore/job_store_test.go +++ b/store/sqlstore/job_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestJobStore(t *testing.T) { diff --git a/store/sqlstore/license_store.go b/store/sqlstore/license_store.go index a86ba78626..a73eefc8f9 100644 --- a/store/sqlstore/license_store.go +++ b/store/sqlstore/license_store.go @@ -6,8 +6,8 @@ package sqlstore import ( "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlLicenseStore struct { diff --git a/store/sqlstore/license_store_test.go b/store/sqlstore/license_store_test.go index 2ab8d4a549..a72c96f3f0 100644 --- a/store/sqlstore/license_store_test.go +++ b/store/sqlstore/license_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestLicenseStore(t *testing.T) { diff --git a/store/sqlstore/link_metadata_store.go b/store/sqlstore/link_metadata_store.go index 25df3b676d..d1b73c3c53 100644 --- a/store/sqlstore/link_metadata_store.go +++ b/store/sqlstore/link_metadata_store.go @@ -7,8 +7,8 @@ import ( "database/sql" "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlLinkMetadataStore struct { diff --git a/store/sqlstore/link_metadata_store_test.go b/store/sqlstore/link_metadata_store_test.go index a915740f71..1f454403f1 100644 --- a/store/sqlstore/link_metadata_store_test.go +++ b/store/sqlstore/link_metadata_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestLinkMetadataStore(t *testing.T) { diff --git a/store/sqlstore/main_test.go b/store/sqlstore/main_test.go index 57fb09694d..09db83b783 100644 --- a/store/sqlstore/main_test.go +++ b/store/sqlstore/main_test.go @@ -4,10 +4,10 @@ package sqlstore_test import ( - "github.com/mattermost/mattermost-server/store/sqlstore" + "github.com/mattermost/mattermost-server/v5/store/sqlstore" "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/store/sqlstore/oauth_store.go b/store/sqlstore/oauth_store.go index 222804460d..f719b588c1 100644 --- a/store/sqlstore/oauth_store.go +++ b/store/sqlstore/oauth_store.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlOAuthStore struct { diff --git a/store/sqlstore/oauth_store_test.go b/store/sqlstore/oauth_store_test.go index 10a0897cb2..b7475ddc62 100644 --- a/store/sqlstore/oauth_store_test.go +++ b/store/sqlstore/oauth_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestOAuthStore(t *testing.T) { diff --git a/store/sqlstore/plugin_store.go b/store/sqlstore/plugin_store.go index 3c4d61d1ec..294d5e17f0 100644 --- a/store/sqlstore/plugin_store.go +++ b/store/sqlstore/plugin_store.go @@ -8,8 +8,8 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) const ( diff --git a/store/sqlstore/plugin_store_test.go b/store/sqlstore/plugin_store_test.go index d2e883235c..ee082239d3 100644 --- a/store/sqlstore/plugin_store_test.go +++ b/store/sqlstore/plugin_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestPluginStore(t *testing.T) { diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index 03e69df73d..84b84778b3 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -13,11 +13,11 @@ import ( "sync" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) type SqlPostStore struct { diff --git a/store/sqlstore/post_store_test.go b/store/sqlstore/post_store_test.go index 73c5e45c41..44267ddf07 100644 --- a/store/sqlstore/post_store_test.go +++ b/store/sqlstore/post_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestPostStore(t *testing.T) { diff --git a/store/sqlstore/preference_store.go b/store/sqlstore/preference_store.go index 36604f116a..4bcdbbc75c 100644 --- a/store/sqlstore/preference_store.go +++ b/store/sqlstore/preference_store.go @@ -8,9 +8,9 @@ import ( "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlPreferenceStore struct { diff --git a/store/sqlstore/preference_store_test.go b/store/sqlstore/preference_store_test.go index 22ef3373e0..d634709a07 100644 --- a/store/sqlstore/preference_store_test.go +++ b/store/sqlstore/preference_store_test.go @@ -6,9 +6,9 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/storetest" "github.com/stretchr/testify/require" ) diff --git a/store/sqlstore/reaction_store_test.go b/store/sqlstore/reaction_store_test.go index 69c272937d..d61c7d34ad 100644 --- a/store/sqlstore/reaction_store_test.go +++ b/store/sqlstore/reaction_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestReactionStore(t *testing.T) { diff --git a/store/sqlstore/role_store_test.go b/store/sqlstore/role_store_test.go index e89930f711..2caf92f264 100644 --- a/store/sqlstore/role_store_test.go +++ b/store/sqlstore/role_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestRoleStore(t *testing.T) { diff --git a/store/sqlstore/role_supplier.go b/store/sqlstore/role_supplier.go index e6fc048726..dcdc5cb703 100644 --- a/store/sqlstore/role_supplier.go +++ b/store/sqlstore/role_supplier.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlRoleStore struct { diff --git a/store/sqlstore/scheme_store_test.go b/store/sqlstore/scheme_store_test.go index b07495715a..c9615dbf1f 100644 --- a/store/sqlstore/scheme_store_test.go +++ b/store/sqlstore/scheme_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestSchemeStore(t *testing.T) { diff --git a/store/sqlstore/scheme_supplier.go b/store/sqlstore/scheme_supplier.go index f0ec1830c6..d25b5fca90 100644 --- a/store/sqlstore/scheme_supplier.go +++ b/store/sqlstore/scheme_supplier.go @@ -11,8 +11,8 @@ import ( "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlSchemeStore struct { diff --git a/store/sqlstore/session_store.go b/store/sqlstore/session_store.go index c8c58b5546..025998b8ce 100644 --- a/store/sqlstore/session_store.go +++ b/store/sqlstore/session_store.go @@ -7,9 +7,9 @@ import ( "net/http" "time" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) const ( diff --git a/store/sqlstore/session_store_test.go b/store/sqlstore/session_store_test.go index c84d4248c3..50aecc6100 100644 --- a/store/sqlstore/session_store_test.go +++ b/store/sqlstore/session_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestSessionStore(t *testing.T) { diff --git a/store/sqlstore/status_store.go b/store/sqlstore/status_store.go index e4fe8e0b1b..609caf1faf 100644 --- a/store/sqlstore/status_store.go +++ b/store/sqlstore/status_store.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) const ( diff --git a/store/sqlstore/status_store_test.go b/store/sqlstore/status_store_test.go index ddfedeb185..ee8c5a479d 100644 --- a/store/sqlstore/status_store_test.go +++ b/store/sqlstore/status_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestStatusStore(t *testing.T) { diff --git a/store/sqlstore/store.go b/store/sqlstore/store.go index 76b38627fb..ed581ae449 100644 --- a/store/sqlstore/store.go +++ b/store/sqlstore/store.go @@ -8,7 +8,7 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/store" ) /*type SqlStore struct { diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go index b5454257b1..7e4a4ea012 100644 --- a/store/sqlstore/store_test.go +++ b/store/sqlstore/store_test.go @@ -7,9 +7,9 @@ import ( "sync" "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) type storeType struct { diff --git a/store/sqlstore/supplier.go b/store/sqlstore/supplier.go index c799408471..93e3679526 100644 --- a/store/sqlstore/supplier.go +++ b/store/sqlstore/supplier.go @@ -20,11 +20,11 @@ import ( "github.com/go-sql-driver/mysql" "github.com/lib/pq" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( @@ -103,7 +103,7 @@ type SqlSupplierStores struct { type SqlSupplier struct { // rrCounter and srCounter should be kept first. - // See https://github.com/mattermost/mattermost-server/pull/7281 + // See https://github.com/mattermost/mattermost-server/v5/pull/7281 rrCounter int64 srCounter int64 master *gorp.DbMap diff --git a/store/sqlstore/supplier_reactions.go b/store/sqlstore/supplier_reactions.go index 7128c76a7e..9ee8174dbb 100644 --- a/store/sqlstore/supplier_reactions.go +++ b/store/sqlstore/supplier_reactions.go @@ -7,9 +7,9 @@ import ( "net/http" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlReactionStore struct { diff --git a/store/sqlstore/supplier_test.go b/store/sqlstore/supplier_test.go index 3835bd01f1..ac0b3adc46 100644 --- a/store/sqlstore/supplier_test.go +++ b/store/sqlstore/supplier_test.go @@ -7,8 +7,8 @@ import ( _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/sqlstore" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/sqlstore" ) func TestGetReplica(t *testing.T) { diff --git a/store/sqlstore/system_store.go b/store/sqlstore/system_store.go index 63e5317d6a..454ae3fdaa 100644 --- a/store/sqlstore/system_store.go +++ b/store/sqlstore/system_store.go @@ -6,8 +6,8 @@ package sqlstore import ( "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlSystemStore struct { diff --git a/store/sqlstore/system_store_test.go b/store/sqlstore/system_store_test.go index e9793caf27..a448449684 100644 --- a/store/sqlstore/system_store_test.go +++ b/store/sqlstore/system_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestSystemStore(t *testing.T) { diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go index 8563fc5ace..e06d0c8a9b 100644 --- a/store/sqlstore/team_store.go +++ b/store/sqlstore/team_store.go @@ -11,10 +11,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/store/sqlstore/team_store_test.go b/store/sqlstore/team_store_test.go index 0c3b70fd57..4d8056c8da 100644 --- a/store/sqlstore/team_store_test.go +++ b/store/sqlstore/team_store_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestTeamStore(t *testing.T) { diff --git a/store/sqlstore/terms_of_service_store.go b/store/sqlstore/terms_of_service_store.go index 6f0a509e28..9ef8bec420 100644 --- a/store/sqlstore/terms_of_service_store.go +++ b/store/sqlstore/terms_of_service_store.go @@ -7,10 +7,10 @@ import ( "database/sql" "net/http" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) type SqlTermsOfServiceStore struct { diff --git a/store/sqlstore/terms_of_service_store_test.go b/store/sqlstore/terms_of_service_store_test.go index 8f757aecbe..1ff5089995 100644 --- a/store/sqlstore/terms_of_service_store_test.go +++ b/store/sqlstore/terms_of_service_store_test.go @@ -3,7 +3,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestTermsOfServiceStore(t *testing.T) { diff --git a/store/sqlstore/tokens_store.go b/store/sqlstore/tokens_store.go index 603ccc2816..1b49fc07e2 100644 --- a/store/sqlstore/tokens_store.go +++ b/store/sqlstore/tokens_store.go @@ -7,9 +7,9 @@ import ( "database/sql" "net/http" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlTokenStore struct { diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 84b901abde..e3b56c1d6d 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -12,9 +12,9 @@ import ( "github.com/blang/semver" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/timezones" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/timezones" ) const ( diff --git a/store/sqlstore/upgrade_test.go b/store/sqlstore/upgrade_test.go index 4bafc88140..fa40aad09f 100644 --- a/store/sqlstore/upgrade_test.go +++ b/store/sqlstore/upgrade_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/require" ) diff --git a/store/sqlstore/user_access_token_store.go b/store/sqlstore/user_access_token_store.go index bd5df11dc0..9fa524592b 100644 --- a/store/sqlstore/user_access_token_store.go +++ b/store/sqlstore/user_access_token_store.go @@ -8,8 +8,8 @@ import ( "net/http" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlUserAccessTokenStore struct { diff --git a/store/sqlstore/user_access_token_store_test.go b/store/sqlstore/user_access_token_store_test.go index 4bca12ccc4..ae3fd08567 100644 --- a/store/sqlstore/user_access_token_store_test.go +++ b/store/sqlstore/user_access_token_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestUserAccessTokenStore(t *testing.T) { diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go index 03e5b76b15..f43bb06d28 100644 --- a/store/sqlstore/user_store.go +++ b/store/sqlstore/user_store.go @@ -14,10 +14,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" ) const ( diff --git a/store/sqlstore/user_store_test.go b/store/sqlstore/user_store_test.go index fe2c748544..97a87e7218 100644 --- a/store/sqlstore/user_store_test.go +++ b/store/sqlstore/user_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestUserStore(t *testing.T) { diff --git a/store/sqlstore/user_terms_of_service.go b/store/sqlstore/user_terms_of_service.go index 0316430192..7ead0a6ea4 100644 --- a/store/sqlstore/user_terms_of_service.go +++ b/store/sqlstore/user_terms_of_service.go @@ -7,8 +7,8 @@ import ( "database/sql" "net/http" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlUserTermsOfServiceStore struct { diff --git a/store/sqlstore/user_terms_of_service_store_test.go b/store/sqlstore/user_terms_of_service_store_test.go index d02e42d3eb..535647a290 100644 --- a/store/sqlstore/user_terms_of_service_store_test.go +++ b/store/sqlstore/user_terms_of_service_store_test.go @@ -3,7 +3,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestUserTermsOfServiceStore(t *testing.T) { diff --git a/store/sqlstore/utils.go b/store/sqlstore/utils.go index 531bdf8d60..b0d9cab646 100644 --- a/store/sqlstore/utils.go +++ b/store/sqlstore/utils.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/mlog" + "github.com/mattermost/mattermost-server/v5/mlog" ) var escapeLikeSearchChar = []string{ diff --git a/store/sqlstore/webhook_store.go b/store/sqlstore/webhook_store.go index 7c4cf76cf5..7054834f86 100644 --- a/store/sqlstore/webhook_store.go +++ b/store/sqlstore/webhook_store.go @@ -8,9 +8,9 @@ import ( "net/http" sq "github.com/Masterminds/squirrel" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlWebhookStore struct { diff --git a/store/sqlstore/webhook_store_test.go b/store/sqlstore/webhook_store_test.go index 56e9ab0231..1ca01e2213 100644 --- a/store/sqlstore/webhook_store_test.go +++ b/store/sqlstore/webhook_store_test.go @@ -6,7 +6,7 @@ package sqlstore import ( "testing" - "github.com/mattermost/mattermost-server/store/storetest" + "github.com/mattermost/mattermost-server/v5/store/storetest" ) func TestWebhookStore(t *testing.T) { diff --git a/store/store.go b/store/store.go index e71e625359..242628ae02 100644 --- a/store/store.go +++ b/store/store.go @@ -6,7 +6,7 @@ package store import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/store/storetest/audit_store.go b/store/storetest/audit_store.go index 1aa1956612..0eb04d00e7 100644 --- a/store/storetest/audit_store.go +++ b/store/storetest/audit_store.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/bot_store.go b/store/storetest/bot_store.go index 37f07d45d2..59b7fa3937 100644 --- a/store/storetest/bot_store.go +++ b/store/storetest/bot_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func makeBotWithUser(t *testing.T, ss store.Store, bot *model.Bot) (*model.Bot, *model.User) { diff --git a/store/storetest/channel_member_history_store.go b/store/storetest/channel_member_history_store.go index e26b92b149..2e382576f6 100644 --- a/store/storetest/channel_member_history_store.go +++ b/store/storetest/channel_member_history_store.go @@ -8,8 +8,8 @@ import ( "math" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go index 19df48809d..228fe09aa8 100644 --- a/store/storetest/channel_store.go +++ b/store/storetest/channel_store.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/mattermost/gorp" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) type SqlSupplier interface { diff --git a/store/storetest/cluster_discovery_store.go b/store/storetest/cluster_discovery_store.go index ce5d068b92..b577cd49b8 100644 --- a/store/storetest/cluster_discovery_store.go +++ b/store/storetest/cluster_discovery_store.go @@ -8,8 +8,8 @@ import ( "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/command_store.go b/store/storetest/command_store.go index 195693e687..65d9b6b406 100644 --- a/store/storetest/command_store.go +++ b/store/storetest/command_store.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func TestCommandStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/command_webhook_store.go b/store/storetest/command_webhook_store.go index 77cef61999..9d36bda730 100644 --- a/store/storetest/command_webhook_store.go +++ b/store/storetest/command_webhook_store.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/compliance_store.go b/store/storetest/compliance_store.go index 97d436386c..397c983f10 100644 --- a/store/storetest/compliance_store.go +++ b/store/storetest/compliance_store.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/emoji_store.go b/store/storetest/emoji_store.go index dc3e2a39c4..32dab6532b 100644 --- a/store/storetest/emoji_store.go +++ b/store/storetest/emoji_store.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/store/storetest/file_info_store.go b/store/storetest/file_info_store.go index 237525116a..82328aad16 100644 --- a/store/storetest/file_info_store.go +++ b/store/storetest/file_info_store.go @@ -8,8 +8,8 @@ import ( "sort" "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/store/storetest/group_store.go b/store/storetest/group_store.go index d91103cde0..7027cdf95c 100644 --- a/store/storetest/group_store.go +++ b/store/storetest/group_store.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func TestGroupStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/job_store.go b/store/storetest/job_store.go index 16cdd6174d..40022b6464 100644 --- a/store/storetest/job_store.go +++ b/store/storetest/job_store.go @@ -8,8 +8,8 @@ import ( "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/license_store.go b/store/storetest/license_store.go index b30c751665..7354f9e57a 100644 --- a/store/storetest/license_store.go +++ b/store/storetest/license_store.go @@ -6,8 +6,8 @@ package storetest import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/link_metadata_store.go b/store/storetest/link_metadata_store.go index 25b1c98e4e..9da744deb4 100644 --- a/store/storetest/link_metadata_store.go +++ b/store/storetest/link_metadata_store.go @@ -9,8 +9,8 @@ import ( "time" "github.com/dyatlov/go-opengraph/opengraph" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/mocks/AuditStore.go b/store/storetest/mocks/AuditStore.go index 7740d16b0a..83cac4899e 100644 --- a/store/storetest/mocks/AuditStore.go +++ b/store/storetest/mocks/AuditStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/BotStore.go b/store/storetest/mocks/BotStore.go index c5d6f1d265..47e9aad5da 100644 --- a/store/storetest/mocks/BotStore.go +++ b/store/storetest/mocks/BotStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ChannelMemberHistoryStore.go b/store/storetest/mocks/ChannelMemberHistoryStore.go index 0c65677b7b..03016dc6a7 100644 --- a/store/storetest/mocks/ChannelMemberHistoryStore.go +++ b/store/storetest/mocks/ChannelMemberHistoryStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ChannelStore.go b/store/storetest/mocks/ChannelStore.go index b68b7dab92..047e4b9d8c 100644 --- a/store/storetest/mocks/ChannelStore.go +++ b/store/storetest/mocks/ChannelStore.go @@ -5,8 +5,8 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" - store "github.com/mattermost/mattermost-server/store" + model "github.com/mattermost/mattermost-server/v5/model" + store "github.com/mattermost/mattermost-server/v5/store" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ClusterDiscoveryStore.go b/store/storetest/mocks/ClusterDiscoveryStore.go index 1d36295689..5e17fe52e5 100644 --- a/store/storetest/mocks/ClusterDiscoveryStore.go +++ b/store/storetest/mocks/ClusterDiscoveryStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/CommandStore.go b/store/storetest/mocks/CommandStore.go index a60141d299..0cba996630 100644 --- a/store/storetest/mocks/CommandStore.go +++ b/store/storetest/mocks/CommandStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/CommandWebhookStore.go b/store/storetest/mocks/CommandWebhookStore.go index b804a0ccd0..16742cc14c 100644 --- a/store/storetest/mocks/CommandWebhookStore.go +++ b/store/storetest/mocks/CommandWebhookStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ComplianceStore.go b/store/storetest/mocks/ComplianceStore.go index e0b4bff3b2..e0bbf96aae 100644 --- a/store/storetest/mocks/ComplianceStore.go +++ b/store/storetest/mocks/ComplianceStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/EmojiStore.go b/store/storetest/mocks/EmojiStore.go index 98429c68de..5d2b4a9a41 100644 --- a/store/storetest/mocks/EmojiStore.go +++ b/store/storetest/mocks/EmojiStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/FileInfoStore.go b/store/storetest/mocks/FileInfoStore.go index ef91923a22..2ee24bde71 100644 --- a/store/storetest/mocks/FileInfoStore.go +++ b/store/storetest/mocks/FileInfoStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/GroupStore.go b/store/storetest/mocks/GroupStore.go index 2c1a7fbefc..fbb30bb811 100644 --- a/store/storetest/mocks/GroupStore.go +++ b/store/storetest/mocks/GroupStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/JobStore.go b/store/storetest/mocks/JobStore.go index 1a8f34a660..79513c832b 100644 --- a/store/storetest/mocks/JobStore.go +++ b/store/storetest/mocks/JobStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/LicenseStore.go b/store/storetest/mocks/LicenseStore.go index 8a376037ef..f5acaea942 100644 --- a/store/storetest/mocks/LicenseStore.go +++ b/store/storetest/mocks/LicenseStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/LinkMetadataStore.go b/store/storetest/mocks/LinkMetadataStore.go index 2a7a12cef6..96d2011d52 100644 --- a/store/storetest/mocks/LinkMetadataStore.go +++ b/store/storetest/mocks/LinkMetadataStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/OAuthStore.go b/store/storetest/mocks/OAuthStore.go index 3ed44c34b3..a568a2a88a 100644 --- a/store/storetest/mocks/OAuthStore.go +++ b/store/storetest/mocks/OAuthStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/PluginStore.go b/store/storetest/mocks/PluginStore.go index 71a19c4fb7..0eb4c77a38 100644 --- a/store/storetest/mocks/PluginStore.go +++ b/store/storetest/mocks/PluginStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/PostStore.go b/store/storetest/mocks/PostStore.go index a023a9c13c..bd879d60d0 100644 --- a/store/storetest/mocks/PostStore.go +++ b/store/storetest/mocks/PostStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/PreferenceStore.go b/store/storetest/mocks/PreferenceStore.go index 71828d62b0..0e5a72b56a 100644 --- a/store/storetest/mocks/PreferenceStore.go +++ b/store/storetest/mocks/PreferenceStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/ReactionStore.go b/store/storetest/mocks/ReactionStore.go index 41117978bb..66c9d1e02b 100644 --- a/store/storetest/mocks/ReactionStore.go +++ b/store/storetest/mocks/ReactionStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/RoleStore.go b/store/storetest/mocks/RoleStore.go index 64254eda52..46e3f07ac3 100644 --- a/store/storetest/mocks/RoleStore.go +++ b/store/storetest/mocks/RoleStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/SchemeStore.go b/store/storetest/mocks/SchemeStore.go index d1c1b1fbb8..27e7b5cc28 100644 --- a/store/storetest/mocks/SchemeStore.go +++ b/store/storetest/mocks/SchemeStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/SessionStore.go b/store/storetest/mocks/SessionStore.go index 88f3c817d5..d42934ff44 100644 --- a/store/storetest/mocks/SessionStore.go +++ b/store/storetest/mocks/SessionStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/SqlStore.go b/store/storetest/mocks/SqlStore.go index b4e22062bc..50f0526c3a 100644 --- a/store/storetest/mocks/SqlStore.go +++ b/store/storetest/mocks/SqlStore.go @@ -10,7 +10,7 @@ import ( squirrel "github.com/Masterminds/squirrel" - store "github.com/mattermost/mattermost-server/store" + store "github.com/mattermost/mattermost-server/v5/store" ) // SqlStore is an autogenerated mock type for the SqlStore type diff --git a/store/storetest/mocks/StatusStore.go b/store/storetest/mocks/StatusStore.go index bdfb0b40af..8a21efd4cd 100644 --- a/store/storetest/mocks/StatusStore.go +++ b/store/storetest/mocks/StatusStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/Store.go b/store/storetest/mocks/Store.go index c9b1cb1081..61e6961841 100644 --- a/store/storetest/mocks/Store.go +++ b/store/storetest/mocks/Store.go @@ -5,7 +5,7 @@ package mocks import ( - store "github.com/mattermost/mattermost-server/store" + store "github.com/mattermost/mattermost-server/v5/store" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/SystemStore.go b/store/storetest/mocks/SystemStore.go index 1cd8f54a3e..844939a931 100644 --- a/store/storetest/mocks/SystemStore.go +++ b/store/storetest/mocks/SystemStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/TeamStore.go b/store/storetest/mocks/TeamStore.go index 1da0823888..0b2a7b2877 100644 --- a/store/storetest/mocks/TeamStore.go +++ b/store/storetest/mocks/TeamStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/TermsOfServiceStore.go b/store/storetest/mocks/TermsOfServiceStore.go index d107849e98..c839559028 100644 --- a/store/storetest/mocks/TermsOfServiceStore.go +++ b/store/storetest/mocks/TermsOfServiceStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/TokenStore.go b/store/storetest/mocks/TokenStore.go index a6a22c224f..9b7f078e2e 100644 --- a/store/storetest/mocks/TokenStore.go +++ b/store/storetest/mocks/TokenStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/UserAccessTokenStore.go b/store/storetest/mocks/UserAccessTokenStore.go index 0a3012f767..2d65fd87f7 100644 --- a/store/storetest/mocks/UserAccessTokenStore.go +++ b/store/storetest/mocks/UserAccessTokenStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/UserStore.go b/store/storetest/mocks/UserStore.go index 61be3b4374..f8ede26c65 100644 --- a/store/storetest/mocks/UserStore.go +++ b/store/storetest/mocks/UserStore.go @@ -5,8 +5,8 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" - store "github.com/mattermost/mattermost-server/store" + model "github.com/mattermost/mattermost-server/v5/model" + store "github.com/mattermost/mattermost-server/v5/store" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/UserTermsOfServiceStore.go b/store/storetest/mocks/UserTermsOfServiceStore.go index 3689b7d212..6efe3cf353 100644 --- a/store/storetest/mocks/UserTermsOfServiceStore.go +++ b/store/storetest/mocks/UserTermsOfServiceStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/mocks/WebhookStore.go b/store/storetest/mocks/WebhookStore.go index 2c126cceb0..321a2e1d8e 100644 --- a/store/storetest/mocks/WebhookStore.go +++ b/store/storetest/mocks/WebhookStore.go @@ -5,7 +5,7 @@ package mocks import ( - model "github.com/mattermost/mattermost-server/model" + model "github.com/mattermost/mattermost-server/v5/model" mock "github.com/stretchr/testify/mock" ) diff --git a/store/storetest/oauth_store.go b/store/storetest/oauth_store.go index 3649e79729..89656daae0 100644 --- a/store/storetest/oauth_store.go +++ b/store/storetest/oauth_store.go @@ -6,8 +6,8 @@ package storetest import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/plugin_store.go b/store/storetest/plugin_store.go index e98af1e460..f9d55acb2c 100644 --- a/store/storetest/plugin_store.go +++ b/store/storetest/plugin_store.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" ) diff --git a/store/storetest/post_store.go b/store/storetest/post_store.go index f197bf15c2..c10be34a3c 100644 --- a/store/storetest/post_store.go +++ b/store/storetest/post_store.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/preference_store.go b/store/storetest/preference_store.go index 247f84cfb9..8a355359ca 100644 --- a/store/storetest/preference_store.go +++ b/store/storetest/preference_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func TestPreferenceStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/reaction_store.go b/store/storetest/reaction_store.go index 96394e43de..45d71e839e 100644 --- a/store/storetest/reaction_store.go +++ b/store/storetest/reaction_store.go @@ -6,8 +6,8 @@ package storetest import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/role_store.go b/store/storetest/role_store.go index 6645224b1f..2eeb1e2f49 100644 --- a/store/storetest/role_store.go +++ b/store/storetest/role_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func TestRoleStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/scheme_store.go b/store/storetest/scheme_store.go index 9b613774f4..20007c8903 100644 --- a/store/storetest/scheme_store.go +++ b/store/storetest/scheme_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func TestSchemeStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/session_store.go b/store/storetest/session_store.go index c9e376f7fd..1216f784d5 100644 --- a/store/storetest/session_store.go +++ b/store/storetest/session_store.go @@ -6,8 +6,8 @@ package storetest import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/store/storetest/settings.go b/store/storetest/settings.go index 90247affe9..2fc6050eb5 100644 --- a/store/storetest/settings.go +++ b/store/storetest/settings.go @@ -17,7 +17,7 @@ import ( _ "github.com/lib/pq" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/store/storetest/status_store.go b/store/storetest/status_store.go index a4073a1942..35022ce67e 100644 --- a/store/storetest/status_store.go +++ b/store/storetest/status_store.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func TestStatusStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/store.go b/store/storetest/store.go index 1d09adf8f8..8c8597d94c 100644 --- a/store/storetest/store.go +++ b/store/storetest/store.go @@ -6,8 +6,8 @@ package storetest import ( "github.com/stretchr/testify/mock" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/store/storetest/mocks" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" ) // Store can be used to provide mock stores for testing. diff --git a/store/storetest/storetestlib.go b/store/storetest/storetestlib.go index 46dbf6ba68..7ad96ba023 100644 --- a/store/storetest/storetestlib.go +++ b/store/storetest/storetestlib.go @@ -4,7 +4,7 @@ package storetest import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func MakeEmail() string { diff --git a/store/storetest/system_store.go b/store/storetest/system_store.go index 1a18111c81..2c1b0f71b9 100644 --- a/store/storetest/system_store.go +++ b/store/storetest/system_store.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func TestSystemStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go index 275e7a8832..91c82d557c 100644 --- a/store/storetest/team_store.go +++ b/store/storetest/team_store.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) func cleanupTeamStore(t *testing.T, ss store.Store) { diff --git a/store/storetest/terms_of_service_store.go b/store/storetest/terms_of_service_store.go index af20c5327e..e93600e94c 100644 --- a/store/storetest/terms_of_service_store.go +++ b/store/storetest/terms_of_service_store.go @@ -6,8 +6,8 @@ package storetest import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/user_access_token_store.go b/store/storetest/user_access_token_store.go index 0e4e6ce390..0c286aee8f 100644 --- a/store/storetest/user_access_token_store.go +++ b/store/storetest/user_access_token_store.go @@ -6,8 +6,8 @@ package storetest import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go index d02646f7bc..af8ed239e2 100644 --- a/store/storetest/user_store.go +++ b/store/storetest/user_store.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" ) const ( diff --git a/store/storetest/user_terms_of_service.go b/store/storetest/user_terms_of_service.go index c18b83ac31..b3027286f3 100644 --- a/store/storetest/user_terms_of_service.go +++ b/store/storetest/user_terms_of_service.go @@ -6,8 +6,8 @@ package storetest import ( "testing" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/store/storetest/webhook_store.go b/store/storetest/webhook_store.go index ee9dd9b012..452ef316c9 100644 --- a/store/storetest/webhook_store.go +++ b/store/storetest/webhook_store.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" "github.com/stretchr/testify/require" ) diff --git a/store/timer_layer.go b/store/timer_layer.go index afa3bba47f..084eb9c795 100644 --- a/store/timer_layer.go +++ b/store/timer_layer.go @@ -9,8 +9,8 @@ package store import ( timemodule "time" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" ) type TimerLayer struct { diff --git a/testlib/cluster.go b/testlib/cluster.go index c8a75e28e4..fba0b0289c 100644 --- a/testlib/cluster.go +++ b/testlib/cluster.go @@ -4,8 +4,8 @@ package testlib import ( - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" ) type FakeClusterInterface struct { diff --git a/testlib/helper.go b/testlib/helper.go index 60fb9c1923..643cddc9a4 100644 --- a/testlib/helper.go +++ b/testlib/helper.go @@ -10,12 +10,12 @@ import ( "os" "testing" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/store" - "github.com/mattermost/mattermost-server/store/sqlstore" - "github.com/mattermost/mattermost-server/store/storetest" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/sqlstore" + "github.com/mattermost/mattermost-server/v5/store/storetest" + "github.com/mattermost/mattermost-server/v5/utils" ) type MainHelper struct { diff --git a/testlib/resources.go b/testlib/resources.go index df1692540e..2eb978a0e0 100644 --- a/testlib/resources.go +++ b/testlib/resources.go @@ -10,11 +10,11 @@ import ( "path" "path/filepath" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) const ( diff --git a/testlib/store.go b/testlib/store.go index cfc9430bdc..131b237049 100644 --- a/testlib/store.go +++ b/testlib/store.go @@ -4,7 +4,7 @@ package testlib import ( - "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/v5/store" ) type TestStore struct { diff --git a/utils/api.go b/utils/api.go index 6e513b3eaf..f23c22af83 100644 --- a/utils/api.go +++ b/utils/api.go @@ -14,7 +14,7 @@ import ( "path" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func CheckOrigin(r *http.Request, allowedOrigins string) bool { diff --git a/utils/api_test.go b/utils/api_test.go index d84207eaad..35bdb99239 100644 --- a/utils/api_test.go +++ b/utils/api_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestRenderWebError(t *testing.T) { diff --git a/utils/authorization.go b/utils/authorization.go index 5125b45e63..e8d0f392ef 100644 --- a/utils/authorization.go +++ b/utils/authorization.go @@ -4,7 +4,7 @@ package utils import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func SetRolePermissionsFromConfig(roles map[string]*model.Role, cfg *model.Config, isLicensed bool) map[string]*model.Role { diff --git a/utils/authorization_test.go b/utils/authorization_test.go index 1dedc2c3f1..5300bb7999 100644 --- a/utils/authorization_test.go +++ b/utils/authorization_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type RoleState struct { diff --git a/utils/fileutils/main_test.go b/utils/fileutils/main_test.go index e8bc05ab9d..b9966bde6a 100644 --- a/utils/fileutils/main_test.go +++ b/utils/fileutils/main_test.go @@ -6,7 +6,7 @@ package fileutils_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/utils/html.go b/utils/html.go index fbf88730fa..157610e4e1 100644 --- a/utils/html.go +++ b/utils/html.go @@ -15,8 +15,8 @@ import ( "github.com/fsnotify/fsnotify" "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) type HTMLTemplateWatcher struct { diff --git a/utils/html_test.go b/utils/html_test.go index 5666dceb07..ca531ae210 100644 --- a/utils/html_test.go +++ b/utils/html_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) var htmlTestTranslationBundle *bundle.Bundle diff --git a/utils/i18n.go b/utils/i18n.go index fcb722dc8a..97fbfc3505 100644 --- a/utils/i18n.go +++ b/utils/i18n.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/mattermost/go-i18n/i18n" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) var T i18n.TranslateFunc diff --git a/utils/imgutils/gif_test.go b/utils/imgutils/gif_test.go index 240ec11071..6a3047803a 100644 --- a/utils/imgutils/gif_test.go +++ b/utils/imgutils/gif_test.go @@ -7,7 +7,7 @@ import ( "bytes" "testing" - "github.com/mattermost/mattermost-server/utils/testutils" + "github.com/mattermost/mattermost-server/v5/utils/testutils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/utils/jsonutils/json_test.go b/utils/jsonutils/json_test.go index 85cb66d604..36ef0906c2 100644 --- a/utils/jsonutils/json_test.go +++ b/utils/jsonutils/json_test.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/utils/jsonutils" + "github.com/mattermost/mattermost-server/v5/utils/jsonutils" ) func TestHumanizeJsonError(t *testing.T) { diff --git a/utils/jsonutils/main_test.go b/utils/jsonutils/main_test.go index f518ecf9ac..e733797789 100644 --- a/utils/jsonutils/main_test.go +++ b/utils/jsonutils/main_test.go @@ -6,7 +6,7 @@ package jsonutils_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/utils/license.go b/utils/license.go index 3426525a02..8c8f340a7a 100644 --- a/utils/license.go +++ b/utils/license.go @@ -16,9 +16,9 @@ import ( "strconv" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) var publicKey []byte = []byte(`-----BEGIN PUBLIC KEY----- diff --git a/utils/logger.go b/utils/logger.go index 49b560b0d2..320f1b7089 100644 --- a/utils/logger.go +++ b/utils/logger.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) const ( diff --git a/utils/main_test.go b/utils/main_test.go index c1f9c14847..4409a3d572 100644 --- a/utils/main_test.go +++ b/utils/main_test.go @@ -6,7 +6,7 @@ package utils_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/utils/markdown/main_test.go b/utils/markdown/main_test.go index fb276d87d8..777e65ef42 100644 --- a/utils/markdown/main_test.go +++ b/utils/markdown/main_test.go @@ -6,7 +6,7 @@ package markdown_test import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/utils/merge_test.go b/utils/merge_test.go index a2b5af7e57..1a04f54951 100644 --- a/utils/merge_test.go +++ b/utils/merge_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/utils" ) // Test merging maps alone. This isolates the complexity of merging maps from merging maps recursively in diff --git a/utils/password.go b/utils/password.go index 087b99a3dd..c522cc2188 100644 --- a/utils/password.go +++ b/utils/password.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func IsPasswordValidWithSettings(password string, settings *model.PasswordSettings) *model.AppError { diff --git a/utils/password_test.go b/utils/password_test.go index f5ef44f81d..777d244482 100644 --- a/utils/password_test.go +++ b/utils/password_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestIsPasswordValidWithSettings(t *testing.T) { diff --git a/utils/subpath.go b/utils/subpath.go index 14c1ea6f69..759b13b2b0 100644 --- a/utils/subpath.go +++ b/utils/subpath.go @@ -17,9 +17,9 @@ import ( "github.com/pkg/errors" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) // getSubpathScript renders the inline script that defines window.publicPath to change how webpack loads assets. diff --git a/utils/subpath_test.go b/utils/subpath_test.go index ceb063fc40..3f95cda97a 100644 --- a/utils/subpath_test.go +++ b/utils/subpath_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func TestUpdateAssetsSubpathFromConfig(t *testing.T) { diff --git a/utils/testutils/static_config_service.go b/utils/testutils/static_config_service.go index 1716c2fa10..b6aac2b15d 100644 --- a/utils/testutils/static_config_service.go +++ b/utils/testutils/static_config_service.go @@ -6,7 +6,7 @@ package testutils import ( "crypto/ecdsa" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) type StaticConfigService struct { diff --git a/utils/testutils/testutils.go b/utils/testutils/testutils.go index 4f56c51ebd..6a3c17a118 100644 --- a/utils/testutils/testutils.go +++ b/utils/testutils/testutils.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) func ReadTestFile(name string) ([]byte, error) { diff --git a/web/context.go b/web/context.go index cb633177f0..385caea838 100644 --- a/web/context.go +++ b/web/context.go @@ -9,10 +9,10 @@ import ( "regexp" "strings" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) type Context struct { diff --git a/web/handlers.go b/web/handlers.go index 32d3e14398..03782bf424 100644 --- a/web/handlers.go +++ b/web/handlers.go @@ -13,10 +13,10 @@ import ( "github.com/NYTimes/gziphandler" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func GetHandlerName(h func(*Context, http.ResponseWriter, *http.Request)) string { diff --git a/web/handlers_test.go b/web/handlers_test.go index 6e1b3f7e83..3003e8b8bb 100644 --- a/web/handlers_test.go +++ b/web/handlers_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "testing" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/web/main_test.go b/web/main_test.go index f954dff57e..89f931110b 100644 --- a/web/main_test.go +++ b/web/main_test.go @@ -6,7 +6,7 @@ package web import ( "testing" - "github.com/mattermost/mattermost-server/testlib" + "github.com/mattermost/mattermost-server/v5/testlib" ) var mainHelper *testlib.MainHelper diff --git a/web/oauth.go b/web/oauth.go index e99524c429..94148c9e49 100644 --- a/web/oauth.go +++ b/web/oauth.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) func (w *Web) InitOAuth() { diff --git a/web/oauth_test.go b/web/oauth_test.go index 9974bdafe3..2fbf19a153 100644 --- a/web/oauth_test.go +++ b/web/oauth_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "github.com/mattermost/mattermost-server/einterfaces" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/einterfaces" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/web/params.go b/web/params.go index 6bb852ad00..a9eebebf1f 100644 --- a/web/params.go +++ b/web/params.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) const ( diff --git a/web/saml.go b/web/saml.go index efdd6fa4f9..6efc686385 100644 --- a/web/saml.go +++ b/web/saml.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) func (w *Web) InitSaml() { diff --git a/web/static.go b/web/static.go index 9f20f2958a..8bfb443b31 100644 --- a/web/static.go +++ b/web/static.go @@ -12,10 +12,10 @@ import ( "github.com/NYTimes/gziphandler" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" - "github.com/mattermost/mattermost-server/utils/fileutils" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" + "github.com/mattermost/mattermost-server/v5/utils/fileutils" ) var robotsTxt = []byte("User-agent: *\nDisallow: /\n") diff --git a/web/unsupported_browser.go b/web/unsupported_browser.go index 39de6ddb2c..5edd430a5b 100644 --- a/web/unsupported_browser.go +++ b/web/unsupported_browser.go @@ -8,8 +8,8 @@ import ( "github.com/avct/uasurfer" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/utils" ) // MattermostApp describes downloads for the Mattermost App diff --git a/web/web.go b/web/web.go index 79346f9053..4b7921d648 100644 --- a/web/web.go +++ b/web/web.go @@ -11,11 +11,11 @@ import ( "github.com/avct/uasurfer" "github.com/gorilla/mux" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/services/configservice" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/services/configservice" + "github.com/mattermost/mattermost-server/v5/utils" ) type Web struct { diff --git a/web/web_test.go b/web/web_test.go index 087942d6f7..dcb9564b35 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -12,11 +12,11 @@ import ( "path/filepath" "testing" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/config" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/plugin" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/config" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/plugin" + "github.com/mattermost/mattermost-server/v5/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -148,7 +148,7 @@ func TestPublicFilesRequest(t *testing.T) { package main import ( - "github.com/mattermost/mattermost-server/plugin" + "github.com/mattermost/mattermost-server/v5/plugin" ) type MyPlugin struct { diff --git a/web/webhook.go b/web/webhook.go index 07f59e7fbb..ac103a204c 100644 --- a/web/webhook.go +++ b/web/webhook.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/schema" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) func (w *Web) InitWebhooks() { diff --git a/web/webhook_test.go b/web/webhook_test.go index 873e872e59..7e617590e9 100644 --- a/web/webhook_test.go +++ b/web/webhook_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func TestIncomingWebhook(t *testing.T) { diff --git a/wsapi/api.go b/wsapi/api.go index 988229737f..c659032ced 100644 --- a/wsapi/api.go +++ b/wsapi/api.go @@ -4,7 +4,7 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/v5/app" ) type API struct { diff --git a/wsapi/status.go b/wsapi/status.go index 113bb7ed58..3ba158adaf 100644 --- a/wsapi/status.go +++ b/wsapi/status.go @@ -4,8 +4,8 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitStatus() { diff --git a/wsapi/system.go b/wsapi/system.go index c3ee8e2a05..343c9c06cd 100644 --- a/wsapi/system.go +++ b/wsapi/system.go @@ -4,7 +4,7 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitSystem() { diff --git a/wsapi/user.go b/wsapi/user.go index 1db14179df..0d2e16b9e4 100644 --- a/wsapi/user.go +++ b/wsapi/user.go @@ -4,7 +4,7 @@ package wsapi import ( - "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/v5/model" ) func (api *API) InitUser() { diff --git a/wsapi/websocket_handler.go b/wsapi/websocket_handler.go index b692d58e00..7dcef3f3b6 100644 --- a/wsapi/websocket_handler.go +++ b/wsapi/websocket_handler.go @@ -7,10 +7,10 @@ import ( "fmt" "net/http" - "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/mlog" - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/v5/app" + "github.com/mattermost/mattermost-server/v5/mlog" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/utils" ) func (api *API) ApiWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)) webSocketHandler {