From 2259b7f2a8b92b5dada097e77c284d5d14a01ba3 Mon Sep 17 00:00:00 2001 From: Miguel de la Cruz Date: Thu, 28 Nov 2019 14:39:38 +0100 Subject: [PATCH] [MM-19948] Set version on module file and internal paths (#13186) * [MM-19948] Set version on module file and internal paths * Fixes after merge * Fix i18n checker error --- api4/api.go | 8 +- api4/apitestlib.go | 16 ++-- api4/bot.go | 2 +- api4/bot_test.go | 6 +- api4/brand.go | 2 +- api4/brand_test.go | 2 +- api4/channel.go | 6 +- api4/channel_test.go | 4 +- api4/cluster.go | 2 +- api4/cluster_test.go | 2 +- api4/command.go | 2 +- api4/command_help_test.go | 2 +- api4/command_test.go | 2 +- api4/commands_test.go | 2 +- api4/compliance.go | 2 +- api4/config.go | 6 +- api4/config_test.go | 2 +- api4/cors_test.go | 2 +- api4/elasticsearch.go | 2 +- api4/elasticsearch_test.go | 2 +- api4/emoji.go | 6 +- api4/emoji_test.go | 6 +- api4/file.go | 6 +- api4/file_test.go | 8 +- api4/group.go | 2 +- api4/group_test.go | 2 +- api4/handlers.go | 2 +- api4/handlers_test.go | 2 +- api4/image_test.go | 2 +- api4/integration_action.go | 2 +- api4/integration_action_test.go | 2 +- api4/job.go | 2 +- api4/job_test.go | 2 +- api4/ldap.go | 2 +- api4/ldap_test.go | 2 +- api4/license.go | 2 +- api4/license_test.go | 2 +- api4/main_test.go | 2 +- api4/oauth.go | 2 +- api4/oauth_test.go | 2 +- api4/openGraph.go | 4 +- api4/openGraph_test.go | 2 +- api4/plugin.go | 4 +- api4/plugin_test.go | 6 +- api4/post.go | 4 +- api4/post_test.go | 8 +- api4/preference.go | 2 +- api4/preference_test.go | 2 +- api4/reaction.go | 2 +- api4/reaction_test.go | 2 +- api4/role.go | 2 +- api4/role_test.go | 2 +- api4/saml.go | 2 +- api4/scheme.go | 2 +- api4/scheme_test.go | 2 +- api4/status.go | 2 +- api4/status_test.go | 2 +- api4/system.go | 8 +- api4/system_test.go | 4 +- api4/team.go | 2 +- api4/team_test.go | 10 +-- api4/terms_of_service.go | 4 +- api4/terms_of_service_test.go | 2 +- api4/user.go | 10 +-- api4/user_test.go | 8 +- api4/user_viewmembers_test.go | 2 +- api4/webhook.go | 2 +- api4/webhook_test.go | 2 +- api4/websocket.go | 4 +- api4/websocket_test.go | 2 +- app/admin.go | 8 +- app/analytics.go | 6 +- app/app.go | 16 ++-- app/app_test.go | 2 +- app/audit.go | 2 +- app/authentication.go | 6 +- app/authentication_test.go | 2 +- app/authorization.go | 4 +- app/authorization_test.go | 2 +- app/auto_channels.go | 4 +- app/auto_constants.go | 4 +- app/auto_environment.go | 4 +- app/auto_posts.go | 6 +- app/auto_responder.go | 4 +- app/auto_responder_test.go | 2 +- app/auto_teams.go | 4 +- app/auto_users.go | 6 +- app/bot.go | 8 +- app/bot_test.go | 4 +- app/brand.go | 2 +- app/channel.go | 10 +-- app/channel_test.go | 2 +- app/cluster.go | 2 +- app/cluster_discovery.go | 4 +- app/cluster_discovery_test.go | 2 +- app/cluster_handlers.go | 2 +- app/command.go | 8 +- app/command_away.go | 2 +- app/command_channel_header.go | 2 +- app/command_channel_header_test.go | 2 +- app/command_channel_purpose.go | 2 +- app/command_channel_purpose_test.go | 2 +- app/command_channel_rename.go | 2 +- app/command_channel_rename_test.go | 2 +- app/command_code.go | 2 +- app/command_code_test.go | 2 +- app/command_dnd.go | 2 +- app/command_echo.go | 4 +- app/command_expand_collapse.go | 2 +- app/command_groupmsg.go | 4 +- app/command_groupmsg_test.go | 2 +- app/command_help.go | 2 +- app/command_invite.go | 4 +- app/command_invite_people.go | 4 +- app/command_invite_people_test.go | 2 +- app/command_invite_test.go | 2 +- app/command_join.go | 2 +- app/command_join_test.go | 2 +- app/command_leave.go | 2 +- app/command_leave_test.go | 2 +- app/command_loadtest.go | 6 +- app/command_logout.go | 2 +- app/command_me.go | 2 +- app/command_me_test.go | 2 +- app/command_msg.go | 4 +- app/command_msg_test.go | 2 +- app/command_mute.go | 2 +- app/command_mute_test.go | 2 +- app/command_offline.go | 2 +- app/command_online.go | 2 +- app/command_open.go | 2 +- app/command_remove.go | 4 +- app/command_remove_test.go | 2 +- app/command_search.go | 2 +- app/command_settings.go | 2 +- app/command_shortcuts.go | 2 +- app/command_shrug.go | 2 +- app/command_test.go | 4 +- app/compliance.go | 2 +- app/config.go | 8 +- app/config_test.go | 6 +- app/data_retention.go | 2 +- app/diagnostics.go | 6 +- app/diagnostics_test.go | 2 +- app/elasticsearch.go | 2 +- app/email.go | 8 +- app/email_batching.go | 6 +- app/email_batching_test.go | 2 +- app/emoji.go | 6 +- app/enterprise.go | 10 +-- app/export.go | 6 +- app/export_converters.go | 2 +- app/export_test.go | 2 +- app/file.go | 10 +-- app/file_bench_test.go | 4 +- app/file_test.go | 4 +- app/group.go | 2 +- app/group_test.go | 2 +- app/helper_test.go | 8 +- app/import.go | 4 +- app/import_functions.go | 8 +- app/import_functions_test.go | 6 +- app/import_test.go | 4 +- app/import_types.go | 2 +- app/import_validators.go | 2 +- app/import_validators_test.go | 4 +- app/integration_action.go | 6 +- app/integration_action_test.go | 10 +-- app/job.go | 2 +- app/job_test.go | 2 +- app/ldap.go | 6 +- app/license.go | 6 +- app/license_test.go | 2 +- app/login.go | 8 +- app/main_test.go | 2 +- app/migrations.go | 6 +- app/notification.go | 10 +-- app/notification_email.go | 6 +- app/notification_email_test.go | 6 +- app/notification_push.go | 6 +- app/notification_push_test.go | 4 +- app/notification_test.go | 4 +- app/oauth.go | 10 +-- app/oauth_test.go | 2 +- app/opengraph.go | 2 +- app/options.go | 6 +- app/permissions.go | 2 +- app/permissions_migrations.go | 2 +- app/permissions_test.go | 2 +- app/plugin.go | 12 +-- app/plugin_api.go | 4 +- app/plugin_api_test.go | 36 ++++---- app/plugin_api_test/plugin_using_log_api.go | 2 +- app/plugin_commands.go | 2 +- app/plugin_commands_test.go | 12 +-- app/plugin_context.go | 2 +- app/plugin_deadlock_test.go | 18 ++-- app/plugin_event.go | 2 +- app/plugin_hooks_test.go | 88 +++++++++---------- app/plugin_install.go | 10 +-- app/plugin_install_test.go | 2 +- app/plugin_key_value_store.go | 4 +- app/plugin_requests.go | 8 +- app/plugin_shutdown_test.go | 4 +- app/plugin_signature.go | 6 +- app/plugin_signature_test.go | 2 +- app/plugin_statuses.go | 2 +- app/plugin_test.go | 6 +- app/post.go | 10 +-- app/post_metadata.go | 10 +-- app/post_metadata_test.go | 8 +- app/post_test.go | 18 ++-- app/preference.go | 2 +- app/ratelimit.go | 6 +- app/ratelimit_test.go | 2 +- app/reaction.go | 2 +- app/role.go | 2 +- app/saml.go | 2 +- app/scheme.go | 2 +- app/security_update_check.go | 8 +- app/server.go | 22 ++--- app/server_app_adapters.go | 14 +-- app/server_license.go | 2 +- app/server_test.go | 8 +- app/session.go | 4 +- app/session_test.go | 2 +- app/slack.go | 4 +- app/slack_test.go | 2 +- app/slackimport.go | 6 +- app/slackimport_test.go | 2 +- app/status.go | 6 +- app/status_test.go | 2 +- app/syncables.go | 2 +- app/syncables_test.go | 2 +- app/team.go | 10 +-- app/team_test.go | 2 +- app/terms_of_service.go | 2 +- app/user.go | 16 ++-- app/user_terms_of_service.go | 2 +- app/user_test.go | 6 +- app/user_viewmembers_test.go | 4 +- app/web_conn.go | 4 +- app/web_conn_test.go | 4 +- app/web_hub.go | 6 +- app/web_hub_test.go | 2 +- app/webhook.go | 8 +- app/webhook_test.go | 4 +- app/websocket_router.go | 6 +- cmd/mattermost/commands/channel.go | 4 +- cmd/mattermost/commands/channel_test.go | 2 +- cmd/mattermost/commands/channelargs.go | 4 +- cmd/mattermost/commands/cmdtestlib.go | 6 +- cmd/mattermost/commands/command.go | 4 +- cmd/mattermost/commands/command_test.go | 2 +- cmd/mattermost/commands/commandargs.go | 4 +- cmd/mattermost/commands/config.go | 8 +- cmd/mattermost/commands/config_flag_test.go | 4 +- cmd/mattermost/commands/config_test.go | 4 +- cmd/mattermost/commands/export.go | 2 +- cmd/mattermost/commands/export_test.go | 2 +- cmd/mattermost/commands/group.go | 2 +- cmd/mattermost/commands/group_test.go | 2 +- cmd/mattermost/commands/init.go | 6 +- cmd/mattermost/commands/integrity.go | 2 +- cmd/mattermost/commands/jobserver.go | 2 +- cmd/mattermost/commands/ldap.go | 2 +- cmd/mattermost/commands/logs.go | 2 +- cmd/mattermost/commands/main_test.go | 4 +- cmd/mattermost/commands/permissions.go | 2 +- cmd/mattermost/commands/permissions_test.go | 2 +- cmd/mattermost/commands/plugin.go | 2 +- cmd/mattermost/commands/plugin_test.go | 4 +- cmd/mattermost/commands/roles.go | 2 +- cmd/mattermost/commands/sampledata.go | 4 +- cmd/mattermost/commands/server.go | 16 ++-- cmd/mattermost/commands/server_test.go | 4 +- cmd/mattermost/commands/team.go | 4 +- cmd/mattermost/commands/team_test.go | 2 +- cmd/mattermost/commands/teamargs.go | 4 +- cmd/mattermost/commands/test.go | 8 +- cmd/mattermost/commands/user.go | 4 +- cmd/mattermost/commands/user_test.go | 2 +- cmd/mattermost/commands/userargs.go | 4 +- cmd/mattermost/commands/utils.go | 2 +- cmd/mattermost/commands/version.go | 4 +- cmd/mattermost/commands/webhook.go | 4 +- cmd/mattermost/commands/webhook_test.go | 4 +- cmd/mattermost/main.go | 6 +- cmd/platform/main.go | 2 +- config/client.go | 2 +- config/client_test.go | 4 +- config/common.go | 2 +- config/common_test.go | 4 +- .../config_generator/generator/generator.go | 2 +- config/config_generator/main.go | 2 +- config/database.go | 4 +- config/database_test.go | 4 +- config/default_test.go | 4 +- config/emitter.go | 2 +- config/emitter_test.go | 2 +- config/environment.go | 2 +- config/export_test.go | 2 +- config/file.go | 6 +- config/file_test.go | 6 +- config/main_test.go | 4 +- config/memory.go | 2 +- config/memory_test.go | 4 +- config/migrate_test.go | 2 +- config/store.go | 2 +- config/store_test.go | 2 +- config/unmarshal.go | 6 +- config/unmarshal_test.go | 4 +- config/utils.go | 6 +- config/utils_test.go | 4 +- config/watcher.go | 2 +- einterfaces/account_migration.go | 2 +- einterfaces/cluster.go | 2 +- einterfaces/compliance.go | 2 +- einterfaces/data_retention.go | 2 +- einterfaces/elasticsearch.go | 2 +- einterfaces/jobs/data_retention.go | 2 +- einterfaces/jobs/elasticsearch.go | 2 +- einterfaces/jobs/ldap_sync.go | 2 +- einterfaces/jobs/message_export.go | 2 +- einterfaces/ldap.go | 2 +- einterfaces/message_export.go | 2 +- einterfaces/mfa.go | 2 +- .../mocks/AccountMigrationInterface.go | 2 +- einterfaces/mocks/ClusterInterface.go | 4 +- einterfaces/mocks/ComplianceInterface.go | 2 +- einterfaces/mocks/DataRetentionInterface.go | 2 +- .../mocks/DataRetentionJobInterface.go | 2 +- .../mocks/ElasticsearchAggregatorInterface.go | 2 +- .../mocks/ElasticsearchIndexerInterface.go | 2 +- einterfaces/mocks/ElasticsearchInterface.go | 2 +- einterfaces/mocks/LdapInterface.go | 2 +- einterfaces/mocks/LdapSyncInterface.go | 2 +- einterfaces/mocks/MessageExportInterface.go | 2 +- .../mocks/MessageExportJobInterface.go | 2 +- einterfaces/mocks/MfaInterface.go | 2 +- einterfaces/mocks/OauthProvider.go | 2 +- einterfaces/mocks/SamlInterface.go | 2 +- einterfaces/notification.go | 2 +- einterfaces/oauthproviders.go | 2 +- einterfaces/saml.go | 2 +- go.mod | 2 +- imports/placeholder.go | 4 +- jobs/interfaces/migrations_interface.go | 2 +- jobs/interfaces/plugins_interface.go | 2 +- jobs/jobs.go | 4 +- jobs/jobs_watcher.go | 4 +- jobs/schedulers.go | 4 +- jobs/schedulers_test.go | 10 +-- jobs/server.go | 10 +-- jobs/workers.go | 6 +- manualtesting/manual_testing.go | 12 +-- manualtesting/test_autolink.go | 4 +- migrations/advanced_permissions_phase_2.go | 2 +- migrations/helper_test.go | 10 +-- migrations/main_test.go | 2 +- migrations/migrations.go | 8 +- migrations/migrations_test.go | 2 +- migrations/scheduler.go | 8 +- migrations/worker.go | 8 +- mlog/global_test.go | 2 +- mlog/human/entry.go | 2 +- mlog/human/parser.go | 2 +- mlog/main_test.go | 2 +- model/bundle_info.go | 2 +- model/client4_test.go | 2 +- model/command_response.go | 2 +- model/gitlab/gitlab.go | 4 +- model/main_test.go | 2 +- model/post.go | 2 +- model/user.go | 2 +- plugin/api.go | 2 +- plugin/checker/check_api.go | 4 +- plugin/checker/check_api_test.go | 8 +- plugin/checker/check_helpers.go | 4 +- plugin/checker/check_helpers_test.go | 4 +- plugin/checker/main.go | 2 +- plugin/client_rpc.go | 4 +- plugin/client_rpc_generated.go | 4 +- plugin/environment.go | 6 +- plugin/example_hello_world_test.go | 2 +- plugin/example_help_test.go | 4 +- plugin/hclog_adapter.go | 2 +- plugin/health_check.go | 4 +- plugin/health_check_test.go | 12 +-- plugin/helpers.go | 2 +- plugin/helpers_bots.go | 4 +- plugin/helpers_bots_test.go | 10 +-- plugin/helpers_kv_test.go | 6 +- plugin/hooks.go | 2 +- plugin/http.go | 2 +- plugin/interface_generator/main.go | 2 +- plugin/main_test.go | 2 +- plugin/plugintest/api.go | 2 +- plugin/plugintest/doc.go | 2 +- plugin/plugintest/example_hello_user_test.go | 6 +- plugin/plugintest/helpers.go | 4 +- plugin/plugintest/hooks.go | 4 +- plugin/scheduler/plugin.go | 4 +- plugin/scheduler/scheduler.go | 6 +- plugin/scheduler/worker.go | 8 +- plugin/supervisor.go | 4 +- plugin/supervisor_test.go | 6 +- plugin/valid_test.go | 2 +- services/configservice/configservice.go | 2 +- services/filesstore/filesstore.go | 2 +- services/filesstore/filesstore_test.go | 6 +- services/filesstore/localstore.go | 6 +- services/filesstore/main_test.go | 2 +- services/filesstore/mocks/FileBackend.go | 2 +- services/filesstore/s3store.go | 4 +- services/filesstore/s3store_test.go | 2 +- services/httpservice/client.go | 2 +- services/httpservice/httpservice.go | 2 +- services/httpservice/main_test.go | 2 +- services/imageproxy/atmos_camo_test.go | 6 +- services/imageproxy/imageproxy.go | 8 +- services/imageproxy/local.go | 4 +- services/imageproxy/local_test.go | 6 +- services/imageproxy/main_test.go | 2 +- services/mailservice/mail.go | 8 +- services/mailservice/mail_test.go | 8 +- services/mailservice/main_test.go | 2 +- services/marketplace/client.go | 4 +- services/mfa/main_test.go | 2 +- services/mfa/mfa.go | 6 +- services/mfa/mfa_test.go | 8 +- store/layer_generators/main.go | 4 +- store/localcachelayer/channel_layer.go | 4 +- store/localcachelayer/channel_layer_test.go | 5 +- store/localcachelayer/emoji_layer.go | 4 +- store/localcachelayer/emoji_layer_test.go | 6 +- store/localcachelayer/layer.go | 8 +- store/localcachelayer/layer_test.go | 8 +- store/localcachelayer/main_test.go | 9 +- store/localcachelayer/post_layer.go | 4 +- store/localcachelayer/post_layer_test.go | 6 +- store/localcachelayer/reaction_layer.go | 4 +- store/localcachelayer/reaction_layer_test.go | 6 +- store/localcachelayer/role_layer.go | 4 +- store/localcachelayer/role_layer_test.go | 6 +- store/localcachelayer/scheme_layer.go | 4 +- store/localcachelayer/scheme_layer_test.go | 6 +- store/localcachelayer/user_layer.go | 4 +- store/localcachelayer/user_layer_test.go | 9 +- store/localcachelayer/webhook_layer.go | 4 +- store/localcachelayer/webhook_layer_test.go | 7 +- store/sqlstore/audit_store.go | 4 +- store/sqlstore/audit_store_test.go | 2 +- store/sqlstore/bot_store.go | 6 +- store/sqlstore/bot_store_test.go | 2 +- .../sqlstore/channel_member_history_store.go | 6 +- .../channel_member_history_store_test.go | 2 +- store/sqlstore/channel_store.go | 10 +-- store/sqlstore/channel_store_test.go | 4 +- store/sqlstore/cluster_discovery_store.go | 4 +- .../sqlstore/cluster_discovery_store_test.go | 2 +- store/sqlstore/command_store.go | 4 +- store/sqlstore/command_store_test.go | 2 +- store/sqlstore/command_webhook_store.go | 6 +- store/sqlstore/command_webhook_store_test.go | 2 +- store/sqlstore/compliance_store.go | 4 +- store/sqlstore/compliance_store_test.go | 2 +- store/sqlstore/emoji_store.go | 6 +- store/sqlstore/emoji_store_test.go | 2 +- store/sqlstore/file_info_store.go | 8 +- store/sqlstore/file_info_store_test.go | 2 +- store/sqlstore/group_store.go | 4 +- store/sqlstore/group_store_test.go | 2 +- store/sqlstore/integrity.go | 4 +- store/sqlstore/integrity_test.go | 4 +- store/sqlstore/job_store.go | 4 +- store/sqlstore/job_store_test.go | 2 +- store/sqlstore/license_store.go | 4 +- store/sqlstore/license_store_test.go | 2 +- store/sqlstore/link_metadata_store.go | 4 +- store/sqlstore/link_metadata_store_test.go | 2 +- store/sqlstore/main_test.go | 4 +- store/sqlstore/oauth_store.go | 4 +- store/sqlstore/oauth_store_test.go | 2 +- store/sqlstore/plugin_store.go | 4 +- store/sqlstore/plugin_store_test.go | 2 +- store/sqlstore/post_store.go | 10 +-- store/sqlstore/post_store_test.go | 2 +- store/sqlstore/preference_store.go | 6 +- store/sqlstore/preference_store_test.go | 6 +- store/sqlstore/reaction_store_test.go | 2 +- store/sqlstore/role_store_test.go | 2 +- store/sqlstore/role_supplier.go | 4 +- store/sqlstore/scheme_store_test.go | 2 +- store/sqlstore/scheme_supplier.go | 4 +- store/sqlstore/session_store.go | 6 +- store/sqlstore/session_store_test.go | 2 +- store/sqlstore/status_store.go | 4 +- store/sqlstore/status_store_test.go | 2 +- store/sqlstore/store.go | 2 +- store/sqlstore/store_test.go | 6 +- store/sqlstore/supplier.go | 12 +-- store/sqlstore/supplier_reactions.go | 6 +- store/sqlstore/supplier_test.go | 4 +- store/sqlstore/system_store.go | 4 +- store/sqlstore/system_store_test.go | 2 +- store/sqlstore/team_store.go | 8 +- store/sqlstore/team_store_test.go | 4 +- store/sqlstore/terms_of_service_store.go | 8 +- store/sqlstore/terms_of_service_store_test.go | 2 +- store/sqlstore/tokens_store.go | 6 +- store/sqlstore/upgrade.go | 6 +- store/sqlstore/upgrade_test.go | 2 +- store/sqlstore/user_access_token_store.go | 4 +- .../sqlstore/user_access_token_store_test.go | 2 +- store/sqlstore/user_store.go | 8 +- store/sqlstore/user_store_test.go | 2 +- store/sqlstore/user_terms_of_service.go | 4 +- .../user_terms_of_service_store_test.go | 2 +- store/sqlstore/utils.go | 2 +- store/sqlstore/webhook_store.go | 6 +- store/sqlstore/webhook_store_test.go | 2 +- store/store.go | 2 +- store/storetest/audit_store.go | 4 +- store/storetest/bot_store.go | 4 +- .../storetest/channel_member_history_store.go | 4 +- store/storetest/channel_store.go | 4 +- store/storetest/cluster_discovery_store.go | 4 +- store/storetest/command_store.go | 4 +- store/storetest/command_webhook_store.go | 4 +- store/storetest/compliance_store.go | 4 +- store/storetest/emoji_store.go | 4 +- store/storetest/file_info_store.go | 4 +- store/storetest/group_store.go | 4 +- store/storetest/job_store.go | 4 +- store/storetest/license_store.go | 4 +- store/storetest/link_metadata_store.go | 4 +- store/storetest/mocks/AuditStore.go | 2 +- store/storetest/mocks/BotStore.go | 2 +- .../mocks/ChannelMemberHistoryStore.go | 2 +- store/storetest/mocks/ChannelStore.go | 4 +- .../storetest/mocks/ClusterDiscoveryStore.go | 2 +- store/storetest/mocks/CommandStore.go | 2 +- store/storetest/mocks/CommandWebhookStore.go | 2 +- store/storetest/mocks/ComplianceStore.go | 2 +- store/storetest/mocks/EmojiStore.go | 2 +- store/storetest/mocks/FileInfoStore.go | 2 +- store/storetest/mocks/GroupStore.go | 2 +- store/storetest/mocks/JobStore.go | 2 +- store/storetest/mocks/LicenseStore.go | 2 +- store/storetest/mocks/LinkMetadataStore.go | 2 +- store/storetest/mocks/OAuthStore.go | 2 +- store/storetest/mocks/PluginStore.go | 2 +- store/storetest/mocks/PostStore.go | 2 +- store/storetest/mocks/PreferenceStore.go | 2 +- store/storetest/mocks/ReactionStore.go | 2 +- store/storetest/mocks/RoleStore.go | 2 +- store/storetest/mocks/SchemeStore.go | 2 +- store/storetest/mocks/SessionStore.go | 2 +- store/storetest/mocks/SqlStore.go | 2 +- store/storetest/mocks/StatusStore.go | 2 +- store/storetest/mocks/Store.go | 2 +- store/storetest/mocks/SystemStore.go | 2 +- store/storetest/mocks/TeamStore.go | 2 +- store/storetest/mocks/TermsOfServiceStore.go | 2 +- store/storetest/mocks/TokenStore.go | 2 +- store/storetest/mocks/UserAccessTokenStore.go | 2 +- store/storetest/mocks/UserStore.go | 4 +- .../mocks/UserTermsOfServiceStore.go | 2 +- store/storetest/mocks/WebhookStore.go | 2 +- store/storetest/oauth_store.go | 4 +- store/storetest/plugin_store.go | 4 +- store/storetest/post_store.go | 6 +- store/storetest/preference_store.go | 4 +- store/storetest/reaction_store.go | 4 +- store/storetest/role_store.go | 4 +- store/storetest/scheme_store.go | 4 +- store/storetest/session_store.go | 4 +- store/storetest/settings.go | 2 +- store/storetest/status_store.go | 4 +- store/storetest/store.go | 4 +- store/storetest/storetestlib.go | 2 +- store/storetest/system_store.go | 4 +- store/storetest/team_store.go | 4 +- store/storetest/terms_of_service_store.go | 4 +- store/storetest/user_access_token_store.go | 4 +- store/storetest/user_store.go | 4 +- store/storetest/user_terms_of_service.go | 4 +- store/storetest/webhook_store.go | 4 +- store/timer_layer.go | 4 +- testlib/cluster.go | 4 +- testlib/helper.go | 12 +-- testlib/resources.go | 6 +- testlib/store.go | 2 +- utils/api.go | 2 +- utils/api_test.go | 2 +- utils/authorization.go | 2 +- utils/authorization_test.go | 2 +- utils/fileutils/main_test.go | 2 +- utils/html.go | 4 +- utils/html_test.go | 2 +- utils/i18n.go | 6 +- utils/imgutils/gif_test.go | 2 +- utils/jsonutils/json_test.go | 2 +- utils/jsonutils/main_test.go | 2 +- utils/license.go | 6 +- utils/logger.go | 6 +- utils/main_test.go | 2 +- utils/markdown/main_test.go | 2 +- utils/merge_test.go | 2 +- utils/password.go | 2 +- utils/password_test.go | 2 +- utils/subpath.go | 6 +- utils/subpath_test.go | 4 +- utils/testutils/static_config_service.go | 2 +- utils/testutils/testutils.go | 2 +- web/context.go | 8 +- web/handlers.go | 8 +- web/handlers_test.go | 4 +- web/main_test.go | 2 +- web/oauth.go | 10 +-- web/oauth_test.go | 6 +- web/params.go | 2 +- web/saml.go | 4 +- web/static.go | 8 +- web/unsupported_browser.go | 4 +- web/web.go | 10 +-- web/web_test.go | 12 +-- web/webhook.go | 4 +- web/webhook_test.go | 2 +- wsapi/api.go | 2 +- wsapi/status.go | 4 +- wsapi/system.go | 2 +- wsapi/user.go | 2 +- wsapi/websocket_handler.go | 8 +- 635 files changed, 1309 insertions(+), 1307 deletions(-) diff --git a/api4/api.go b/api4/api.go index b024bb92b85..3dd7236c3ac 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 c2e6cdae987..4dec81bb1db 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 6d9db441931..f5efad1e8a8 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 ce080c02845..e19e2ed86cc 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 c222e2569d5..336cf91dc11 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 a3cd5738b2c..3d883378785 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 5396a836464..ed51de2a829 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 66c6cba07fc..147fa8e2dfe 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 095e260abbe..3fbd3c79f18 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 25287671f27..04d231acd33 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 db798b1bdde..b4eb4601c45 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 87a223e8dde..73e0e5463e4 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 7dddd313b1b..66747a58c2c 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 7dce542648c..8b4246b9c02 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 67987fbc598..8a545871f87 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 0be330cb948..24986f848d3 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 9aef79563b3..922828d83ca 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 34dd0fd4b6f..a3e6c768eff 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 1e0a3a90689..8175f78170a 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 db005015b0d..bd06b426408 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 81c3e0752a5..bcfeb3e65d3 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 68b05bafb8d..9681643e7ed 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 ef3f410d4b1..73f7e59eecc 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 b4511557151..7248ad398bb 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 a0434e0ed86..302d8657911 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 b6cb0361ae3..916ae43cf7d 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 4bfdaa52abc..3b2b9d89b75 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 6a013f51463..51cd17dce00 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 e06fca8d5fb..6e7e6bb4316 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 8aee0b8e2fa..dec2f43f725 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 c543d851d2e..12e4fe5d126 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 31672226477..289664ba95c 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 f24d4abde35..cc3b9734c1e 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 573e2b93af6..0846886990e 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 9cb9dffc3a9..99351df0d11 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 b21bd9a9802..445a51cdff3 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 97c7c245012..f2ab5ddff5b 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 f2c7f8f4571..f554800069b 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 2c4bd7123dc..e893225921b 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 4d4c5e5cede..54da44c5340 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 e8528497ff0..5de4474f8e5 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 c4be33f25bf..3faf17e4b79 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 67d29b4c119..8b708e25cf9 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 87db556d882..504b1da87ce 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 e21ec663056..d297fc9d7fc 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 a5cf617296f..cd43ae20aa0 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 c10ca44312b..e5880efaf9a 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 114c73ff4e4..86786ee88ef 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 882cb46a8c7..bb81bb11cea 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 b3cc8a28eed..2f063bd2194 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 cdb0800b152..001036e33e9 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 c722ac4a783..07edbdae083 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 ed1cd68110a..6b403a732e7 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 c1438ab555b..9cd9618b4d8 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 c2fd5107013..1a4f63de301 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 f602825d968..c01bfda2055 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 5d47a9ead39..ac2c43ed5b8 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 c985efd96cc..3601aa95e3a 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 05da0a4266b..3a3dcbc2699 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 9b26abb189d..4afcf45127a 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 bb923004d38..71621a42915 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 e1cc5d66b4f..560c0f1f7e0 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 3e04f824341..00a9b6721f9 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 036c7a08114..ad1aa000100 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 5f31f439923..397de123bab 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 dbcf163950d..73066479451 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 18077d3a622..5cef95b93e4 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 0ffaf447767..d2afa7ca88a 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 85eaf87d39a..4d458bfda70 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 8450684f7af..a90ff8df28a 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 91898efe929..6169dc5e62a 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 e7a8600f2a4..4a01743949e 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 8862da17e0b..fd94a203223 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 2701829a342..a294a916d14 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 9382372ccfd..8e8847c7453 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 c5c4ebf9077..fbd232d5934 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 f3014b1b8cc..4daa77b962e 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 de1fc96e74f..8b655e77f59 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 e8a32ebde68..bf4f8a8ab3d 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 72561d2b94f..74f1c82da75 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 520d4e36308..0f86d3e0815 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 68894033739..7d6781c96e1 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 bded3f202e2..2707a77d059 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 11045361136..c4c4deb45c9 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 20548d1e036..cec5bf8386b 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 e322e8c66a7..1ace888a997 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 7528377af98..56253d1c5a5 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 1e9561488f6..964b2d450c6 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 11c91b0a00c..b6fa64c2fb3 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 b643842d1cc..95e05a6bacc 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 5bfee5ca45c..cba7e9ef5f1 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 10c27226da6..133e0ad6995 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 54556f3c772..8dc9269bb27 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 cbda90f9d06..133ea3aac0d 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 8d1f3805287..b75cb895f4c 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 cdca7b2a713..5787b084b0e 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 678031dbbbd..599ee88cc8a 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 4fd25cb9e3d..ae4e6cc382b 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 a6fc84013d0..fbacd7dd7e2 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 fb042dee7c6..05cfb126797 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 c66e9318c22..f143fa24f26 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 432ab566ef2..93079725e9c 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 581ee1096db..a96a4ffb8de 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 c775b09b7c7..9a8f81fdb38 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 a181bb8a42b..73c2e6a347c 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 89699ab3f8f..890fa9122f9 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 30d0ce67981..f45959a6542 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 9b489bda238..31978bba4e7 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 80013a9184f..b09037dead7 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 71f40d4664f..218e3a1ebaa 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 6f0b702204c..08fa547124a 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 7ff106cf56e..a783187ca48 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 7aa6bf91d8e..eca6dab5166 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 4aa5bef30bd..e4d6530634c 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 8c5a94667fc..140477ad140 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 f79117b5f5d..75c47b33c52 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 30065519674..87643127d6c 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 b071a14346b..676c45f9b3b 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 3811cbbd9a3..8d70efae8ae 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 82ac179a196..47ac23bed9f 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 01f5a1b27c9..7d48263a6b1 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 81b1951752e..ad44565173f 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 140ef8961bb..912b9e5f5ba 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 a555f89fdbb..7fbedb6cfd3 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 492ed8c7279..b71f15cf25d 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 c7054f4f94a..92ddecf603d 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 58279a422e2..aea15269dc7 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 5c7d95d47d0..fd35888f0fa 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 43211173b72..efc91c55c20 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 32f1f54d5d8..3aa9be72cbf 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 0465346ee18..bceceff2442 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 0018663cd6c..80fcf82f8da 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 6663359a5d2..938d339c60c 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 1ec19ed552b..49c760ca5b9 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 3d1e44e1360..b9005b61d4f 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 2ed8792cdec..0d6e6f58ff9 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 df830c8ac37..b8488ec2a9a 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 e43133b9749..47291d53748 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 11107c4b931..e102881502b 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 b2f33a8128b..43b14632534 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 b749399acc4..73f8ed4cf2c 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 b931ca8b193..e7b8b3aa71c 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 235dad0bb3a..a1655454aa2 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 50d8b85a187..b56e166ba65 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 2e731f5d742..7c2bcafc531 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 d0166072d8d..65c4fc5cfce 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 01f82f31e4a..f9f8021fb57 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 aed286f0d9d..5bda1a75e87 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 42222f1b1d1..af167b25498 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 957174f0757..77132bb0611 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 48365470022..cb7fa27f675 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 452e2a56135..df1ae29f87a 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 2e41d40da44..29733780ff5 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 85a248f8663..6a063f25969 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 57fc96a9a59..f6f40edfd70 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 898551f8339..a4735f66c4f 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 690e5bf5828..4e23a0b3615 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 e716963f516..cd5512b4f30 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 55a41c7730a..1538773d4a3 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 f82c6da2b97..59f162faccc 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 add7e372127..cdf67e70913 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 153581c25ac..5a3bf3b2534 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 c06aeb4e845..d5ab2e0e3c6 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 2df205847ef..61e083ebeb3 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 ec966f33da8..2791361b1ce 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 59d8188cc50..6ddc5c12629 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 628daba8514..bffc1653ca3 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 420cca36aeb..9773694126f 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 da61119e9e8..7ee060aaa9f 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 d45a45a6e89..4dc70ff20ff 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 22a8568a682..65b6087a49b 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 fa595c6855a..285b57fc2b7 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 83bfc158deb..0d0ede59d77 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 80584e6b516..a273d566927 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 d3945973152..2d13879d0c3 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 8c4b5fe0c5c..4515dce45a7 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 dce6dd62533..e18ca2b9b1d 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 5344cc917a8..a3a4f40b855 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 0429934dc64..eeb76048d74 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 4038e81c86c..321e01acd42 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 ee68b036ac6..7609ad0a65c 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 b04d79523a7..db5b849552e 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 1b4a73ce349..0601caa4fa2 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 5392390899a..0dd5837717b 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 29f036da54d..151349490a7 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 55f420ce575..7cbfa9f83fa 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 6b13af67ded..b2ce4845382 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 d4fe8019fe7..d656c39028e 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 943c42a0dc2..78882695f2b 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 90fad124c73..efe403b1862 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 69d1385bfaa..49e4e0c593e 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 e6c4b2b94e2..beae2aa37e0 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 159ec7f3b30..08900b2a10e 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 8e1df5fa427..3dbc77924a2 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 06af46d1cde..c4597e96f00 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 2df1ae8b19f..7901f57fcc0 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 0eb28c5e16c..c98ede3fc2d 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 d9785b8921e..24fdc44ee8c 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 d591a8d1366..baf3b6df72b 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 c8303bee12b..d7f8cd216dd 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 1a3e41aae0b..94348c6783a 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 8599f7e679c..77cdcbbd000 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 b36d6e43191..9507922de11 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 2f99ca82318..92a29122322 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 e05e93b3412..a72598c3394 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 c1ae5a8ca94..b6f83461636 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 9733ac48db1..4efb413e2e8 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 53df7bfd5cd..42d3a571da4 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 19a06fe4171..4f8b4dafe9a 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 b67f6f1ca45..8a4b171a855 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 fa3840dd738..27c704576de 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 458a6fa1615..1568facea76 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 d964efc17fd..61307b36fec 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 8c560cbaaf0..f7c77bca0a9 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 042c12de70a..d0e39694841 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 6aca0165a2d..1f235bde0bb 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 17b683e7677..08e86330ea0 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 089e4a9637e..93d2c65d5f6 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 bde7af7cf71..893fbd08d7d 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 3d4ecca4d7e..a10febe2f3a 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 1184a576ede..d2647178a35 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 d4812b29ff2..048c88be2f8 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 5b14ab865ff..a8e3dd2df4f 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 0036e14496d..aeb0e840367 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 fa51e255d94..8f9e78bed62 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 a268c1bb9f1..291e7a43a28 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 4e25a0c6797..9fed721faea 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 c6c80140be1..5f0ad311164 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 62730c3d080..e409b927497 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 02096ab6b2e..992e639f254 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 77df7ea6909..b17321c741a 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 e805d548fb1..e8d0b426645 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 1b4e48a9ff7..be44b47eede 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 b6d820fd8fb..7530296a77c 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 37219395c4d..0b371062a8c 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 6755c2bb32d..8313aa914c9 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 59ddc6710db..b1c71ff9b04 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 9f109d82ee1..772a44c2092 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 7f41d92693e..5ba01bc3c89 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 ee455c1cfd6..8563c381fe0 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 2668bc14ac5..641dae48fa7 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 bb12e7074b0..05214d0edde 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 27c6c203d6b..c8d6a0f8af8 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 bdf79030232..eb76b8d2005 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 780c10b6e76..1002eb050ad 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 5e0131c3a1d..31c675598fd 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 3822d16c791..9a9f534ed14 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 e629bbdf4ae..3e30b0633a0 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 bb0f5b68869..85efefd35e6 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 d6003adc3b9..bd7d18dffeb 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 dc22c26ee38..e26b30c13f8 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 1727520994d..27ea7534b3c 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 a7637f3ba1a..ab7a99050ba 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 3d599e0136f..e5e130c2b8c 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 2bc0d91ca29..48e5134d939 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 2ca3ac73312..d30e83abb8e 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 28ccd4c7858..48c2aeeb486 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 d830a3b1dc4..509fe960662 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 75202c937a0..869b6794bea 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 a4a1ab1fdeb..23e5641068d 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 df44dea7c94..4c6f2f3b0e2 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 2f2bee18dee..604df243784 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 812e3337a14..7f205511a65 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 5f61aa44761..050a08c823d 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 7ff22b5d818..f45952dd230 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 7283df0f2d4..83b1630a222 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 dde3afb366a..bf69958dcc4 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 6292315f0f8..62522f5c58e 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 01d933a98db..d6c6275e440 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 3c7ddc49ba2..f7f55415fcf 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 c86601fb604..6658f2a28db 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 4f0dd7f13b0..843ca721911 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 f1c9d34c8f5..9d4482913a4 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 f6eb6cd99da..0a96c0add13 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 9813f387c70..30846b92d4d 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 dfcf78caf1b..5702d156aee 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 685c8137017..95a2373b70c 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 17659f9c0e8..7af595691e8 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 41950f96e85..45cedb77506 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 323c8e5254c..8fcf867bb1a 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 61f1e811785..84916db5d1c 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 3067e8084e3..482e7024242 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 084785206d6..6f6c66b2a3c 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 8267f813e77..768bc184112 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 5cb3a8f1beb..b7a39720fb3 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 e89868f2ced..5a2b28ae930 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 238bdbc5b83..28a4b075ad6 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 1f326c93c4f..e1b11daf20c 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 13605a34f6a..ce7ba328b2a 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 22ba97c61a6..d831ead1542 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 42fbe4827c3..ae5e5696da5 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 19ced5dc773..e5bfade391f 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 6401feeff72..28d54627403 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 70698742e27..ab7d922abfd 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 fce68404e8c..9a5a37745d5 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 c80cf8ef55c..cc66205a16a 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 87a44d75dab..6472cf9c4a2 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 af824df6b6a..f4c87b063d0 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 540fc79a56e..b12bef466bf 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 90460b36cf7..b084a58765b 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 b567ab3cc3d..2efc49ab678 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 e818975c944..5cd9dd366de 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 40ef6a07919..2db191f0a4c 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 42b095592be..5ca2a5d51df 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 65e932268ff..6e30024c070 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 353d13bbaaa..3e3fa5e8269 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 531daabc987..2200e26ba55 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 0560a7d01b2..932fd67d494 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 e01e36265f1..231ee50549f 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 97886885bfd..5f0536e6c07 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 51bf41c266e..3bfa02226be 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 6880d8d5a71..a303134abbd 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 3e934d439b3..0a30b822b17 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 131c843e7ca..cafbc09242f 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 87bc78d0a8e..b6eb6159ee9 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 ab61544ff25..b22510ad25c 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 dd9c57f1120..653dd06d6db 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 14927bee476..d50fadc6749 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 07f7d387d61..0671424fbee 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 772cf50c567..423d14dddee 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 73f78e4fe9f..95264dc355d 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 16e0d76976d..a524288862f 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 5565afe415c..8af1ffa20b7 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 74b0df751ab..611fb46764e 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 36c075f31dc..794730b3c70 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 8fde650708b..8105089467c 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 3afe961e39c..2c69f020b9d 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 3b4104f7956..e01fdc848b3 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 708ca665c05..51fecb649df 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 b2ec0d5f421..108547f2d2d 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 ce5bd80dbc4..54656ee5b69 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 ffc2d4fedaa..5594956519e 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 123856163e8..95e0a16c971 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 fd7817597ac..e3342aa00de 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 c6a535ce784..59b699d0778 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 2bc7be73680..f9b3eb64dac 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 151b240e01c..c1c19d10cac 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 5a8e9bbcb70..543bda3137a 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 e073cf6d5bf..46a4800bac8 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 92978f8ffc1..3014bb130b0 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 1db869dec82..73436a8b61b 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 f0b40a7322e..383826755f5 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 ed4ecd4b6c9..e9f8a89218e 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 178c17c1167..3ac78dd5184 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 b94726a6172..8e45a519c50 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 1095c73f825..a74c37b964c 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 2f00409d1d5..c416897ac1c 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 48dc9f57987..d72f254118c 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 4d67129af30..a2dd10d56d0 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 d596bd044e4..1aae32f1c30 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 c9b41367583..015425f8dae 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 704fbb5759f..4ef547f6daf 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 35dd4fc5f81..fdc9455b4c8 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 06897e43ab3..40ce5c0c081 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 66904d949f5..29b98950ec4 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 7dbd7aac916..0cfabef3f00 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 05fd45551ba..823a4c46b8c 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 6cd32015b2c..b65f4116adc 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 cae7b01a5e7..055d6e7642e 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 0a633023a2a..d4b36ff4daf 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 39bcd8c591d..a0200be0e05 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 a21c222d499..4a138c4e5f3 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 9baa56e30ac..798fc650cfd 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 d55e3b66f38..c887b04be33 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 0068e2eb385..8bf24a33e9a 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 f6a3a3333e6..8790e00253c 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 1aa738aeaad..17dd23bb1f5 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 f8175de5606..e5426e3105e 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 7cb06701ad5..f0e5be06a5c 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 87f2c285da5..c129b3e6158 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 6335cef0d10..4099f62093a 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 f0a388b6a97..852735d51f3 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 d42ebf9cc64..8533f72ed2a 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 93241af09e9..2ae2c2d5377 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 e13aa34167e..a66069cfb97 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 4205a162f2e..3cdc1df6290 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 e5b9ec716f2..81db5390315 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 529da48947f..0c8ee9c6d65 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 8c2de7f5d1b..f94738ba75a 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 d87d976d41b..69f245fce2a 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 d7e956426e6..0269cee0e53 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 1eb8ce08da9..d04f138caa0 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 67543f50cc7..afbf0fbdbf4 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 3a9cdf7ab02..78e4f8f19d2 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 26f25c91abc..ef7ae83a05b 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 e4aa9dec334..afd8114ab23 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 b67b83996b5..8323210fe4c 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 3cab84b9daf..2a6545f4cf1 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 5e01fc2fba5..0b3b79b7639 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 31cc728d1c8..a871cf4584f 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 142ccc49b32..0450105d262 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 8960e61efef..693f96d5151 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 2f29b587ce2..b1089e95745 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 2b2d9120119..dec0adc6ceb 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 e39e36001f9..d7b9956f7de 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 4a80edaa231..4e139e693a2 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 a2eeb92c2b2..db3a7358d2a 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 d7e3525e713..b0059ea3cc3 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 69a51bd397e..383711395e5 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 145f3fadac6..24d053589d2 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 e8839b8185d..e79ad4a3795 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 ef317bf4e2e..51648c5517a 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 a0d63473a87..50b08639803 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 685b073106c..a14641470b0 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 ec293defea0..1dc746a8518 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 820b6bee8bb..3b5ecba8d6f 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 8f9647d64f3..2515e39f356 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 d166fd49f26..7fa10003e9e 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 e5b5ef032bd..66a16a35c8a 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 27f5bc96183..6bc6316bd0f 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 6de790fd55c..09f12488c29 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 b52494190f9..cdadab4160a 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 fc01b7513f8..cf342d5ca90 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 5d75ae5d1cd..3521fca4f99 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 2e80aab8b20..f7d65a9be08 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 b6e423a4270..2ccbf2dabfc 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 bac32c1ce59..d3031a130a4 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 bbdc19e88fb..33ec661a822 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 13dbf83a40f..797f5c8000a 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 eee2470ccf2..2d86175676f 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 bee78d4c2f5..63f042f2d2f 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 ad282502a9c..e312f490752 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 6d1b46293a1..4e37fbe586c 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 343f9026c24..73250e02a60 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 bd18576d72b..fa6c9ca7b15 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 9686f8d92e5..127d7b3354f 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 900e97dce8f..b831e32a72a 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 b6860125cb3..274a6215dd0 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 40e2c9e5429..d7c7617cc64 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 59567b0678b..5947a2b80f6 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 6f826cdbda0..46e2998b7dd 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 8ffee95b4ed..5adfda89149 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 b7cbb3d94af..b9af5c3dfe5 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 ece3e8f8c7c..1564546ec79 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 be6afb65c72..117befe22ad 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 3aec28ae292..d010954f02c 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 062b2dce816..7d80a3f4150 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 fbee356b7fc..01d7ccd5fd5 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 6ea72854ced..4ed69842649 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 9c804cd89bf..4fff3ce1ddd 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 6d8e57c2e75..1c1e22c6aa9 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 19920ec02a2..918efce88dc 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 4f1437c717a..41e27c92f59 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 33aaa2a7c61..2303e070abc 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 c2e69a92237..fb841fbebbc 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 cf274e8ad57..c33b824081f 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 e592358a8d5..206a2f38a1a 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 c9e3e7c3746..a93fbe93323 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 e7c5b2f54e2..9fb05e7c815 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 04e23501707..e1cfa3dc74c 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 4fd747b066d..0be05ff2dda 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 65d8bee87a0..97d24026698 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 e840ad58e03..76c938090cc 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 d2a257a487d..43e2d83a075 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 ab0010b43ae..59098bfc1b5 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 ae2c3195532..64e51258669 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 c1119d227a2..c60ffd5c377 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 fe569410dbf..d894e50941f 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 0ba334643e3..5eb44e65335 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 db706f555c9..c39ae0fb2cf 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 b6503ccb8a1..e7115c9b920 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 6fab95400b8..2e9899f1290 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 ee8c000820a..49b789dde98 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 82d4c861059..853f2df7b38 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 5460e2f59cd..0182d95490e 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 63495e05f34..5bc82260173 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 c4e0b480c39..ec385c9c70e 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 981388761b6..62be1bd2368 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 6f5f1cc5298..bf08e7c5337 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 99b67438d7a..8a01965357c 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 c1295ee54a4..2415a641379 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 796b38e4149..09c401d56d5 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 117f4c5bad6..97ff9c00e56 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 a09d2ec1c32..340ceb339fb 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 a9c0143776c..f58fdbd9e98 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 d157d389344..fa74f958f78 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 f917c8647a5..cc3cea3ed26 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 a86ba78626a..a73eefc8f94 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 2ab8d4a5491..a72c96f3f09 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 25df3b676dd..d1b73c3c538 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 a915740f71d..1f454403f1e 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 57fb09694d6..09db83b783d 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 222804460d8..f719b588c18 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 10a0897cb23..b7475ddc622 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 3c4d61d1ec3..294d5e17f06 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 d2e883235c9..ee082239d33 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 03e69df73d0..84b84778b37 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 73c5e45c41a..44267ddf078 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 36604f116a3..4bcdbbc75c9 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 22ef3373e06..d634709a07a 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 69c272937d9..d61c7d34ada 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 e89930f7110..2caf92f2645 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 e6fc048726d..dcdc5cb7036 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 b07495715a0..c9615dbf1fa 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 f0ec1830c64..d25b5fca902 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 c8c58b55465..025998b8ce5 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 c84d4248c35..50aecc6100b 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 e4fe8e0b1b4..609caf1faf9 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 ddfedeb1852..ee8c5a479dd 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 76b38627fb5..ed581ae4496 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 b5454257b1c..7e4a4ea0121 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 c7994084710..93e3679526f 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 7128c76a7e1..9ee8174dbb2 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 3835bd01f18..ac0b3adc463 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 63e5317d6a2..454ae3fdaac 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 e9793caf279..a4484496843 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 8563fc5ace4..e06d0c8a9b5 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 0c3b70fd579..4d8056c8da3 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 6f0a509e286..9ef8bec420a 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 8f757aecbe9..1ff50899951 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 603ccc28166..1b49fc07e2d 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 84b901abdea..e3b56c1d6de 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 4bafc88140a..fa40aad09f3 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 bd5df11dc0e..9fa524592b8 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 4bca12ccc40..ae3fd085670 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 03e5b76b15c..f43bb06d287 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 fe2c7485444..97a87e7218d 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 03164301922..7ead0a6ea4a 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 d02e42d3eb6..535647a2909 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 531bdf8d604..b0d9cab6462 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 7c4cf76cf5c..7054834f866 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 56e9ab02312..1ca01e2213a 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 e71e6253595..242628ae024 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 1aa1956612f..0eb04d00e77 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 37f07d45d2c..59b7fa39376 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 e26b92b149b..2e382576f67 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 19df48809d3..228fe09aa81 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 ce5d068b923..b577cd49b87 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 195693e6871..65d9b6b4068 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 77cef61999d..9d36bda7309 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 97d436386cc..397c983f10b 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 dc3e2a39c42..32dab6532bd 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 237525116af..82328aad16f 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 d91103cde0e..7027cdf95ce 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 16cdd6174dd..40022b64645 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 b30c7516654..7354f9e57a4 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 25b1c98e4e3..9da744deb41 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 7740d16b0a5..83cac4899e0 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 c5d6f1d2656..47e9aad5da2 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 0c65677b7b0..03016dc6a72 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 b68b7dab92b..047e4b9d8c0 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 1d362956892..5e17fe52e52 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 a60141d2995..0cba996630d 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 b804a0ccd0a..16742cc14c2 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 e0b4bff3b24..e0bbf96aaeb 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 98429c68def..5d2b4a9a412 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 ef91923a225..2ee24bde711 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 2c1a7fbefc9..fbb30bb8114 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 1a8f34a6609..79513c832bc 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 8a376037eff..f5acaea9422 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 2a7a12cef66..96d2011d527 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 3ed44c34b37..a568a2a88ac 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 71a19c4fb7a..0eb4c77a382 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 a023a9c13c6..bd879d60d0f 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 71828d62b04..0e5a72b56ad 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 41117978bbf..66c9d1e02bb 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 64254eda529..46e3f07ac3f 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 d1c1b1fbb8c..27e7b5cc28e 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 88f3c817d5a..d42934ff446 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 b4e22062bc4..50f0526c3af 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 bdfb0b40afc..8a21efd4cd5 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 c9b1cb10811..61e69618412 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 1cd8f54a3e2..844939a9311 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 1da08238884..0b2a7b2877a 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 d107849e98a..c839559028b 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 a6a22c224fa..9b7f078e2e0 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 0a3012f7675..2d65fd87f7e 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 61be3b43746..f8ede26c657 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 3689b7d2126..6efe3cf3533 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 2c126cceb09..321a2e1d8ed 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 3649e79729f..89656daae04 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 e98af1e4608..f9d55acb2c2 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 f197bf15c24..c10be34a3c8 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 247f84cfb9d..8a355359ca3 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 96394e43de7..45d71e839eb 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 6645224b1f9..2eeb1e2f494 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 9b613774f47..20007c8903a 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 c9e376f7fde..1216f784d52 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 90247affe93..2fc6050eb58 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 a4073a1942b..35022ce67ec 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 1d09adf8f80..8c8597d94cd 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 46dbf6ba685..7ad96ba023c 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 1a18111c81e..2c1b0f71b98 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 275e7a88329..91c82d557ca 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 af20c5327e4..e93600e94ce 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 0e4e6ce3909..0c286aee8fc 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 d02646f7bc2..af8ed239e26 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 c18b83ac310..b3027286f30 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 ee9dd9b0125..452ef316c9b 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 afa3bba47f9..084eb9c795a 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 c8a75e28e44..fba0b0289c0 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 60fb9c19238..643cddc9a42 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 df1692540e0..2eb978a0e09 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 cfc9430bdc4..131b2370493 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 6e513b3eaf2..f23c22af83a 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 d84207eaad9..35bdb992396 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 5125b45e630..e8d0f392efb 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 1dedc2c3f10..5300bb7999a 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 e8bc05ab9df..b9966bde6a4 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 fbf88730fa3..157610e4e1b 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 5666dceb07b..ca531ae2106 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 fcb722dc8a4..97fbfc3505b 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 240ec11071a..6a3047803a3 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 85cb66d604e..36ef0906c24 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 f518ecf9acb..e733797789a 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 3426525a02d..8c8f340a7a7 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 49b560b0d21..320f1b70899 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 c1f9c14847d..4409a3d572c 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 fb276d87d83..777e65ef427 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 a2b5af7e576..1a04f549514 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 087b99a3dd2..c522cc21884 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 f5ef44f81d2..777d2444821 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 14c1ea6f691..759b13b2b0e 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 ceb063fc40c..3f95cda97a1 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 1716c2fa106..b6aac2b15d3 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 4f56c51ebd8..6a3c17a118b 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 cb633177f00..385caea8387 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 32d3e14398e..03782bf4243 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 6e1b3f7e832..3003e8b8bbd 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 f954dff57e0..89f931110b5 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 e99524c429d..94148c9e495 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 9974bdafe3a..2fbf19a153b 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 6bb852ad00f..a9eebebf1ff 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 efdd6fa4f96..6efc6863851 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 9f20f2958a0..8bfb443b31f 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 39de6ddb2c8..5edd430a5bb 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 79346f90537..4b7921d648c 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 087942d6f70..dcb9564b356 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 07f59e7fbbb..ac103a204c5 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 873e872e596..7e617590e9f 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 988229737f1..c659032ced9 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 113bb7ed586..3ba158adaf0 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 c3ee8e2a05b..343c9c06cd3 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 1db14179df6..0d2e16b9e48 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 b692d58e00f..7dcef3f3b66 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 {